From a3dba76ddbf5456935056c2a3ab7797d1bad66a2 Mon Sep 17 00:00:00 2001
From: bnymncoskuner <bnymncoskuner@gmail.com>
Date: Fri, 26 Mar 2021 19:08:26 +0300
Subject: [PATCH 1/2] feat: improve page component api for ease of use

---
 .../components/page/src/page.component.html   | 46 +++++++++----------
 .../components/page/src/page.component.ts     | 16 +++++--
 .../setting-management.component.html         |  2 +-
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/npm/ng-packs/packages/components/page/src/page.component.html b/npm/ng-packs/packages/components/page/src/page.component.html
index ffb01a14bc..71715fd82e 100644
--- a/npm/ng-packs/packages/components/page/src/page.component.html
+++ b/npm/ng-packs/packages/components/page/src/page.component.html
@@ -1,41 +1,41 @@
 <div class="row entry-row">
-  <ng-container *ngIf="titleVisible">
-    <ng-container *ngIf="customTitle; else defaultTitleTemplate">
-      <ng-content select="abp-page-title-container"></ng-content>
-    </ng-container>
+  <ng-container *ngIf="customTitle; else defaultTitleTemplate">
+    <ng-content select="abp-page-title-container"></ng-content>
   </ng-container>
 
-  <ng-container *ngIf="breadcrumbVisible">
-    <ng-container *ngIf="customBreadcrumb; else defaultBreadcrumbTemplate">
-      <ng-content select="abp-page-breadcrumb-container"></ng-content>
-    </ng-container>
+  <ng-container *ngIf="customBreadcrumb; else defaultBreadcrumbTemplate">
+    <ng-content select="abp-page-breadcrumb-container"></ng-content>
   </ng-container>
 
-  <ng-container *ngIf="toolbarVisible">
-    <ng-container *ngIf="customToolbar; else defaultPageToolbarTemplate">
-      <ng-content select="abp-page-toolbar-container"></ng-content>
-    </ng-container>
+  <ng-container *ngIf="customToolbar; else defaultPageToolbarTemplate">
+    <ng-content select="abp-page-toolbar-container"></ng-content>
   </ng-container>
 </div>
 
 <ng-content></ng-content>
 
 <ng-template #defaultTitleTemplate>
-  <div class="col-auto" *abpPagePart="pageParts.title">
-    <h1 class="content-header-title">
-      {{ title }}
-    </h1>
-  </div>
+  <ng-container *ngIf="title">
+    <div class="col-auto" *abpPagePart="pageParts.title">
+      <h1 class="content-header-title">
+        {{ title }}
+      </h1>
+    </div>
+  </ng-container>
 </ng-template>
 
 <ng-template #defaultBreadcrumbTemplate>
-  <div class="col-lg-auto pl-lg-0" *abpPagePart="pageParts.breadcrumb">
-    <abp-breadcrumb></abp-breadcrumb>
-  </div>
+  <ng-container *ngIf="breadcrumbVisible">
+    <div class="col-lg-auto pl-lg-0" *abpPagePart="pageParts.breadcrumb">
+      <abp-breadcrumb></abp-breadcrumb>
+    </div>
+  </ng-container>
 </ng-template>
 
 <ng-template #defaultPageToolbarTemplate>
-  <div class="col" *abpPagePart="pageParts.toolbar; context: record">
-    <abp-page-toolbar [record]="record"></abp-page-toolbar>
-  </div>
+  <ng-container *ngIf="toolbarVisible">
+    <div class="col" *abpPagePart="pageParts.toolbar; context: toolbarData">
+      <abp-page-toolbar [record]="toolbarData"></abp-page-toolbar>
+    </div>
+  </ng-container>
 </ng-template>
diff --git a/npm/ng-packs/packages/components/page/src/page.component.ts b/npm/ng-packs/packages/components/page/src/page.component.ts
index 3536dc0357..ff3c01892c 100644
--- a/npm/ng-packs/packages/components/page/src/page.component.ts
+++ b/npm/ng-packs/packages/components/page/src/page.component.ts
@@ -13,11 +13,19 @@ import {
 })
 export class PageComponent {
   @Input() title: string;
-  @Input() record: any;
 
-  @Input() titleVisible = true;
-  @Input() breadcrumbVisible = true;
-  @Input() toolbarVisible = true;
+  toolbarVisible = false;
+  _toolbarData: any;
+  @Input() set toolbarData(val: any) {
+    this._toolbarData = val;
+    this.toolbarVisible = true;
+  }
+
+  get toolbarData() {
+    return this._toolbarData;
+  }
+
+  @Input('breadcrumb') breadcrumbVisible = true;
 
   pageParts = {
     title: PageParts.title,
diff --git a/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.html b/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.html
index 90b3fe9c9e..a1334e5f95 100644
--- a/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.html
+++ b/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.html
@@ -1,4 +1,4 @@
-<abp-page [title]="'AbpSettingManagement::Settings' | abpLocalization" [toolbarVisible]="false">
+<abp-page [title]="'AbpSettingManagement::Settings' | abpLocalization">
   <div id="SettingManagementWrapper">
     <div class="card">
       <div class="card-body">

From 40e50d78dcb2ff6340c57ee3d2c2fb3a1ea12df5 Mon Sep 17 00:00:00 2001
From: bnymncoskuner <bnymncoskuner@gmail.com>
Date: Mon, 29 Mar 2021 10:48:03 +0300
Subject: [PATCH 2/2] feat: rename toolbarData in page component

---
 npm/ng-packs/packages/components/page/src/page.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/npm/ng-packs/packages/components/page/src/page.component.ts b/npm/ng-packs/packages/components/page/src/page.component.ts
index ff3c01892c..49e884fb2c 100644
--- a/npm/ng-packs/packages/components/page/src/page.component.ts
+++ b/npm/ng-packs/packages/components/page/src/page.component.ts
@@ -16,7 +16,7 @@ export class PageComponent {
 
   toolbarVisible = false;
   _toolbarData: any;
-  @Input() set toolbarData(val: any) {
+  @Input('toolbar') set toolbarData(val: any) {
     this._toolbarData = val;
     this.toolbarVisible = true;
   }