@dflat-core/web 1.7.2084 → 1.7.2085

package/fesm2022/dflat-core-web-system-ux.mjs

@@ -5136,11 +5136,8 @@ var CustomFieldOptionsComponent = class CustomFieldOptionsComponent extends Base
 	ngOnInit() {
 		super.ngOnInit();
 		this.facade.actions.hideAction("edit");
-		const actionsToAdd = [
-			new Action("Passer en avant", null, true, true, false, "triangle-up", "bg-orange", () => this.upDisplayOrder(), null, () => true),
-			new Action("Passer en arrière", null, true, true, false, "triangle-down", "bg-orange", () => this.downDisplayOrder(), null, () => true),
-			new Action("Définir par défaut", null, true, true, false, "circle-check-solid", "bg-orange", () => this.setIsDefault(), null, () => this.canSetIsDefault())
-		];
+		this.facade.config.rowOrderProperty = "DisplayOrder";
+		const actionsToAdd = [new Action("Définir par défaut", null, true, true, false, "circle-check-solid", "bg-orange", () => this.setIsDefault(), null, () => this.canSetIsDefault())];
 		this.facade.actions.addActions(actionsToAdd);
 		this.facade.actions.patch("add", {
 			action: () => this.add(),
@@ -5162,34 +5159,6 @@ var CustomFieldOptionsComponent = class CustomFieldOptionsComponent extends Base
 			item.IsDefaultImage = this.img;
 		}
 	}
-	upDisplayOrder() {
-		const entity = this.selectedEntities[0];
-		if (entity.DisplayOrder - 1 < 0) return;
-		const oldDisplayOrder = entity.DisplayOrder;
-		const item = { ...entity };
-		item.DisplayOrder -= 1;
-		let toSave = [item];
-		const next = this.facade.selection.getCurrentData().find((x) => x.DisplayOrder == oldDisplayOrder - 1);
-		if (!Utilities.IsNil(next)) {
-			next.DisplayOrder += 1;
-			toSave.push(next);
-		}
-		this.facade.change.emitUpdated(toSave);
-	}
-	downDisplayOrder() {
-		const entity = this.selectedEntities[0];
-		if (entity.DisplayOrder + 1 > this.facade.filter.totalItems$.value) return;
-		const oldDisplayOrder = entity.DisplayOrder;
-		const item = { ...entity };
-		item.DisplayOrder += 1;
-		let toSave = [item];
-		const previous = this.facade.selection.getCurrentData().find((x) => x.DisplayOrder == oldDisplayOrder + 1);
-		if (!Utilities.IsNil(previous)) {
-			previous.DisplayOrder -= 1;
-			toSave.push(previous);
-		}
-		this.facade.change.emitUpdated(toSave);
-	}
 	setIsDefault() {
 		const oldDefault = this.facade.selection.getCurrentData().find((x) => x.IsDefault);
 		const selected = this.selectedEntities[0];
@@ -5427,10 +5396,8 @@ i0.ɵɵngDeclareClassMetadata({
 	ctorParameters: () => [{ type: i1$2.ApplicationService }, { type: i2$1.ActivatedRoute }]
 });
 var CustomFieldComponent = class CustomFieldComponent extends BaseCustomFieldComponent {
-	constructor(app, route, itemDataService, orderableModal) {
+	constructor(app, route) {
 		super(app, route);
-		this.itemDataService = itemDataService;
-		this.orderableModal = orderableModal;
 		this.FIELD_OPTIONS_SECTION = "Options d'attribut";
 	}
 	ngOnInit() {
@@ -5440,51 +5407,6 @@ var CustomFieldComponent = class CustomFieldComponent extends BaseCustomFieldCom
 			show: (selected) => selected.length == 1 && selected[0].CustomFieldType == 3
 		});
 		this.facade.actions.patch("showHistory", { isActive: () => true });
-		const actionToAdd = new Action("Modifier l'ordre", "", true, true, false, "arrow-up-1-9", "bg-orange", () => this.openOrderModal(), "", () => true);
-		this.facade.actions.addAction(actionToAdd);
-	}
-	openOrderModal() {
-		const selected = this.facade.selection.getSelected();
-		if (!selected?.length) return;
-		const group = selected[0];
-		const itemFilter = {
-			CustomFieldId: group.Id,
-			Offset: 0,
-			Take: 1e3,
-			SortColumn: "OrderNumber",
-			SortDirection: "asc"
-		};
-		this.itemDataService.search(itemFilter).subscribe((pagedResult) => {
-			const items = (pagedResult.Values ?? []).map((i) => ({
-				id: i.Id,
-				order: i.DisplayOrder ?? 1,
-				label: i.DisplayValue ?? "",
-				source: i
-			}));
-			this.orderableModal.open({
-				title: "Ordonner les attributs",
-				subtitle: group.Label,
-				items,
-				columns: [{
-					label: "Attribut",
-					key: "label"
-				}, {
-					label: "Ordre",
-					key: "order"
-				}],
-				displayName: (i) => i.label,
-				confirmLabel: "Appliquer"
-			}).then((modalResult) => {
-				if (!modalResult) return;
-				const toSave = modalResult.orderedItems.map((i) => ({
-					...i.source,
-					OrderNumber: i.order
-				}));
-				this.itemDataService.saveEntities(toSave).subscribe(() => {
-					this.facade.sections.setSectionDirty(this.FIELD_OPTIONS_SECTION);
-				});
-			});
-		});
 	}
 	static {
 		this.ɵfac = i0.ɵɵngDeclareFactory({
@@ -5492,12 +5414,7 @@ var CustomFieldComponent = class CustomFieldComponent extends BaseCustomFieldCom
 			version: "22.2.1",
 			ngImport: i0,
 			type: CustomFieldComponent,
-			deps: [
-				{ token: i1$2.ApplicationService },
-				{ token: i2$1.ActivatedRoute },
-				{ token: i2$2.CustomFieldOptionsDataService },
-				{ token: i1$2.OrderableModalService }
-			],
+			deps: [{ token: i1$2.ApplicationService }, { token: i2$1.ActivatedRoute }],
 			target: i0.ɵɵFactoryTarget.Component
 		});
 	}
@@ -5645,12 +5562,7 @@ i0.ɵɵngDeclareClassMetadata({
 			template: "<div\r\n    [class]=\"this.baseComponentClass\"\r\n    [class.visible]=\"this.displayComponent\"\r\n    [class.invisible]=\"!this.displayComponent\"\r\n    >\r\n    <alg-standard-page-layout #pageLayout [layoutKey]=\"this.layoutKey\" \r\n    [entityKey]=\"this.getEntityKey()\" [guid]=\"this.guid\" >\r\n        <div actionsContent *ngIf=\"this.facade.layout.showActionBar$ | async\"\r\n            (contextmenu)=\"this.facade.layout.openGridContextMenu($event)\">\r\n            <alg-action-panel\r\n                #actionComponent\r\n                [entityKey]=\"this.getEntityKey()\"\r\n                [guid]=\"this.guid\"\r\n                [title]=\"this.actionTitle\"\r\n                [searchText]=\"this.actionBarSearchText\">\r\n                <ng-content select=\"[actionsPanelContent]\"> </ng-content>\r\n            </alg-action-panel>\r\n        </div>\r\n        \r\n        <div middleHeader \r\n        *ngIf=\"this.facade.layout.showFilterSummary$ | async\"\r\n        >\r\n            <alg-filter-summary-panel [entityKey]=\"this.getEntityKey()\" [guid]=\"this.guid\">\r\n            </alg-filter-summary-panel>\r\n        </div>\r\n\r\n        <ng-container middleContent>\r\n            <div class=\"panel-middle-content\" [class.with-filters]=\"this.HasFilter\">\r\n                <!-- Cartes (vue Carte) à la place de la grille : choisies, ou écran étroit. -->\r\n                <ng-container *ngIf=\"!isCardVisible && !(this.facade.config.cardSource && (this.facade.layout.cardDisplay$ | async))\">\r\n                    <alg-data-grid #datagrid [entityKey]=\"getEntityKey()\" [guid]=\"this.guid\">\r\n                    </alg-data-grid>\r\n                </ng-container>\r\n                <ng-container *ngIf=\"!isCardVisible && this.facade.config.cardSource && (this.facade.layout.cardDisplay$ | async)\">\r\n                    <alg-card-list [entityKey]=\"getEntityKey()\" [guid]=\"this.guid\"></alg-card-list>\r\n                </ng-container>\r\n                <!-- <alg-list-display \r\n                    #listDisplayComponent\r\n                    [entityKey]=\"getEntityKey()\"\r\n                    [guid]=\"this.guid\"\r\n                    >\r\n                </alg-list-display> -->\r\n            </div>\r\n            <ng-container *ngIf=\"isCardVisible\">\r\n                <ng-content #itemListComponent></ng-content>\r\n            </ng-container>\r\n        </ng-container>\r\n\r\n        <ng-container rightContent>\r\n            <!-- Éditeur spécifique de l'entité (editorComponent), sinon formulaire d'édition standard -->\r\n            <ng-container *ngIf=\"this.editorComponent; else standardEditor\">\r\n                <ng-container *ngComponentOutlet=\"this.editorComponent; inputs: { entityKey: getEntityKey(), guid: this.guid }\">\r\n                </ng-container>\r\n            </ng-container>\r\n            <ng-template #standardEditor>\r\n                <alg-editor #editor [entityKey]=\"getEntityKey()\" [guid]=\"this.guid\">\r\n                </alg-editor>\r\n            </ng-template>\r\n        </ng-container>\r\n\r\n        <div middleFooter (contextmenu)=\"this.facade.layout.openGridContextMenu($event)\">\r\n            <alg-validation-error\r\n                #validationErrorComponent\r\n            ></alg-validation-error>\r\n            <alg-new-paginator *ngIf=\"this.facade.layout.showPaginator$ | async\"\r\n                    [entityKey]=\"getEntityKey()\" \r\n                    [guid]=\"this.guid\"\r\n                    [log]=\"this.log\"\r\n                    >\r\n            </alg-new-paginator>\r\n        </div>\r\n    </alg-standard-page-layout>\r\n    <!-- Téléphone sans barre d'actions : menu de l'écran derrière un bouton rond (sinon, trois points\r\n         dans la barre d'actions). -->\r\n    <alg-mobile-menu *ngIf=\"this.IsTheMainComponent && (this.facade.layout.narrow$ | async) && !(this.facade.layout.showActionBar$ | async)\"\r\n        [entityKey]=\"getEntityKey()\" [guid]=\"this.guid\" [title]=\"this.actionTitle\"></alg-mobile-menu>\r\n</div>\r\n"
 		}]
 	}],
-	ctorParameters: () => [
-		{ type: i1$2.ApplicationService },
-		{ type: i2$1.ActivatedRoute },
-		{ type: i2$2.CustomFieldOptionsDataService },
-		{ type: i1$2.OrderableModalService }
-	]
+	ctorParameters: () => [{ type: i1$2.ApplicationService }, { type: i2$1.ActivatedRoute }]
 });
 var BaseCustomFieldGroupItemComponent = class BaseCustomFieldGroupItemComponent extends BaseComponent {
 	getTitle() {
@@ -5715,6 +5627,7 @@ var CustomFieldGroupItemComponent = class CustomFieldGroupItemComponent extends
 	}
 	ngOnInit() {
 		super.ngOnInit();
+		this.facade.config.rowOrderProperty = "OrderNumber";
 		this.cfactionService.onCustomFieldGroupAddSubject.asObservable().pipe(takeUntil(this.destroy$)).subscribe(() => {
 			this.performLoadData();
 		});
@@ -6007,10 +5920,8 @@ var CustomFieldGroupComponent = class CustomFieldGroupComponent extends BaseCust
 	getTitle() {
 		return "Familles d'attributs";
 	}
-	constructor(app, route, itemDataService, orderableModal) {
+	constructor(app, route) {
 		super(app, route);
-		this.itemDataService = itemDataService;
-		this.orderableModal = orderableModal;
 		this.FIELD_OPTIONS_SECTION = "Attributs";
 		this.initializationParams = null;
 	}
@@ -6039,8 +5950,6 @@ var CustomFieldGroupComponent = class CustomFieldGroupComponent extends BaseCust
 				component.setInitializationParameters(initParams);
 			}
 		});
-		const actionToAdd = new Action("Modifier l'ordre", null, true, true, false, "arrow-up-1-9", "bg-orange", () => this.openOrderModal(), null, () => true);
-		this.facade.actions.addAction(actionToAdd);
 	}
 	isSchemaGroup(selected) {
 		return selected?.[0]?.CustomFieldGroupType === CustomFieldGroupTypes.Schema;
@@ -6051,61 +5960,13 @@ var CustomFieldGroupComponent = class CustomFieldGroupComponent extends BaseCust
 	setInitializationParameters(params) {
 		this.initializationParams = params;
 	}
-	openOrderModal() {
-		const selected = this.facade.selection.getSelected();
-		if (!selected?.length) return;
-		const group = selected[0];
-		const itemFilter = {
-			GroupId: group.Id,
-			Offset: 0,
-			Take: 1e3,
-			SortColumn: "OrderNumber",
-			SortDirection: "asc"
-		};
-		this.itemDataService.search(itemFilter).subscribe((pagedResult) => {
-			const items = (pagedResult.Values ?? []).map((i) => ({
-				id: i.Id,
-				order: i.OrderNumber ?? 1,
-				label: i.CustomFieldName ?? "",
-				source: i
-			}));
-			this.orderableModal.open({
-				title: "Ordonner les attributs",
-				subtitle: group.Label,
-				items,
-				columns: [{
-					label: "Attribut",
-					key: "label"
-				}, {
-					label: "Ordre",
-					key: "order"
-				}],
-				displayName: (i) => i.label,
-				confirmLabel: "Appliquer"
-			}).then((modalResult) => {
-				if (!modalResult) return;
-				const toSave = modalResult.orderedItems.map((i) => ({
-					...i.source,
-					OrderNumber: i.order
-				}));
-				this.itemDataService.saveEntities(toSave).subscribe(() => {
-					this.facade.sections.setSectionDirty(this.FIELD_OPTIONS_SECTION);
-				});
-			});
-		});
-	}
 	static {
 		this.ɵfac = i0.ɵɵngDeclareFactory({
 			minVersion: "12.0.0",
 			version: "22.2.1",
 			ngImport: i0,
 			type: CustomFieldGroupComponent,
-			deps: [
-				{ token: i1$2.ApplicationService },
-				{ token: i2$1.ActivatedRoute },
-				{ token: i2$2.CustomFieldGroupItemDataService },
-				{ token: i1$2.OrderableModalService }
-			],
+			deps: [{ token: i1$2.ApplicationService }, { token: i2$1.ActivatedRoute }],
 			target: i0.ɵɵFactoryTarget.Component
 		});
 	}
@@ -6253,12 +6114,7 @@ i0.ɵɵngDeclareClassMetadata({
 			template: "<div\r\n    [class]=\"this.baseComponentClass\"\r\n    [class.visible]=\"this.displayComponent\"\r\n    [class.invisible]=\"!this.displayComponent\"\r\n    >\r\n    <alg-standard-page-layout #pageLayout [layoutKey]=\"this.layoutKey\" \r\n    [entityKey]=\"this.getEntityKey()\" [guid]=\"this.guid\" >\r\n        <div actionsContent *ngIf=\"this.facade.layout.showActionBar$ | async\"\r\n            (contextmenu)=\"this.facade.layout.openGridContextMenu($event)\">\r\n            <alg-action-panel\r\n                #actionComponent\r\n                [entityKey]=\"this.getEntityKey()\"\r\n                [guid]=\"this.guid\"\r\n                [title]=\"this.actionTitle\"\r\n                [searchText]=\"this.actionBarSearchText\">\r\n                <ng-content select=\"[actionsPanelContent]\"> </ng-content>\r\n            </alg-action-panel>\r\n        </div>\r\n        \r\n        <div middleHeader \r\n        *ngIf=\"this.facade.layout.showFilterSummary$ | async\"\r\n        >\r\n            <alg-filter-summary-panel [entityKey]=\"this.getEntityKey()\" [guid]=\"this.guid\">\r\n            </alg-filter-summary-panel>\r\n        </div>\r\n\r\n        <ng-container middleContent>\r\n            <div class=\"panel-middle-content\" [class.with-filters]=\"this.HasFilter\">\r\n                <!-- Cartes (vue Carte) à la place de la grille : choisies, ou écran étroit. -->\r\n                <ng-container *ngIf=\"!isCardVisible && !(this.facade.config.cardSource && (this.facade.layout.cardDisplay$ | async))\">\r\n                    <alg-data-grid #datagrid [entityKey]=\"getEntityKey()\" [guid]=\"this.guid\">\r\n                    </alg-data-grid>\r\n                </ng-container>\r\n                <ng-container *ngIf=\"!isCardVisible && this.facade.config.cardSource && (this.facade.layout.cardDisplay$ | async)\">\r\n                    <alg-card-list [entityKey]=\"getEntityKey()\" [guid]=\"this.guid\"></alg-card-list>\r\n                </ng-container>\r\n                <!-- <alg-list-display \r\n                    #listDisplayComponent\r\n                    [entityKey]=\"getEntityKey()\"\r\n                    [guid]=\"this.guid\"\r\n                    >\r\n                </alg-list-display> -->\r\n            </div>\r\n            <ng-container *ngIf=\"isCardVisible\">\r\n                <ng-content #itemListComponent></ng-content>\r\n            </ng-container>\r\n        </ng-container>\r\n\r\n        <ng-container rightContent>\r\n            <!-- Éditeur spécifique de l'entité (editorComponent), sinon formulaire d'édition standard -->\r\n            <ng-container *ngIf=\"this.editorComponent; else standardEditor\">\r\n                <ng-container *ngComponentOutlet=\"this.editorComponent; inputs: { entityKey: getEntityKey(), guid: this.guid }\">\r\n                </ng-container>\r\n            </ng-container>\r\n            <ng-template #standardEditor>\r\n                <alg-editor #editor [entityKey]=\"getEntityKey()\" [guid]=\"this.guid\">\r\n                </alg-editor>\r\n            </ng-template>\r\n        </ng-container>\r\n\r\n        <div middleFooter (contextmenu)=\"this.facade.layout.openGridContextMenu($event)\">\r\n            <alg-validation-error\r\n                #validationErrorComponent\r\n            ></alg-validation-error>\r\n            <alg-new-paginator *ngIf=\"this.facade.layout.showPaginator$ | async\"\r\n                    [entityKey]=\"getEntityKey()\" \r\n                    [guid]=\"this.guid\"\r\n                    [log]=\"this.log\"\r\n                    >\r\n            </alg-new-paginator>\r\n        </div>\r\n    </alg-standard-page-layout>\r\n    <!-- Téléphone sans barre d'actions : menu de l'écran derrière un bouton rond (sinon, trois points\r\n         dans la barre d'actions). -->\r\n    <alg-mobile-menu *ngIf=\"this.IsTheMainComponent && (this.facade.layout.narrow$ | async) && !(this.facade.layout.showActionBar$ | async)\"\r\n        [entityKey]=\"getEntityKey()\" [guid]=\"this.guid\" [title]=\"this.actionTitle\"></alg-mobile-menu>\r\n</div>\r\n"
 		}]
 	}],
-	ctorParameters: () => [
-		{ type: i1$2.ApplicationService },
-		{ type: i2$1.ActivatedRoute },
-		{ type: i2$2.CustomFieldGroupItemDataService },
-		{ type: i1$2.OrderableModalService }
-	]
+	ctorParameters: () => [{ type: i1$2.ApplicationService }, { type: i2$1.ActivatedRoute }]
 });
 var CustomFieldActionService = class CustomFieldActionService {
 	constructor(alertService, customFieldOptionsDataService, customFieldGroupItemDataService, customFieldGroupEntityDataService, metaEntityFieldDataService, selector) {