@acorex/platform 19.4.1 → 19.4.3

package/fesm2022/acorex-platform-layout-entity.mjs

@@ -8,7 +8,7 @@ import { resolveActionLook, AXPFilterOperatorMiddlewareService, AXPEntityCommand
 import * as i2$2 from '@acorex/platform/workflow';
 import { AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowModule } from '@acorex/platform/workflow';
 import * as i1$4 from '@acorex/platform/core';
-import { AXPExpressionEvaluatorService, AXPContextStore, AXPPlatformScope, extractValue, setSmart } from '@acorex/platform/core';
+import { AXPExpressionEvaluatorService, AXPPlatformScope, extractValue, setSmart } from '@acorex/platform/core';
 import * as i7 from '@acorex/platform/layout/builder';
 import { AXPPageStatus, AXPWidgetRegistryService, AXPValueWidgetComponent, AXPLayoutBuilderModule, AXPColumnWidgetComponent, AXPWidgetsCatalog, AXPWidgetGroupEnum, AXP_WIDGETS_EDITOR_CATEGORY } from '@acorex/platform/layout/builder';
 import { AXPLayoutThemeService } from '@acorex/platform/themes/shared';
@@ -671,7 +671,6 @@ class AXPEntityMasterListViewModel {
         this.settings = this.injector.get(AXPSettingService);
         this.widgetResolver = this.injector.get(AXPWidgetRegistryService);
         this.expressionEvaluator = this.injector.get(AXPExpressionEvaluatorService);
-        this.pageContext = this.injector.get(AXPContextStore);
         this.filterOperatorMiddleware = this.injector.get(AXPFilterOperatorMiddlewareService);
         this.settingEntityKey = `${this.config.module}:${this.config.name}`;
         this.destroyed = new Subject();
@@ -731,16 +730,6 @@ class AXPEntityMasterListViewModel {
             const list = this.entityDef.interfaces?.master?.list?.actions ?? [];
             return list.map((tr) => new AXPEntityCommandTriggerViewModel(this.entityDef, tr)) ?? [];
         });
-        this.primaryActions = computed(() => {
-            return this.allActions().filter((a) => a.priority == 'primary' &&
-                ((a.scope == AXPEntityCommandScope.Selected && this.hasSelectedItems()) ||
-                    (a.scope == AXPEntityCommandScope.TypeLevel && !this.hasSelectedItems())));
-        });
-        this.secondaryActions = computed(() => {
-            return this.allActions().filter((a) => a.priority == 'secondary' &&
-                ((a.scope == AXPEntityCommandScope.Selected && this.hasSelectedItems()) ||
-                    (a.scope == AXPEntityCommandScope.TypeLevel && !this.hasSelectedItems())));
-        });
         this.selectedScopeActionsCount = computed(() => {
             return this.allActions().filter((a) => a.scope == AXPEntityCommandScope.Selected).length;
         });
@@ -876,12 +865,7 @@ class AXPEntityMasterListViewModel {
         this.selectedItems.set([]);
     }
     async getPrimaryActions() {
-        console.log('getPrimaryActions', this.pageContext.data());
-        const scope = {
-            context: {
-                eval: (path) => get(this.pageContext.data(), path),
-            },
-        };
+        const scope = {};
         const actions = await Promise.all(this.allActions()
             .filter((a) => a.priority == 'primary' &&
             ((a.scope == AXPEntityCommandScope.Selected && this.hasSelectedItems()) ||
@@ -895,9 +879,21 @@ class AXPEntityMasterListViewModel {
         }));
         return actions;
     }
-    // public secondaryRowActions = computed<AXPEntityCommandTriggerViewModel[]>(() =>
-    //   this.allActions().filter((a) => a.scope == AXPEntityCommandScope.Individual && a.priority === 'secondary')
-    // );
+    async getSecondaryActions() {
+        const scope = {};
+        const actions = await Promise.all(this.allActions()
+            .filter((a) => a.priority == 'secondary' &&
+            ((a.scope == AXPEntityCommandScope.Selected && this.hasSelectedItems()) ||
+                (a.scope == AXPEntityCommandScope.TypeLevel && !this.hasSelectedItems())))
+            .map(async (a) => {
+            const isHidden = await this.expressionEvaluator.evaluate(a.hidden, scope);
+            if (isHidden)
+                return null;
+            const disabled = await this.expressionEvaluator.evaluate(a.disabled, scope);
+            return { ...a, disabled };
+        }));
+        return actions;
+    }
     async secondaryRowActions(rowData) {
         const scope = {
             context: {
@@ -1317,6 +1313,7 @@ class AXPEntityMasterUpdateViewModel {
         }
         catch (error) {
             this.builder.setStatus(AXPPageStatus.Error);
+            return Promise.reject(error);
         }
         finally {
             this.isInProgress.set(false);