From cdbffef577ae6b07856bf07917fdcc60d8b4b768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20KILI=C3=87?= <fsk202@gmail.com>
Date: Tue, 4 Oct 2022 10:47:44 +0300
Subject: [PATCH 1/3] Added displayNameResolver to form prop

---
 .../extensible-form-prop.component.html       | 31 +++++++++----------
 .../extensible-form-prop.component.ts         |  5 +--
 .../extensions/src/lib/models/form-props.ts   |  4 +++
 .../extensions/src/lib/models/props.ts        |  2 ++
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html
index 9cdc06401c..d66ad6c344 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html
@@ -1,17 +1,13 @@
-<ng-container [ngSwitch]="getComponent(prop)"
-
-              *abpPermission="prop.permission; runChangeDetection: false">
-
+<ng-container
+  [ngSwitch]="getComponent(prop)"
+  *abpPermission="prop.permission; runChangeDetection: false"
+>
   <ng-template ngSwitchCase="template">
-    <ng-container
-      *ngComponentOutlet="prop.template;injector:injectorForCustomComponent">
+    <ng-container *ngComponentOutlet="prop.template; injector: injectorForCustomComponent">
     </ng-container>
   </ng-template>
 
-  <div
-    [ngClass]="containerClassName"
-    class="mb-3 form-group"
-  >
+  <div [ngClass]="containerClassName" class="mb-3 form-group">
     <ng-template ngSwitchCase="input">
       <ng-template [ngTemplateOutlet]="label"></ng-template>
       <input
@@ -27,7 +23,7 @@
     </ng-template>
 
     <ng-template ngSwitchCase="hidden">
-      <input [formControlName]="prop.name" type="hidden"/>
+      <input [formControlName]="prop.name" type="hidden" />
     </ng-template>
 
     <ng-template ngSwitchCase="checkbox">
@@ -103,7 +99,7 @@
           [class.is-invalid]="typeahead.classList.contains('is-invalid')"
           class="form-control"
         />
-        <input [formControlName]="prop.name" type="hidden"/>
+        <input [formControlName]="prop.name" type="hidden" />
       </div>
     </ng-template>
 
@@ -143,11 +139,14 @@
       ></textarea>
     </ng-template>
   </div>
-
 </ng-container>
 
 <ng-template #label let-classes>
-  <label [htmlFor]="prop.id" [ngClass]="classes || 'form-label'" x
-  >{{ prop.displayName | abpLocalization }} {{ asterisk }}</label
-  >
+  <label [htmlFor]="prop.id" [ngClass]="classes || 'form-label'">
+    <ng-container *ngIf="prop.displayTextResolver; else displayNameTemplate">
+      {{ prop.displayTextResolver(data) | abpLocalization }}
+    </ng-container>
+    <ng-template #displayNameTemplate> {{ prop.displayName | abpLocalization }}</ng-template>
+    {{ asterisk }}
+  </label>
 </ng-template>
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts
index ec1ba4ea1b..e18c0ab8a4 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts
@@ -60,7 +60,7 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit {
 
   asterisk = '';
 
-  containerClassName = 'mb-3 form-group'
+  containerClassName = 'mb-3 form-group';
 
   options$: Observable<ABP.Option<any>[]> = of([]);
 
@@ -136,6 +136,7 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit {
   ngAfterViewInit() {
     if (this.first && this.fieldRef) {
       this.fieldRef.nativeElement.focus();
+      this.cdRef.detectChanges();
     }
   }
 
@@ -213,7 +214,7 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit {
       this.validators = validators(this.data);
       this.setAsterisk();
     }
-    if(className !== undefined){
+    if (className !== undefined) {
       this.containerClassName = className;
     }
 
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/form-props.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/form-props.ts
index 14de1a94f4..af0ae767d7 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/form-props.ts
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/form-props.ts
@@ -9,6 +9,7 @@ import {
   PropContributorCallback,
   PropContributorCallbacks,
   PropData,
+  PropDisplayTextResolver,
   PropList,
   PropPredicate,
   Props,
@@ -69,6 +70,7 @@ export class FormProp<R = any> extends Prop<R> {
   readonly template?: Type<any>;
   readonly className?: string;
   readonly group?: FormPropGroup | undefined;
+  readonly displayTextResolver?: PropDisplayTextResolver<R>;
 
   constructor(options: FormPropOptions<R>) {
     super(
@@ -93,6 +95,7 @@ export class FormProp<R = any> extends Prop<R> {
     this.id = options.id || options.name;
     const defaultValue = options.defaultValue;
     this.defaultValue = isFalsyValue(defaultValue) ? defaultValue : defaultValue || null;
+    this.displayTextResolver = options.displayTextResolver;
   }
 
   static create<R = any>(options: FormPropOptions<R>) {
@@ -128,6 +131,7 @@ export type FormPropOptions<R = any> = O.Optional<
   | 'defaultValue'
   | 'options'
   | 'id'
+  | 'displayTextResolver'
 >;
 
 export type CreateFormPropDefaults<R = any> = Record<string, FormProp<R>[]>;
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/props.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/props.ts
index 3799c419a7..456a280ba8 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/props.ts
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/models/props.ts
@@ -35,6 +35,7 @@ export abstract class Prop<R = any> {
     public readonly isExtra = false,
     public readonly template?: Type<any>,
     public readonly className?: string,
+    public readonly displayTextResolver?: PropDisplayTextResolver<R>,
   ) {
     this.displayName = this.displayName || this.name;
   }
@@ -42,6 +43,7 @@ export abstract class Prop<R = any> {
 
 export type PropCallback<T, R = any> = (data: Omit<PropData<T>, 'data'>, auxData?: any) => R;
 export type PropPredicate<T> = (data?: Omit<PropData<T>, 'data'>, auxData?: any) => boolean;
+export type PropDisplayTextResolver<T> = (data?: Omit<PropData<T>, 'data'>) => string;
 
 export abstract class PropsFactory<C extends Props<any>> {
   protected abstract _ctor: Type<C>;

From 3e95da61bdfcb233986cf527d0ae4adfb1d56aee Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Mon, 17 Oct 2022 11:21:22 +0300
Subject: [PATCH 2/3] Remove abppkg.json files from csproj

---
 .../MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj    | 4 ++++
 .../MyCompanyName.MyProjectName.Blazor.Server.csproj          | 4 ++++
 .../MyCompanyName.MyProjectName.Host.Mongo.csproj             | 4 ++++
 .../MyCompanyName.MyProjectName.Host.csproj                   | 4 ++++
 .../MyCompanyName.MyProjectName.Mvc.Mongo.csproj              | 4 ++++
 .../MyCompanyName.MyProjectName.Mvc.csproj                    | 4 ++++
 templates/app/aspnet-core/common.props                        | 4 ++++
 7 files changed, 28 insertions(+)

diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
index 749f18d5e3..c7e66d21b1 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
@@ -96,4 +96,8 @@
     <None Remove="Logs\**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\net6.0\*.abppkg*.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
index 2d2af88388..c1d6cb76e7 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
@@ -104,4 +104,8 @@
     <None Remove="Logs\**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\net6.0\*.abppkg*.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj
index 6184d054d9..cc5d63c590 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj
@@ -88,4 +88,8 @@
     <None Remove="Logs\**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\net6.0\*.abppkg*.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj
index 5f9b2fded9..652223be26 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj
@@ -96,4 +96,8 @@
     <None Remove="Logs\**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\net6.0\*.abppkg*.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj
index bb106d60df..88f88b8f52 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj
@@ -100,4 +100,8 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\net6.0\*.abppkg*.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj
index 0be1b69314..bc465969fb 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj
@@ -108,4 +108,8 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\net6.0\*.abppkg*.json" />
+  </ItemGroup>
+
 </Project>
diff --git a/templates/app/aspnet-core/common.props b/templates/app/aspnet-core/common.props
index 6ef9bae371..447447b164 100644
--- a/templates/app/aspnet-core/common.props
+++ b/templates/app/aspnet-core/common.props
@@ -12,4 +12,8 @@
     </PropertyGroup>
   </Target>
 
+  <ItemGroup>
+    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\net6.0\*.abppkg*.json" />
+  </ItemGroup>
+
 </Project>
\ No newline at end of file

From 3a0e679e1500b57160d52ad9d8518ef03e46b34c Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Mon, 17 Oct 2022 14:10:23 +0300
Subject: [PATCH 3/3] Refactor: Remove abppkg.json files from csproj

---
 .../MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj      | 2 +-
 .../MyCompanyName.MyProjectName.Blazor.Server.csproj            | 2 +-
 .../MyCompanyName.MyProjectName.Host.Mongo.csproj               | 2 +-
 .../MyCompanyName.MyProjectName.Host.csproj                     | 2 +-
 .../MyCompanyName.MyProjectName.Mvc.Mongo.csproj                | 2 +-
 .../MyCompanyName.MyProjectName.Mvc.csproj                      | 2 +-
 templates/app/aspnet-core/common.props                          | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
index c7e66d21b1..03873375f2 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
@@ -97,7 +97,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\net6.0\*.abppkg*.json" />
+    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\*\*.abppkg*.json" />
   </ItemGroup>
 
 </Project>
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
index c1d6cb76e7..a1859d9aa3 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
@@ -105,7 +105,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\net6.0\*.abppkg*.json" />
+    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\*\*.abppkg*.json" />
   </ItemGroup>
 
 </Project>
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj
index cc5d63c590..a6d96b6477 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj
@@ -89,7 +89,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\net6.0\*.abppkg*.json" />
+    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\*\*.abppkg*.json" />
   </ItemGroup>
 
 </Project>
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj
index 652223be26..82078dbaef 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj
@@ -97,7 +97,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\net6.0\*.abppkg*.json" />
+    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\*\*.abppkg*.json" />
   </ItemGroup>
 
 </Project>
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj
index 88f88b8f52..c8e8bdb29e 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj
@@ -101,7 +101,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\net6.0\*.abppkg*.json" />
+    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\*\*.abppkg*.json" />
   </ItemGroup>
 
 </Project>
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj
index bc465969fb..480d2b66d9 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj
@@ -109,7 +109,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\net6.0\*.abppkg*.json" />
+    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\*\*.abppkg*.json" />
   </ItemGroup>
 
 </Project>
diff --git a/templates/app/aspnet-core/common.props b/templates/app/aspnet-core/common.props
index 447447b164..7e89c3a06b 100644
--- a/templates/app/aspnet-core/common.props
+++ b/templates/app/aspnet-core/common.props
@@ -13,7 +13,7 @@
   </Target>
 
   <ItemGroup>
-    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\net6.0\*.abppkg*.json" />
+    <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\*\*.abppkg*.json" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file