@nocobase/plugin-flow-engine 2.1.0-alpha.26 → 2.1.0-alpha.27

package/dist/server/flow-surfaces/service.js

@@ -56,7 +56,6 @@ var import_reference_guards = require("./reference-guards");
 var import_key_registry = require("./planning/key-registry");
 var import_blueprint = require("./blueprint");
 var import_compile_blocks = require("./blueprint/compile-blocks");
-var import_private_utils = require("./blueprint/private-utils");
 var import_default_block_actions = require("./default-block-actions");
 var import_public_data_surface_default_filter = require("./public-data-surface-default-filter");
 var import_runtime = require("./planning/runtime");
@@ -77,6 +76,7 @@ var import_route_sync = require("./route-sync");
 var import_surface_context = require("./surface-context");
 var import_context = require("./context");
 var import_configure_options = require("./configure-options");
+var import_public_compatibility = require("./public-compatibility");
 var import_service_helpers = require("./service-helpers");
 var import_errors2 = require("./reaction/errors");
 var import_template_display = require("./template-display");
@@ -262,6 +262,7 @@ const APPROVAL_CONFIRM_ACTION_USES = /* @__PURE__ */ new Set([
   "ApplyFormWithdrawModel"
 ]);
 const APPROVAL_ASSIGN_ACTION_USES = /* @__PURE__ */ new Set(["ApplyFormSubmitModel", "ApplyFormSaveDraftModel"]);
+const UPDATE_ASSIGN_ACTION_USES = /* @__PURE__ */ new Set(["UpdateRecordActionModel", "BulkUpdateActionModel"]);
 const APPROVAL_COMMENT_ACTION_USES = /* @__PURE__ */ new Set([
   "ProcessFormApproveModel",
   "ProcessFormRejectModel",
@@ -288,6 +289,15 @@ const POPUP_RECORD_ACTION_CONTAINER_USES = /* @__PURE__ */ new Set([
   "GridCardItemModel"
 ]);
 const POPUP_UNSUPPORTED_COLLECTION_SCENES = /* @__PURE__ */ new Set(["select", "subForm", "bulkEditForm"]);
+const POPUP_ASSOCIATED_RECORDS_BLOCK_USES = /* @__PURE__ */ new Set([
+  "TableBlockModel",
+  "CalendarBlockModel",
+  "KanbanBlockModel",
+  "ListBlockModel",
+  "GridCardBlockModel",
+  "MapBlockModel",
+  "CommentsBlockModel"
+]);
 const POPUP_COLLECTION_BLOCK_SCENES = {
   CreateFormModel: ["new"],
   EditFormModel: ["one", "many"],
@@ -306,6 +316,15 @@ const POPUP_COLLECTION_BLOCK_SCENES = {
   FilterFormBlockModel: ["filter"],
   FormBlockModel: []
 };
+const UPDATE_ACTION_ASSIGN_SETTINGS_ASSIGNED_VALUES_PATH = [
+  "stepParams",
+  "assignSettings",
+  "assignFieldValues",
+  "assignedValues"
+];
+const UPDATE_ACTION_APPLY_ASSIGNED_VALUES_PATH = ["stepParams", "apply", "apply", "assignedValues"];
+const UPDATE_ACTION_ASSIGN_SETTINGS_STEP_PATH = ["assignSettings", "assignFieldValues", "assignedValues"];
+const UPDATE_ACTION_APPLY_STEP_PATH = ["apply", "apply", "assignedValues"];
 const TABLE_COLUMN_STEP_PARAM_MIRRORS = [
   { domain: "props", key: "title", stepParamsPath: ["tableColumnSettings", "title", "title"] },
   { domain: "props", key: "tooltip", stepParamsPath: ["tableColumnSettings", "tooltip", "tooltip"] },
@@ -994,8 +1013,7 @@ class FlowSurfacesService {
           fieldTypes: relationFieldTypes,
           current: (0, import_service_utils.buildDefinedPayload)({
             fieldType: (0, import_field_type_resolver.getPublicFieldTypeForUse)(((_g = (_f = innerField == null ? void 0 : innerField.stepParams) == null ? void 0 : _f.fieldBinding) == null ? void 0 : _g.use) || (innerField == null ? void 0 : innerField.use)),
-            fields: this.collectRelationNestedFieldPaths(innerField),
-            selectorFields: this.collectRelationSelectorFieldPaths(innerField),
+            fields: this.collectRelationFieldPaths(innerField),
             titleField: ((_h = innerField == null ? void 0 : innerField.props) == null ? void 0 : _h.titleField) || ((_i = node == null ? void 0 : node.props) == null ? void 0 : _i.titleField)
           }),
           defaults: (0, import_service_utils.buildDefinedPayload)({
@@ -1014,12 +1032,11 @@ class FlowSurfacesService {
       const defaults = {
         titleField: defaultTitleField
       };
-      if (["subForm", "subFormList", "subDetails", "subDetailsList", "subTable", "popupSubTable"].includes(fieldType) && defaultTitleField) {
+      if (["picker", "subForm", "subFormList", "subDetails", "subDetailsList", "subTable", "popupSubTable"].includes(
+        fieldType
+      ) && defaultTitleField) {
         defaults.fields = [defaultTitleField];
       }
-      if (fieldType === "picker" && defaultTitleField) {
-        defaults.selectorFields = [defaultTitleField];
-      }
       return {
         fieldType,
         defaults: (0, import_service_utils.buildDefinedPayload)(defaults)
@@ -1060,6 +1077,9 @@ class FlowSurfacesService {
     }
     return void 0;
   }
+  collectRelationFieldPaths(fieldNode) {
+    return this.collectRelationNestedFieldPaths(fieldNode) || this.collectRelationSelectorFieldPaths(fieldNode);
+  }
   collectRelationSelectorFieldPaths(fieldNode) {
     var _a, _b, _c, _d, _e, _f;
     const fieldUse = String(((_b = (_a = fieldNode == null ? void 0 : fieldNode.stepParams) == null ? void 0 : _a.fieldBinding) == null ? void 0 : _b.use) || (fieldNode == null ? void 0 : fieldNode.use) || "").trim();
@@ -1067,7 +1087,7 @@ class FlowSurfacesService {
       return void 0;
     }
     const table = import_lodash.default.castArray(((_e = (_d = (_c = fieldNode == null ? void 0 : fieldNode.subModels) == null ? void 0 : _c["grid-block"]) == null ? void 0 : _d.subModels) == null ? void 0 : _e.items) || []).find(
-      (item) => (item == null ? void 0 : item.use) === "TableBlockModel"
+      (item) => (item == null ? void 0 : item.use) === "TableSelectModel" || (item == null ? void 0 : item.use) === "TableBlockModel"
     );
     return import_lodash.default.castArray(((_f = table == null ? void 0 : table.subModels) == null ? void 0 : _f.columns) || []).map((item) => {
       var _a2, _b2, _c2;
@@ -1110,6 +1130,9 @@ class FlowSurfacesService {
   isPopupCollectionBlockSceneUnsupported(scene) {
     return POPUP_UNSUPPORTED_COLLECTION_SCENES.has(scene);
   }
+  supportsPopupAssociatedRecordsBinding(blockUse) {
+    return POPUP_ASSOCIATED_RECORDS_BLOCK_USES.has(blockUse);
+  }
   isPopupCollectionBlockVisibleForScene(blockUse, popupProfile) {
     const blockScenes = this.getPopupCollectionBlockScenes(blockUse);
     if (this.isPopupCollectionBlockSceneUnsupported(popupProfile.scene)) {
@@ -1282,7 +1305,7 @@ class FlowSurfacesService {
         collectionName: popupProfile.collectionName
       });
     }
-    if (popupProfile.hasCurrentRecord && associationFields.length) {
+    if (this.supportsPopupAssociatedRecordsBinding(blockUse) && popupProfile.hasCurrentRecord && associationFields.length) {
       bindings.push({
         key: "associatedRecords",
         label: "Associated records",
@@ -1526,7 +1549,17 @@ class FlowSurfacesService {
       );
     }
     const resourceBindings = this.buildPopupBlockResourceBindings(input.blockUse, input.popupProfile);
-    const requestedBinding = ((_b = input.semanticResource) == null ? void 0 : _b.binding) || this.classifyPopupRawResourceInit(input.popupProfile, input.resourceInit || {});
+    let requestedBinding = ((_b = input.semanticResource) == null ? void 0 : _b.binding) || this.classifyPopupRawResourceInit(input.popupProfile, input.resourceInit || {});
+    const useLegacyAssociationPopupCurrentRecord = this.shouldUseLegacyAssociationPopupCurrentRecordBinding({
+      blockUse: input.blockUse,
+      popupProfile: input.popupProfile,
+      requestedBinding,
+      semanticResource: input.semanticResource,
+      resourceInit: input.resourceInit || {}
+    });
+    if (useLegacyAssociationPopupCurrentRecord) {
+      requestedBinding = "currentRecord";
+    }
     if (!this.isCatalogBlockVisibleForPopupProfile(input.blockUse, input.popupProfile) && requestedBinding && !["currentCollection", "otherRecords"].includes(requestedBinding)) {
       (0, import_errors.throwBadRequest)(
         `flowSurfaces ${input.actionName} block '${blockKey}' is not available in ${this.describePopupKind(
@@ -1548,6 +1581,17 @@ class FlowSurfacesService {
         resource: input.semanticResource
       });
     }
+    if (useLegacyAssociationPopupCurrentRecord) {
+      return this.compilePopupSemanticResourceInit({
+        actionName: input.actionName,
+        blockUse: input.blockUse,
+        popupProfile: input.popupProfile,
+        resourceBindings,
+        resource: {
+          binding: "currentRecord"
+        }
+      });
+    }
     return this.assertPopupRawResourceInit({
       actionName: input.actionName,
       blockUse: input.blockUse,
@@ -1556,6 +1600,25 @@ class FlowSurfacesService {
       resourceInit: input.resourceInit || {}
     });
   }
+  shouldUseLegacyAssociationPopupCurrentRecordBinding(input) {
+    return !input.semanticResource && input.requestedBinding === "currentCollection" && this.shouldNormalizeLegacyAssociationPopupRecordBlockResource({
+      blockUse: input.blockUse,
+      popupProfile: input.popupProfile,
+      resourceInit: input.resourceInit
+    });
+  }
+  shouldNormalizeLegacyAssociationPopupRecordBlockResource(input) {
+    if (!["DetailsBlockModel", "EditFormModel"].includes(input.blockUse)) {
+      return false;
+    }
+    if (input.popupProfile.popupKind !== "associationPopup" || !input.popupProfile.hasCurrentRecord || !input.popupProfile.hasAssociationContext) {
+      return false;
+    }
+    const normalized = (0, import_service_utils.normalizeSimpleResourceInit)(input.resourceInit) || {};
+    const popupDataSourceKey = input.popupProfile.dataSourceKey || "main";
+    const resourceDataSourceKey = normalized.dataSourceKey || "main";
+    return !!input.popupProfile.collectionName && resourceDataSourceKey === popupDataSourceKey && normalized.collectionName === input.popupProfile.collectionName && !(0, import_service_helpers.hasConfiguredFlowContextValue)(normalized.filterByTk) && !(0, import_service_helpers.hasConfiguredFlowContextValue)(normalized.associationName) && !(0, import_service_helpers.hasConfiguredFlowContextValue)(normalized.sourceId);
+  }
   compilePopupSemanticResourceInit(input) {
     const binding = input.resource.binding;
     const supportedBinding = input.resourceBindings.find((item) => item.key === binding);
@@ -2420,19 +2483,6 @@ class FlowSurfacesService {
         `flowSurfaces applyBlueprint navigation.group.title '${groupTitle}' matches ${matchedRoutes.length} existing menu groups; pass navigation.group.routeId explicitly`
       );
     }
-    const reusedMetadataFields = import_private_utils.APPLY_BLUEPRINT_CREATE_MENU_GROUP_METADATA_KEYS.filter(
-      (key) => {
-        var _a2, _b;
-        return !import_lodash.default.isUndefined((_b = (_a2 = document.navigation) == null ? void 0 : _a2.group) == null ? void 0 : _b[key]);
-      }
-    );
-    if (reusedMetadataFields.length) {
-      (0, import_errors.throwBadRequest)(
-        `flowSurfaces applyBlueprint navigation.group.title '${groupTitle}' matched an existing menu group; do not also pass ${reusedMetadataFields.map((key) => `navigation.group.${key}`).join(
-          ", "
-        )} when reusing by title. Same-title reuse is title-only. Keep only navigation.group.title or use navigation.group.routeId for exact targeting, and call flowSurfaces:updateMenu separately if existing group metadata must change`
-      );
-    }
     const routeId = this.readRouteField(matchedRoutes[0], "id");
     if (import_lodash.default.isNil(routeId) || routeId === "") {
       (0, import_errors.throwBadRequest)(
@@ -3893,83 +3943,89 @@ class FlowSurfacesService {
     if (!import_lodash.default.isPlainObject(values.changes) || !Object.keys(values.changes).length) {
       (0, import_errors.throwBadRequest)("flowSurfaces configure requires a non-empty changes object");
     }
-    (0, import_service_utils.ensureNoRawSimpleChangeKeys)(values.changes);
+    let changes = values.changes;
+    (0, import_service_utils.ensureNoRawSimpleChangeKeys)(changes);
     const resolved = await this.locator.resolve(target, options);
     const current = await this.loadResolvedNode(resolved, options.transaction);
+    changes = (0, import_public_compatibility.normalizeFlowSurfacePublicSortingAlias)({
+      context: "flowSurfaces configure changes",
+      use: current == null ? void 0 : current.use,
+      settings: changes
+    });
     if (resolved.kind === "page" && resolved.pageRoute) {
-      return this.configurePage(target, values.changes, options);
+      return this.configurePage(target, changes, options);
     }
     if (resolved.kind === "tab" && resolved.tabRoute) {
-      return this.configureTab(target, values.changes, options);
+      return this.configureTab(target, changes, options);
     }
     if ((current == null ? void 0 : current.use) === "TableBlockModel") {
-      return this.configureTableBlock(target, values.changes, options);
+      return this.configureTableBlock(target, changes, options);
     }
     if ((current == null ? void 0 : current.use) === "CalendarBlockModel") {
-      return this.configureCalendarBlock(target, current, values.changes, options);
+      return this.configureCalendarBlock(target, current, changes, options);
     }
     if ((current == null ? void 0 : current.use) === "TreeBlockModel") {
-      return this.configureTreeBlock(target, current, values.changes, options);
+      return this.configureTreeBlock(target, current, changes, options);
     }
     if ((current == null ? void 0 : current.use) === "KanbanBlockModel") {
-      return this.configureKanbanBlock(target, current, values.changes, options);
+      return this.configureKanbanBlock(target, current, changes, options);
     }
     if (SIMPLE_FORM_BLOCK_USES.has((current == null ? void 0 : current.use) || "")) {
-      return this.configureFormBlock(target, current.use, values.changes, options);
+      return this.configureFormBlock(target, current.use, changes, options);
     }
     if (DETAILS_BLOCK_USES.has((current == null ? void 0 : current.use) || "")) {
-      return this.configureDetailsBlock(target, values.changes, options);
+      return this.configureDetailsBlock(target, changes, options);
     }
     if ((current == null ? void 0 : current.use) === "FilterFormBlockModel") {
-      return this.configureFilterFormBlock(target, values.changes, options);
+      return this.configureFilterFormBlock(target, changes, options);
     }
     if (LIST_BLOCK_USES.has((current == null ? void 0 : current.use) || "")) {
-      return this.configureListBlock(target, values.changes, options);
+      return this.configureListBlock(target, changes, options);
     }
     if (GRID_CARD_BLOCK_USES.has((current == null ? void 0 : current.use) || "")) {
-      return this.configureGridCardBlock(target, values.changes, options);
+      return this.configureGridCardBlock(target, changes, options);
     }
     if (import_node_use_sets.JS_BLOCK_USES.has((current == null ? void 0 : current.use) || "")) {
-      return this.configureJSBlock(target, values.changes, options);
+      return this.configureJSBlock(target, changes, options);
     }
     if ((current == null ? void 0 : current.use) === "MarkdownBlockModel") {
-      return this.configureMarkdownBlock(target, values.changes, options);
+      return this.configureMarkdownBlock(target, changes, options);
     }
     if ((current == null ? void 0 : current.use) === "IframeBlockModel") {
-      return this.configureIframeBlock(target, values.changes, options);
+      return this.configureIframeBlock(target, changes, options);
     }
     if ((current == null ? void 0 : current.use) === "ChartBlockModel") {
-      return this.configureChartBlock(target, values.changes, options);
+      return this.configureChartBlock(target, changes, options);
     }
     if ((current == null ? void 0 : current.use) === "ActionPanelBlockModel") {
-      return this.configureActionPanelBlock(target, values.changes, options);
+      return this.configureActionPanelBlock(target, changes, options);
     }
     if ((current == null ? void 0 : current.use) === "MapBlockModel") {
-      return this.configureMapBlock(target, values.changes, options);
+      return this.configureMapBlock(target, changes, options);
     }
     if ((current == null ? void 0 : current.use) === "CommentsBlockModel") {
-      return this.configureCommentsBlock(target, values.changes, options);
+      return this.configureCommentsBlock(target, changes, options);
     }
     if ((current == null ? void 0 : current.use) === "TableActionsColumnModel") {
-      return this.configureActionColumn(target, values.changes, options);
+      return this.configureActionColumn(target, changes, options);
     }
     if (import_node_use_sets.FIELD_WRAPPER_USES.has((current == null ? void 0 : current.use) || "")) {
-      return this.configureFieldWrapper(target, current, values.changes, options);
+      return this.configureFieldWrapper(target, current, changes, options);
     }
     if (import_node_use_sets.STANDALONE_FIELD_NODE_USES.has((current == null ? void 0 : current.use) || "")) {
       if ((current == null ? void 0 : current.use) === "JSColumnModel") {
-        return this.configureJSColumn(target, values.changes, options);
+        return this.configureJSColumn(target, changes, options);
       }
       if ((current == null ? void 0 : current.use) === "DividerItemModel") {
-        return this.configureDividerItem(target, values.changes, options);
+        return this.configureDividerItem(target, changes, options);
       }
-      return this.configureJSItem(target, values.changes, options);
+      return this.configureJSItem(target, changes, options);
     }
     if ((0, import_service_utils.isFieldNodeUse)(current == null ? void 0 : current.use)) {
-      return this.configureFieldNode(target, values.changes, options);
+      return this.configureFieldNode(target, changes, options);
     }
     if (import_node_use_sets.ACTION_BUTTON_USES.has((current == null ? void 0 : current.use) || "")) {
-      return this.configureActionNode(target, current.use, values.changes, {
+      return this.configureActionNode(target, current.use, changes, {
         ...options,
         current
       });
@@ -5072,7 +5128,6 @@ class FlowSurfacesService {
             ...fieldSpec.type ? { type: fieldSpec.type } : {},
             ...fieldSpec.fieldType ? { fieldType: fieldSpec.fieldType } : {},
             ...!import_lodash.default.isUndefined(fieldSpec.fields) ? { fields: fieldSpec.fields } : {},
-            ...!import_lodash.default.isUndefined(fieldSpec.selectorFields) ? { selectorFields: fieldSpec.selectorFields } : {},
             ...fieldSpec.titleField ? { titleField: fieldSpec.titleField } : {},
             ...fieldSpec.openMode ? { openMode: fieldSpec.openMode } : {},
             ...fieldSpec.popupSize ? { popupSize: fieldSpec.popupSize } : {},
@@ -5314,7 +5369,6 @@ class FlowSurfacesService {
       dataSourceKey: resolvedField.dataSourceKey,
       getCollection: (dataSourceKey, collectionName) => this.getCollection(dataSourceKey, collectionName),
       fields: values.fields,
-      selectorFields: values.selectorFields,
       titleField: values.titleField,
       openMode: values.openMode,
       popupSize: values.popupSize,
@@ -7883,6 +7937,11 @@ class FlowSurfacesService {
     });
     this.syncFilterActionSettingsForUpdateSettings(current, normalizedValues, nextPayload);
     this.syncMirroredStepParamsForUpdateSettings(current, nextPayload);
+    const updateActionAssignedValues = this.syncUpdateActionAssignedValuesForUpdateSettings(
+      current,
+      normalizedValues,
+      nextPayload
+    );
     const popupActionContext = options.popupActionContext || await this.resolveRecordContextPopupActionContextForHost(current, options.transaction);
     await this.normalizeOpenViewForUpdateSettings(
       options.openViewActionName || "updateSettings",
@@ -7935,6 +7994,9 @@ class FlowSurfacesService {
       };
     }
     await this.repository.patch(nextPayload, { transaction: options.transaction });
+    if (!import_lodash.default.isUndefined(updateActionAssignedValues)) {
+      await this.syncUpdateActionAssignFormItems(current.uid, updateActionAssignedValues, options.transaction);
+    }
     if (!import_lodash.default.isUndefined((_a = nextPayload.stepParams) == null ? void 0 : _a.fieldSettings)) {
       await this.syncFieldBindingSettingsForNode(current, effectiveNode, options.transaction);
     } else if (current.use === "FilterFormItemModel") {
@@ -8057,6 +8119,173 @@ class FlowSurfacesService {
       nextPayload.stepParams = nextStepParams;
     }
   }
+  syncUpdateActionAssignedValuesForUpdateSettings(current, values, nextPayload) {
+    if (!UPDATE_ASSIGN_ACTION_USES.has(current == null ? void 0 : current.use)) {
+      return void 0;
+    }
+    const hasAssignSettingsAssignedValues = import_lodash.default.has(values, UPDATE_ACTION_ASSIGN_SETTINGS_ASSIGNED_VALUES_PATH);
+    const hasApplyAssignedValues = import_lodash.default.has(values, UPDATE_ACTION_APPLY_ASSIGNED_VALUES_PATH);
+    if (!hasAssignSettingsAssignedValues && !hasApplyAssignedValues) {
+      return void 0;
+    }
+    const nextStepParams = import_lodash.default.cloneDeep(nextPayload.stepParams ?? (current == null ? void 0 : current.stepParams) ?? {});
+    const clearsAssignSettingsAssignedValues = hasAssignSettingsAssignedValues && import_lodash.default.isPlainObject(import_lodash.default.get(values, UPDATE_ACTION_ASSIGN_SETTINGS_ASSIGNED_VALUES_PATH)) && !Object.keys(import_lodash.default.get(values, UPDATE_ACTION_ASSIGN_SETTINGS_ASSIGNED_VALUES_PATH)).length;
+    const clearsApplyAssignedValues = hasApplyAssignedValues && import_lodash.default.isPlainObject(import_lodash.default.get(values, UPDATE_ACTION_APPLY_ASSIGNED_VALUES_PATH)) && !Object.keys(import_lodash.default.get(values, UPDATE_ACTION_APPLY_ASSIGNED_VALUES_PATH)).length;
+    const assignSettingsAssignedValues = clearsAssignSettingsAssignedValues ? {} : import_lodash.default.cloneDeep(import_lodash.default.get(nextStepParams, UPDATE_ACTION_ASSIGN_SETTINGS_STEP_PATH));
+    const applyAssignedValues = clearsApplyAssignedValues ? {} : import_lodash.default.cloneDeep(import_lodash.default.get(nextStepParams, UPDATE_ACTION_APPLY_STEP_PATH));
+    if (hasAssignSettingsAssignedValues && hasApplyAssignedValues && !import_lodash.default.isEqual(assignSettingsAssignedValues, applyAssignedValues)) {
+      (0, import_errors.throwBadRequest)(
+        "flowSurfaces updateSettings update action values 'stepParams.assignSettings.assignFieldValues.assignedValues' and 'stepParams.apply.apply.assignedValues' must match"
+      );
+    }
+    const assignedValues = hasAssignSettingsAssignedValues ? assignSettingsAssignedValues : applyAssignedValues;
+    if (!import_lodash.default.isPlainObject(assignedValues)) {
+      (0, import_errors.throwBadRequest)(
+        "flowSurfaces updateSettings update action values 'stepParams.assignSettings.assignFieldValues.assignedValues' requires an object payload"
+      );
+    }
+    import_lodash.default.set(nextStepParams, UPDATE_ACTION_ASSIGN_SETTINGS_STEP_PATH, import_lodash.default.cloneDeep(assignedValues));
+    import_lodash.default.set(nextStepParams, UPDATE_ACTION_APPLY_STEP_PATH, import_lodash.default.cloneDeep(assignedValues));
+    nextPayload.stepParams = nextStepParams;
+    return assignedValues;
+  }
+  async syncUpdateActionAssignFormItems(actionUid, assignedValues, transaction) {
+    var _a, _b, _c, _d, _e, _f;
+    const actionNode = await this.repository.findModelById(actionUid, {
+      transaction,
+      includeAsyncNode: true
+    });
+    if (!UPDATE_ASSIGN_ACTION_USES.has(actionNode == null ? void 0 : actionNode.use)) {
+      return;
+    }
+    const resourceContext = await this.locator.resolveCollectionContext(actionUid, transaction).catch(() => null);
+    const resourceInit = (resourceContext == null ? void 0 : resourceContext.resourceInit) || {};
+    const dataSourceKey = resourceInit.dataSourceKey || "main";
+    const collectionName = resourceInit.collectionName;
+    const assignFormUid = await this.ensureUpdateActionAssignForm(actionNode, resourceInit, transaction);
+    const assignFormGridUid = await this.ensureUpdateActionAssignFormGrid(assignFormUid, transaction);
+    const refreshedGrid = await this.repository.findModelById(assignFormGridUid, {
+      transaction,
+      includeAsyncNode: true
+    });
+    const existingItems = import_lodash.default.castArray(((_a = refreshedGrid == null ? void 0 : refreshedGrid.subModels) == null ? void 0 : _a.items) || []);
+    const existingItemsByFieldPath = /* @__PURE__ */ new Map();
+    existingItems.forEach((item) => {
+      var _a2, _b2, _c2;
+      const fieldPath = String(((_c2 = (_b2 = (_a2 = item == null ? void 0 : item.stepParams) == null ? void 0 : _a2.fieldSettings) == null ? void 0 : _b2.init) == null ? void 0 : _c2.fieldPath) || "").trim();
+      if (fieldPath && !existingItemsByFieldPath.has(fieldPath)) {
+        existingItemsByFieldPath.set(fieldPath, item);
+      }
+    });
+    const nextFieldPaths = new Set(Object.keys(assignedValues || {}).filter((fieldPath) => String(fieldPath).trim()));
+    const keptFieldPaths = /* @__PURE__ */ new Set();
+    for (const staleItem of existingItems) {
+      const fieldPath = String(((_d = (_c = (_b = staleItem == null ? void 0 : staleItem.stepParams) == null ? void 0 : _b.fieldSettings) == null ? void 0 : _c.init) == null ? void 0 : _d.fieldPath) || "").trim();
+      if (!fieldPath || !nextFieldPaths.has(fieldPath) || keptFieldPaths.has(fieldPath)) {
+        await this.repository.remove(staleItem.uid, { transaction });
+        continue;
+      }
+      keptFieldPaths.add(fieldPath);
+    }
+    for (const fieldPath of nextFieldPaths) {
+      const existingItem = existingItemsByFieldPath.get(fieldPath);
+      await this.repository.upsertModel(
+        this.buildUpdateActionAssignFormItemTree({
+          existingItem,
+          uid: existingItem == null ? void 0 : existingItem.uid,
+          fieldUid: (_f = (_e = existingItem == null ? void 0 : existingItem.subModels) == null ? void 0 : _e.field) == null ? void 0 : _f.uid,
+          parentId: assignFormGridUid,
+          dataSourceKey,
+          collectionName,
+          fieldPath,
+          value: assignedValues[fieldPath]
+        }),
+        { transaction }
+      );
+    }
+  }
+  async ensureUpdateActionAssignForm(actionNode, resourceInit, transaction) {
+    var _a;
+    const existing = (_a = actionNode == null ? void 0 : actionNode.subModels) == null ? void 0 : _a.assignForm;
+    if (existing == null ? void 0 : existing.uid) {
+      return existing.uid;
+    }
+    const assignFormUid = (0, import_utils.uid)();
+    await this.repository.upsertModel(
+      {
+        uid: assignFormUid,
+        parentId: actionNode.uid,
+        subKey: "assignForm",
+        subType: "object",
+        use: "AssignFormModel",
+        stepParams: {
+          resourceSettings: {
+            init: import_lodash.default.cloneDeep(resourceInit || {})
+          }
+        }
+      },
+      { transaction }
+    );
+    return assignFormUid;
+  }
+  async ensureUpdateActionAssignFormGrid(assignFormUid, transaction) {
+    return this.ensureGridChild(assignFormUid, "AssignFormGridModel", transaction);
+  }
+  buildUpdateActionAssignFormItemTree(input) {
+    var _a;
+    const init = import_lodash.default.pickBy(
+      {
+        dataSourceKey: input.dataSourceKey,
+        collectionName: input.collectionName,
+        fieldPath: input.fieldPath
+      },
+      (value) => !import_lodash.default.isUndefined(value)
+    );
+    const fieldUse = this.resolveUpdateActionAssignFormFieldUse(
+      input.dataSourceKey,
+      input.collectionName,
+      input.fieldPath
+    );
+    const existingItem = input.existingItem || {};
+    const existingField = ((_a = existingItem == null ? void 0 : existingItem.subModels) == null ? void 0 : _a.field) || {};
+    const itemStepParams = import_lodash.default.cloneDeep(existingItem.stepParams || {});
+    import_lodash.default.set(itemStepParams, ["fieldSettings", "init"], init);
+    import_lodash.default.set(itemStepParams, ["fieldSettings", "assignValue", "value"], import_lodash.default.cloneDeep(input.value));
+    const fieldStepParams = import_lodash.default.cloneDeep(existingField.stepParams || {});
+    import_lodash.default.set(fieldStepParams, ["fieldSettings", "init"], init);
+    return {
+      uid: input.uid || (0, import_utils.uid)(),
+      parentId: input.parentId,
+      subKey: "items",
+      subType: "array",
+      use: "AssignFormItemModel",
+      stepParams: itemStepParams,
+      subModels: {
+        field: {
+          uid: input.fieldUid || (0, import_utils.uid)(),
+          use: existingField.use || fieldUse,
+          stepParams: fieldStepParams
+        }
+      }
+    };
+  }
+  resolveUpdateActionAssignFormFieldUse(dataSourceKey, collectionName, fieldPath) {
+    const collection = collectionName ? this.getCollection(dataSourceKey, collectionName) : null;
+    const field = (0, import_service_helpers.resolveFieldFromCollection)(collection, fieldPath);
+    if (field) {
+      const registeredBinding = this.resolveRegisteredFieldBinding({
+        containerUse: "AssignFormGridModel",
+        field,
+        dataSourceKey,
+        useStrictOnly: true
+      });
+      if (registeredBinding == null ? void 0 : registeredBinding.modelClassName) {
+        return registeredBinding.modelClassName;
+      }
+      return (0, import_service_helpers.inferFieldMenuEditableFieldUse)((0, import_service_helpers.getFieldInterface)(field)) || "InputFieldModel";
+    }
+    return "InputFieldModel";
+  }
   normalizeCanonicalBlockHeaderWriteForUpdateSettings(current, values) {
     const semanticUse = (0, import_approval.normalizeApprovalSemanticUse)(current == null ? void 0 : current.use);
     if (!CANONICAL_BLOCK_HEADER_USES.has(semanticUse)) {
@@ -11162,7 +11391,6 @@ class FlowSurfacesService {
       "version",
       "fieldType",
       "fields",
-      "selectorFields",
       "openMode",
       "popupSize",
       "pageSize",
@@ -11277,7 +11505,7 @@ class FlowSurfacesService {
     let effectiveInnerFieldUse = innerField == null ? void 0 : innerField.use;
     let fieldTypeResolution;
     let relationTitleFieldToApply;
-    if ((0, import_service_utils.hasOwnDefined)(changes, "fieldType") || (0, import_service_utils.hasOwnDefined)(changes, "fields") || (0, import_service_utils.hasOwnDefined)(changes, "selectorFields") || (0, import_service_utils.hasOwnDefined)(changes, "titleField") || (0, import_service_utils.hasOwnDefined)(changes, "openMode") || (0, import_service_utils.hasOwnDefined)(changes, "popupSize") || (0, import_service_utils.hasOwnDefined)(changes, "pageSize") || (0, import_service_utils.hasOwnDefined)(changes, "showIndex")) {
+    if ((0, import_service_utils.hasOwnDefined)(changes, "fieldType") || (0, import_service_utils.hasOwnDefined)(changes, "fields") || (0, import_service_utils.hasOwnDefined)(changes, "titleField") || (0, import_service_utils.hasOwnDefined)(changes, "openMode") || (0, import_service_utils.hasOwnDefined)(changes, "popupSize") || (0, import_service_utils.hasOwnDefined)(changes, "pageSize") || (0, import_service_utils.hasOwnDefined)(changes, "showIndex")) {
       if (!innerUid) {
         (0, import_errors.throwConflict)(
           `flowSurfaces configure field wrapper '${current == null ? void 0 : current.use}' cannot resolve inner field`,
@@ -11296,7 +11524,6 @@ class FlowSurfacesService {
         dataSourceKey: (_l = fieldSource.fieldSettingsInit) == null ? void 0 : _l.dataSourceKey,
         getCollection: (dataSourceKey, collectionName) => this.getCollection(dataSourceKey, collectionName),
         fields: changes.fields,
-        selectorFields: changes.selectorFields,
         titleField: (0, import_service_utils.hasOwnDefined)(wrapperChanges, "titleField") ? wrapperChanges.titleField : void 0,
         openMode: (0, import_service_utils.hasOwnDefined)(changes, "openMode") ? changes.openMode : void 0,
         popupSize: (0, import_service_utils.hasOwnDefined)(changes, "popupSize") ? changes.popupSize : void 0,
@@ -11327,7 +11554,7 @@ class FlowSurfacesService {
         targetCollection: fieldTypeResolution.targetCollection,
         relationFieldInit: fieldSource.fieldSettingsInit,
         fields: (0, import_service_utils.hasOwnDefined)(changes, "fields") || shouldApplyFieldTypeDefaults ? fieldTypeResolution.fields : void 0,
-        selectorFields: (0, import_service_utils.hasOwnDefined)(changes, "selectorFields") || shouldApplyFieldTypeDefaults ? fieldTypeResolution.selectorFields : void 0,
+        selectorFields: (0, import_service_utils.hasOwnDefined)(changes, "fields") || shouldApplyFieldTypeDefaults ? fieldTypeResolution.selectorFields : void 0,
         titleField: relationTitleFieldToApply,
         openMode: fieldTypeResolution.openMode,
         popupSize: fieldTypeResolution.popupSize,
@@ -11547,6 +11774,12 @@ class FlowSurfacesService {
     }
     return import_lodash.default.cloneDeep(value);
   }
+  normalizeActionAssignValues(actionName, value) {
+    if (!import_lodash.default.isPlainObject(value)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} assignValues must be an object`);
+    }
+    return import_lodash.default.cloneDeep(value);
+  }
   async configureActionNode(target, use, changes, options) {
     changes = await this.normalizeActionPanelActionChanges(changes, options);
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)(use);
@@ -11634,7 +11867,7 @@ class FlowSurfacesService {
         stepParams.submitSettings = {
           confirm: (0, import_service_utils.normalizeSimpleConfirm)(changes.confirm)
         };
-      } else if (["UpdateRecordActionModel", "BulkUpdateActionModel"].includes(use)) {
+      } else if (UPDATE_ASSIGN_ACTION_USES.has(use)) {
         stepParams.assignSettings = {
           confirm: (0, import_service_utils.normalizeSimpleConfirm)(changes.confirm)
         };
@@ -11643,25 +11876,26 @@ class FlowSurfacesService {
       }
     }
     if ((0, import_service_utils.hasOwnDefined)(changes, "assignValues")) {
+      const assignValues = this.normalizeActionAssignValues("configure", changes.assignValues);
       if (APPROVAL_ASSIGN_ACTION_USES.has(use)) {
         stepParams.clickSettings = {
           ...stepParams.clickSettings || {},
           assignFieldValues: {
-            assignedValues: changes.assignValues
+            assignedValues: assignValues
           }
         };
-      } else if (!["UpdateRecordActionModel", "BulkUpdateActionModel"].includes(use)) {
+      } else if (!UPDATE_ASSIGN_ACTION_USES.has(use)) {
         (0, import_errors.throwBadRequest)(`flowSurfaces configure action '${use}' does not support assignValues`);
       } else {
         stepParams.assignSettings = {
           ...stepParams.assignSettings || {},
           assignFieldValues: {
-            assignedValues: changes.assignValues
+            assignedValues: assignValues
           }
         };
         stepParams.apply = {
           apply: {
-            assignedValues: changes.assignValues
+            assignedValues: assignValues
           }
         };
       }
@@ -11677,7 +11911,7 @@ class FlowSurfacesService {
       };
     }
     if ((0, import_service_utils.hasOwnDefined)(changes, "updateMode")) {
-      if (!["UpdateRecordActionModel", "BulkUpdateActionModel"].includes(use)) {
+      if (!UPDATE_ASSIGN_ACTION_USES.has(use)) {
         (0, import_errors.throwBadRequest)(`flowSurfaces configure action '${use}' does not support updateMode`);
       }
       stepParams.assignSettings = {
@@ -14874,10 +15108,12 @@ class FlowSurfacesService {
     }
     if (input.fieldUse === "RecordPickerFieldModel") {
       await this.applyRecordPickerFieldTypeSettings(input);
+    } else if (input.fieldUse === "PopupSubTableFieldModel") {
+      await this.ensureRelationSelectorGridTable(input);
     }
   }
   async applyRecordPickerFieldTypeSettings(input) {
-    var _a, _b, _c;
+    var _a;
     const fieldNode = await this.repository.findModelById(input.fieldUid, {
       transaction: input.transaction,
       includeAsyncNode: true
@@ -14902,6 +15138,10 @@ class FlowSurfacesService {
         { transaction: input.transaction }
       );
     }
+    await this.ensureRelationSelectorGridTable(input);
+  }
+  async ensureRelationSelectorGridTable(input) {
+    var _a, _b, _c;
     if (!input.selectorFields) {
       return;
     }
@@ -14918,6 +15158,7 @@ class FlowSurfacesService {
           parentId: input.fieldUid,
           subKey: "grid-block",
           subType: "object",
+          async: true,
           use: "BlockGridModel"
         },
         { transaction: input.transaction }
@@ -14930,30 +15171,67 @@ class FlowSurfacesService {
     if (!(grid == null ? void 0 : grid.uid)) {
       return;
     }
-    const existingTable = import_lodash.default.castArray(((_b = grid == null ? void 0 : grid.subModels) == null ? void 0 : _b.items) || []).find(
-      (item) => (item == null ? void 0 : item.use) === "TableBlockModel"
-    );
+    const gridItems = import_lodash.default.castArray(((_a = grid == null ? void 0 : grid.subModels) == null ? void 0 : _a.items) || []);
+    const existingTable = gridItems.find((item) => (item == null ? void 0 : item.use) === "TableSelectModel") || gridItems.find((item) => (item == null ? void 0 : item.use) === "TableBlockModel");
     const tableUid = (existingTable == null ? void 0 : existingTable.uid) || (0, import_utils.uid)();
-    if (!(existingTable == null ? void 0 : existingTable.uid)) {
-      await this.repository.upsertModel(
-        {
-          uid: tableUid,
-          parentId: grid.uid,
-          subKey: "items",
-          subType: "array",
-          use: "TableBlockModel",
-          stepParams: {
-            resourceSettings: {
-              init: {
-                dataSourceKey: ((_c = input.targetCollection) == null ? void 0 : _c.dataSourceKey) || "main",
-                collectionName: (0, import_service_helpers.getCollectionName)(input.targetCollection)
-              }
+    for (const item of gridItems) {
+      if ((item == null ? void 0 : item.uid) && item.uid !== tableUid) {
+        await this.removeNodeTreeWithBindings(item.uid, input.transaction);
+      }
+    }
+    await this.repository.upsertModel(
+      {
+        ...import_lodash.default.omit(import_lodash.default.cloneDeep(existingTable || {}), [
+          "uid",
+          "use",
+          "subModels",
+          "sortIndex",
+          "parentId",
+          "subKey",
+          "subType"
+        ]),
+        uid: tableUid,
+        parentId: grid.uid,
+        subKey: "items",
+        subType: "array",
+        use: "TableSelectModel",
+        stepParams: import_lodash.default.merge({}, import_lodash.default.cloneDeep((existingTable == null ? void 0 : existingTable.stepParams) || {}), {
+          resourceSettings: {
+            init: {
+              dataSourceKey: ((_b = input.targetCollection) == null ? void 0 : _b.dataSourceKey) || "main",
+              collectionName: (0, import_service_helpers.getCollectionName)(input.targetCollection)
             }
           }
+        })
+      },
+      { transaction: input.transaction }
+    );
+    const layout = {
+      rows: {
+        row1: [[tableUid]]
+      },
+      sizes: {
+        row1: [24]
+      },
+      rowOrder: ["row1"]
+    };
+    await this.repository.patch(
+      {
+        uid: grid.uid,
+        props: {
+          ...grid.props || {},
+          ...layout
         },
-        { transaction: input.transaction }
-      );
-    }
+        stepParams: {
+          ...grid.stepParams || {},
+          [GRID_SETTINGS_FLOW_KEY]: {
+            ...((_c = grid.stepParams) == null ? void 0 : _c[GRID_SETTINGS_FLOW_KEY]) || {},
+            [GRID_SETTINGS_LAYOUT_STEP_KEY]: layout
+          }
+        }
+      },
+      { transaction: input.transaction }
+    );
     await this.replaceFieldSubModelArray({
       parentUid: tableUid,
       subKey: "columns",