@overmap-ai/core 1.0.38-component-fields.9 → 1.0.38-component-fields.11

package/dist/overmap-core.js

@@ -3241,31 +3241,11 @@ const selectSubmissionsForComponent = restructureCreateSelectorWithArgs(
 const selectUserFormMapping = (state) => {
   return state.userFormReducer.userForms;
 };
-const selectFormsForComponentType = restructureCreateSelectorWithArgs(
+const selectComponentTypeForm = restructureCreateSelectorWithArgs(
   createSelector(
     [selectUserFormMapping, (_state, componentTypeId) => componentTypeId],
     (userForms, componentTypeId) => {
-      return Object.values(userForms).filter((userForm) => {
-        return userForm.component_type === componentTypeId;
-      });
-    }
-  )
-);
-const selectLatestRevisionsForComponentTypeForms = restructureCreateSelectorWithArgs(
-  createSelector(
-    [
-      selectUserFormMapping,
-      selectRevisionMapping,
-      (_state, componentTypeId) => componentTypeId
-    ],
-    (userForms, revisions, componentTypeId) => {
-      const latestRevisions = [];
-      for (const form of Object.values(userForms)) {
-        if (form.component_type === componentTypeId) {
-          latestRevisions.push(_selectLatestFormRevision(revisions, form.offline_id));
-        }
-      }
-      return latestRevisions;
+      return Object.values(userForms).find((userForm) => userForm.component_type === componentTypeId);
     }
   )
 );
@@ -3291,6 +3271,24 @@ const selectLatestRevisionsFromComponentTypeIds = restructureCreateSelectorWithA
     }
   )
 );
+const selectLatestRevisionsForComponentStageForms = restructureCreateSelectorWithArgs(
+  createSelector(
+    [
+      selectUserFormMapping,
+      selectRevisionMapping,
+      (_state, componentStageId) => componentStageId
+    ],
+    (userForms, revisions, componentStageId) => {
+      const latestRevisions = [];
+      for (const form of Object.values(userForms)) {
+        if (form.component_stage === componentStageId) {
+          latestRevisions.push(_selectLatestFormRevision(revisions, form.offline_id));
+        }
+      }
+      return latestRevisions;
+    }
+  )
+);
 const selectLatestRevisionByFormId = createSelector([selectRevisionMapping], (revisions) => {
   const latestRevisions = {};
   for (const revision of Object.values(revisions)) {
@@ -5468,10 +5466,13 @@ class UserFormService extends BaseApiService {
       });
     });
   }
-  async add(state, initialRevision, url, ownerUser, ownerOrganization, componentType) {
+  async add(state, initialRevision, url, ownerUser, ownerOrganization, componentTypeId, componentStageId) {
     if (!!ownerUser === !!ownerOrganization) {
       throw new Error("Exactly one of ownerUser and ownerOrganization must be defined.");
     }
+    if (componentTypeId && componentStageId) {
+      throw new Error("At most one of componentTypeId and componentStageId should be defined.");
+    }
     const ownerAttrs = {
       owner_user: ownerUser,
       owner_organization: ownerOrganization
@@ -5486,7 +5487,8 @@ class UserFormService extends BaseApiService {
       favorite: true,
       submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
       created_by: currentUser.id,
-      ...componentType && { component_type: componentType },
+      ...componentTypeId && { component_type: componentTypeId },
+      ...componentStageId && { component_stage: componentStageId },
       ...ownerAttrs
     };
     const { payloadWithoutImage, images } = await separateImageFromFields(offlineRevisionPayload);
@@ -5508,10 +5510,11 @@ class UserFormService extends BaseApiService {
       } : void 0,
       payload: {
         ...offlineFormPayload,
-        ...componentType && { component_type: componentType },
+        ...componentTypeId && { component_type: componentTypeId },
+        ...componentStageId && { component_stage: componentStageId },
         initial_revision: payloadWithoutImage
       },
-      blockers: [],
+      blockers: [componentTypeId, componentStageId].filter((x) => x !== void 0),
       blocks: [offlineFormPayload.offline_id, payloadWithoutImage.offline_id]
     });
     const attachImagesPromises = this.getAttachImagePromises(images, offlineRevisionPayload.offline_id);
@@ -5523,7 +5526,7 @@ class UserFormService extends BaseApiService {
     const settledPromise = Promise.all([formPromise, ...attachImagesPromises]).then(() => formPromise);
     return [retForm, retRevision, formPromise, settledPromise];
   }
-  async addForOrganization(initialRevision, componentType) {
+  async addForOrganization(initialRevision, componentTypeId, componentStageId) {
     const state = this.client.store.getState();
     const activeOrganizationId = state.organizationReducer.activeOrganizationId;
     if (!activeOrganizationId) {
@@ -5535,13 +5538,22 @@ class UserFormService extends BaseApiService {
       `/forms/in-organization/${activeOrganizationId}/`,
       void 0,
       activeOrganizationId,
-      componentType
+      componentTypeId,
+      componentStageId
     );
   }
-  async addForCurrentUser(initialRevision, componentType) {
+  async addForCurrentUser(initialRevision, componentTypeId, componentStageId) {
     const state = this.client.store.getState();
     const currentUser = state.userReducer.currentUser;
-    return await this.add(state, initialRevision, "/forms/my-forms/", currentUser.id, void 0, componentType);
+    return await this.add(
+      state,
+      initialRevision,
+      "/forms/my-forms/",
+      currentUser.id,
+      void 0,
+      componentTypeId,
+      componentStageId
+    );
   }
   async createRevision(formId2, revision) {
     const offlineRevision = offline(revision);
@@ -10389,6 +10401,10 @@ const FormBrowser = memo(
     }, [filter, maxResults, ownerFilter]);
     const userForms = useAppSelector(selectFilteredUserForms(ownerFilterOptions)) ?? [];
     const userFormMapping = useAppSelector(selectUserFormMapping);
+    const attachableUserForms = userForms.filter((form) => !form.component_type && !form.component_stage);
+    const attachableUserFormMapping = Object.values(userFormMapping).filter(
+      (form) => !form.component_type && !form.component_stage
+    );
     const handleToggleFavorite = useCallback(
       (form) => {
         if (form.favorite) {
@@ -10402,7 +10418,7 @@ const FormBrowser = memo(
     const options = useMemo(() => {
       const state = sdk.store.getState();
       const accumulator = {};
-      for (const form of Object.values(userFormMapping)) {
+      for (const form of attachableUserFormMapping) {
         const organization = selectOrganization(form.owner_organization || -1)(state);
         if (organization) {
           accumulator[`${orgOptionPrefix}${organization.id}`] = organization.name;
@@ -10413,13 +10429,13 @@ const FormBrowser = memo(
         }
       }
       return Object.entries(accumulator).map(([value, label]) => ({ itemContent: label, value }));
-    }, [userFormMapping, sdk.store]);
+    }, [sdk.store, attachableUserFormMapping]);
     const handleChange = useCallback((e) => {
       setFilter(e.currentTarget.value);
     }, []);
     const numberOfForms = useAppSelector(selectNumberOfUserForms) || 0;
-    const numberOfHiddenForms = numberOfForms - userForms.length;
-    const overflowMessage = userForms.length == maxResults && numberOfHiddenForms > 0 ? `Only the first ${maxResults} results are shown (${numberOfHiddenForms} hidden)` : numberOfHiddenForms > 0 && `${numberOfHiddenForms} hidden forms`;
+    const numberOfHiddenForms = numberOfForms - attachableUserForms.length;
+    const overflowMessage = attachableUserForms.length == maxResults && numberOfHiddenForms > 0 ? `Only the first ${maxResults} results are shown (${numberOfHiddenForms} hidden)` : numberOfHiddenForms > 0 && `${numberOfHiddenForms} hidden forms`;
     return /* @__PURE__ */ jsxs(Flex, { ref, direction: "column", gap: "2", children: [
       /* @__PURE__ */ jsxs(Flex, { gap: "2", grow: "1", children: [
         /* @__PURE__ */ jsx(Box, { grow: "1", asChild: true, children: /* @__PURE__ */ jsx(TextField$1.Root, { size: "3", children: /* @__PURE__ */ jsx(TextField$1.Input, { placeholder: "Filter", value: filter, onChange: handleChange }) }) }),
@@ -10434,7 +10450,7 @@ const FormBrowser = memo(
           }
         )
       ] }),
-      userForms.length > 0 && /* @__PURE__ */ jsx(ButtonList.Root, { children: userForms.map((form) => /* @__PURE__ */ jsx(
+      attachableUserForms.length > 0 && /* @__PURE__ */ jsx(ButtonList.Root, { children: attachableUserForms.map((form) => /* @__PURE__ */ jsx(
         FormBrowserEntry,
         {
           ...entryProps,
@@ -12064,6 +12080,7 @@ export {
   selectCompletedStages,
   selectComponent,
   selectComponentType,
+  selectComponentTypeForm,
   selectComponentTypeFromComponent,
   selectComponentTypeFromComponents,
   selectComponentTypes,
@@ -12088,7 +12105,6 @@ export {
   selectFileAttachmentsOfIssue,
   selectFilteredUserForms,
   selectFormRevision,
-  selectFormsForComponentType,
   selectHiddenCategoryCount,
   selectHiddenComponentTypeIds,
   selectIsFetchingInitialData,
@@ -12102,7 +12118,7 @@ export {
   selectLatestFormRevision,
   selectLatestRetryTime,
   selectLatestRevisionByFormId,
-  selectLatestRevisionsForComponentTypeForms,
+  selectLatestRevisionsForComponentStageForms,
   selectLatestRevisionsFromComponentTypeIds,
   selectMainWorkspace,
   selectMapStyle,