Merge pull request #9144 from abpframework/volo/6052

Angular UI: Pass meridian to extensible datetime picker component

delete-bin-obj-folders.js

@@ -0,0 +1,37 @@
+const { resolve } = require("path");
+const { readdir, rmdir } = require("fs").promises;
+
+async function* removeFolder(dir) {
+  await rmdir(dir, { recursive: true });
+  yield dir;
+}
+
+async function* getBinObj(dir) {
+  const dirents = await readdir(dir, { withFileTypes: true });
+
+  for (const dirent of dirents) {
+    if (!dirent.isDirectory()) continue;
+    const name = dirent.name;
+
+    if (name === "node_modules") continue;
+
+    const res = resolve(dir, dirent.name);
+
+    if (name === "bin" || name === "obj") {
+      yield* removeFolder(res);
+      continue;
+    }
+
+    yield* getBinObj(res);
+  }
+}
+
+(async () => {
+  console.log("\x1b[36m%s\x1b[0m", "Deleting all BIN and OBJ folders...");
+
+  for await (const dir of getBinObj(".")) {
+    console.log("\x1b[33m%s\x1b[0m", `Removed: ${dir}`);
+  }
+
+  console.log("\x1b[36m%s\x1b[0m", "All BIN and OBJ folders are deleted.");
+})();

npm/ng-packs/packages/core/src/lib/proxy/volo/abp/asp-net-core/mvc/multi-tenancy/models.ts

@@ -3,6 +3,7 @@ export interface FindTenantResultDto {
   success: boolean;
   tenantId?: string;
   name?: string;
+  isActive: boolean;
 }
 
 export interface CurrentTenantDto {

npm/ng-packs/packages/core/src/lib/proxy/volo/abp/http/modeling/models.ts

@@ -48,6 +48,7 @@ export interface ModuleApiDescriptionModel {
 export interface ParameterApiDescriptionModel {
   nameOnMethod?: string;
   name?: string;
+  jsonName?: string;
   type?: string;
   typeSimple?: string;
   isOptional: boolean;
@@ -59,6 +60,7 @@ export interface ParameterApiDescriptionModel {
 
 export interface PropertyApiDescriptionModel {
   name?: string;
+  jsonName?: string;
   type?: string;
   typeSimple?: string;
   isRequired: boolean;

npm/ng-packs/packages/core/src/lib/proxy/volo/abp/models.ts

@@ -1,5 +1,5 @@
 
 export interface NameValue<T = string> {
-  name: string;
+  name?: string;
   value: T;
 }

npm/ng-packs/packages/theme-shared/extensions/src/lib/components/date-time-picker/date-time-picker.component.ts

@@ -37,6 +37,7 @@ import { selfFactory } from '../../utils/factory.util';
       #timepicker
       [formControlName]="prop.name"
       (ngModelChange)="setDate($event)"
+      [meridian]="meridian"
     ></ngb-timepicker>
   `,
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -58,6 +59,7 @@ import { selfFactory } from '../../utils/factory.util';
 })
 export class DateTimePickerComponent {
   @Input() prop: FormProp;
+  @Input() meridian = false;
 
   @ViewChild(NgbInputDatepicker) date: NgbInputDatepicker;
   @ViewChild(NgbTimepicker) time: NgbTimepicker;

npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html

@@ -110,7 +110,7 @@
 
   <ng-template ngSwitchCase="dateTime">
     <ng-template [ngTemplateOutlet]="label"></ng-template>
-    <abp-date-time-picker [prop]="prop"></abp-date-time-picker>
+    <abp-date-time-picker [prop]="prop" [meridian]="meridian"></abp-date-time-picker>
   </ng-template>
 
   <ng-template ngSwitchCase="textarea">

npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts

@@ -1,4 +1,4 @@
-import { ABP, AbpValidators, TrackByService } from '@abp/ng.core';
+import { ABP, AbpValidators, ConfigStateService, TrackByService } from '@abp/ng.core';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -82,6 +82,12 @@ export class ExtensibleFormPropComponent implements OnChanges {
 
   typeaheadFormatter = (option: ABP.Option<any>) => option.key;
 
+  get meridian() {
+    return (
+      this.configState.getDeep('localization.currentCulture.dateTimeFormat.shortTimePattern') || ''
+    ).includes('tt');
+  }
+
   get isInvalid() {
     const control = this.form.get(this.prop.name);
     return control.touched && control.invalid;
@@ -90,6 +96,7 @@ export class ExtensibleFormPropComponent implements OnChanges {
   constructor(
     public readonly cdRef: ChangeDetectorRef,
     public readonly track: TrackByService,
+    protected configState: ConfigStateService,
     groupDirective: FormGroupDirective,
   ) {
     this.form = groupDirective.form;