@overmap-ai/core 1.0.38-component-fields.32 → 1.0.38-component-fields.34

package/dist/overmap-core.umd.cjs

@@ -1673,6 +1673,22 @@ var __publicField = (obj, key, value) => {
         action.payload.forEach((id) => {
           delete state.stages[id];
         });
+      },
+      linkStageToForm: (state, action) => {
+        const { stageId, formId: formId2 } = action.payload;
+        const stage = state.stages[stageId];
+        if (!stage) {
+          throw new Error("No stage exists with the id " + stageId);
+        }
+        stage.user_form = formId2;
+      },
+      unlinkStageToForm: (state, action) => {
+        const { stageId } = action.payload;
+        const stage = state.stages[stageId];
+        if (!stage) {
+          throw new Error("No stage exists with the id " + stageId);
+        }
+        delete stage.user_form;
       }
     }
   });
@@ -1717,7 +1733,7 @@ var __publicField = (obj, key, value) => {
       return stageIds.map((offline_id) => stageMapping[offline_id]).filter((stage) => !!stage);
     })
   );
-  const { addStages, updateStages, removeStages } = componentStageSlice.actions;
+  const { addStages, updateStages, removeStages, linkStageToForm, unlinkStageToForm } = componentStageSlice.actions;
   const componentStageReducer = componentStageSlice.reducer;
   const initialState$g = {
     componentTypes: {},
@@ -3093,22 +3109,6 @@ var __publicField = (obj, key, value) => {
         }
         form.favorite = false;
       },
-      attachFormToComponentStage: (state, action) => {
-        const { formId: formId2, componentStageId } = action.payload;
-        const form = state.userForms[formId2];
-        if (!form) {
-          throw new Error("No form exists with the id " + formId2);
-        }
-        form.component_stage = componentStageId;
-      },
-      removeFormFromComponentStage: (state, action) => {
-        const { formId: formId2 } = action.payload;
-        const form = state.userForms[formId2];
-        if (!form) {
-          throw new Error("No form exists with the id " + formId2);
-        }
-        form.component_stage = void 0;
-      },
       deleteUserForm: (state, action) => {
         delete state.userForms[action.payload];
       }
@@ -3124,8 +3124,6 @@ var __publicField = (obj, key, value) => {
     deleteUserFormSubmissions,
     favoriteForm,
     unfavoriteForm,
-    attachFormToComponentStage,
-    removeFormFromComponentStage,
     deleteUserForm,
     deleteUserFormRevision,
     deleteUserFormRevisions,
@@ -3212,7 +3210,6 @@ var __publicField = (obj, key, value) => {
   const selectSubmissionMapping = (state) => state.userFormReducer.submissions;
   const selectSubmissions = toolkit.createSelector([selectSubmissionMapping], (submissions) => Object.values(submissions));
   const selectRevisionMapping = (state) => state.userFormReducer.revisions;
-  const selectRevisionAttachmentsMapping = (state) => state.userFormReducer.revisionAttachments;
   const selectRevisions = toolkit.createSelector([selectRevisionMapping], (revisions) => Object.values(revisions));
   const selectRevisionsForForm = restructureCreateSelectorWithArgs(
     toolkit.createSelector([selectRevisions, (_state, formId2) => formId2], (revisions, formId2) => {
@@ -3282,38 +3279,6 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
-  const selectComponentStageFormLatestRevision = restructureCreateSelectorWithArgs(
-    toolkit.createSelector(
-      [
-        selectUserFormMapping,
-        selectRevisionMapping,
-        (_state, componentStageId) => componentStageId
-      ],
-      (userForms, revisions, componentStageId) => {
-        const form = Object.values(userForms).find((userForm) => userForm.component_stage === componentStageId);
-        return form ? _selectLatestFormRevision(revisions, form.offline_id) : void 0;
-      }
-    )
-  );
-  const selectLatestRevisionsFromComponentStageIds = restructureCreateSelectorWithArgs(
-    toolkit.createSelector(
-      [
-        selectUserFormMapping,
-        selectRevisionMapping,
-        (_state, componentStageIds) => componentStageIds
-      ],
-      (userForms, revisions, componentStageIds) => {
-        const componentStageIdsSet = new Set(componentStageIds);
-        const ret = {};
-        for (const form of Object.values(userForms)) {
-          if (form.component_stage && componentStageIdsSet.has(form.component_stage)) {
-            ret[form.component_stage] = _selectLatestFormRevision(revisions, form.offline_id);
-          }
-        }
-        return ret;
-      }
-    )
-  );
   const selectLatestRevisionByFormId = toolkit.createSelector([selectRevisionMapping], (revisions) => {
     const latestRevisions = {};
     for (const revision of Object.values(revisions)) {
@@ -3325,19 +3290,6 @@ var __publicField = (obj, key, value) => {
     }
     return latestRevisions;
   });
-  const selectAllRevisionAttachmentsByLatestRevisionId = toolkit.createSelector(
-    [selectUserFormMapping, selectRevisionMapping, selectRevisionAttachmentsMapping],
-    (forms, revisions, attachments) => {
-      const mappedAttachments = {};
-      for (const form of Object.values(forms)) {
-        const latestRevision = _selectLatestFormRevision(revisions, form.offline_id);
-        if (attachments[latestRevision.offline_id] !== void 0) {
-          mappedAttachments[latestRevision.offline_id] = attachments[latestRevision.offline_id];
-        }
-      }
-      return mappedAttachments;
-    }
-  );
   const selectNumberOfUserForms = toolkit.createSelector([selectUserFormMapping], (userForms) => {
     return Object.keys(userForms).length;
   });
@@ -4709,6 +4661,39 @@ var __publicField = (obj, key, value) => {
         blocks: [componentStage.offline_id]
       });
     }
+    async linkForm(stageId, formId2) {
+      const { store } = this.client;
+      store.dispatch(linkStageToForm({ stageId, formId: formId2 }));
+      try {
+        await this.enqueueRequest({
+          description: "Link component stage to form",
+          method: HttpMethod.POST,
+          url: `/components/stages/${stageId}/associate-with-form/`,
+          payload: { user_form: formId2 },
+          blockers: [stageId, formId2],
+          blocks: [stageId]
+        });
+      } catch (e) {
+        store.dispatch(unlinkStageToForm({ stageId }));
+        throw e;
+      }
+    }
+    async unlinkForm(stageId, formId2) {
+      const { store } = this.client;
+      store.dispatch(unlinkStageToForm({ stageId }));
+      try {
+        await this.enqueueRequest({
+          description: "Unlink component stage from form",
+          method: HttpMethod.DELETE,
+          url: `/components/stages/${stageId}/associate-with-form/`,
+          blockers: [stageId, formId2],
+          blocks: [stageId]
+        });
+      } catch (e) {
+        store.dispatch(linkStageToForm({ stageId, formId: formId2 }));
+        throw e;
+      }
+    }
     async refreshStore() {
       const { store } = this.client;
       const result = await this.enqueueRequest({
@@ -5494,13 +5479,10 @@ var __publicField = (obj, key, value) => {
         });
       });
     }
-    async add(state, initialRevision, url, ownerUser, ownerOrganization, componentTypeId, componentStageId) {
+    async add(state, initialRevision, url, ownerUser, ownerOrganization, componentTypeId) {
       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
@@ -5516,7 +5498,6 @@ var __publicField = (obj, key, value) => {
         submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
         created_by: currentUser.id,
         ...componentTypeId && { component_type: componentTypeId },
-        ...componentStageId && { component_stage: componentStageId },
         ...ownerAttrs
       };
       const { payloadWithoutImage, images } = await separateImageFromFields(offlineRevisionPayload);
@@ -5539,10 +5520,9 @@ var __publicField = (obj, key, value) => {
         payload: {
           ...offlineFormPayload,
           ...componentTypeId && { component_type: componentTypeId },
-          ...componentStageId && { component_stage: componentStageId },
           initial_revision: payloadWithoutImage
         },
-        blockers: [componentTypeId, componentStageId].filter((x) => x !== void 0),
+        blockers: [componentTypeId].filter((x) => x !== void 0),
         blocks: [offlineFormPayload.offline_id, payloadWithoutImage.offline_id]
       });
       const attachImagesPromises = this.getAttachImagePromises(images, offlineRevisionPayload.offline_id);
@@ -5554,7 +5534,7 @@ var __publicField = (obj, key, value) => {
       const settledPromise = Promise.all([formPromise, ...attachImagesPromises]).then(() => formPromise);
       return [retForm, retRevision, formPromise, settledPromise];
     }
-    async addForOrganization(initialRevision, componentTypeId, componentStageId) {
+    async addForOrganization(initialRevision, componentTypeId) {
       const state = this.client.store.getState();
       const activeOrganizationId = state.organizationReducer.activeOrganizationId;
       if (!activeOrganizationId) {
@@ -5566,22 +5546,13 @@ var __publicField = (obj, key, value) => {
         `/forms/in-organization/${activeOrganizationId}/`,
         void 0,
         activeOrganizationId,
-        componentTypeId,
-        componentStageId
+        componentTypeId
       );
     }
-    async addForCurrentUser(initialRevision, componentTypeId, componentStageId) {
+    async addForCurrentUser(initialRevision, componentTypeId) {
       const state = this.client.store.getState();
       const currentUser = state.userReducer.currentUser;
-      return await this.add(
-        state,
-        initialRevision,
-        "/forms/my-forms/",
-        currentUser.id,
-        void 0,
-        componentTypeId,
-        componentStageId
-      );
+      return await this.add(state, initialRevision, "/forms/my-forms/", currentUser.id, void 0, componentTypeId);
     }
     async createRevision(formId2, revision) {
       const offlineRevision = offline(revision);
@@ -5654,39 +5625,6 @@ var __publicField = (obj, key, value) => {
         throw e;
       }
     }
-    async attachToComponentStage(formId2, componentStageId) {
-      const { store } = this.client;
-      store.dispatch(attachFormToComponentStage({ formId: formId2, componentStageId }));
-      try {
-        await this.enqueueRequest({
-          description: "Attach form to component stage",
-          method: HttpMethod.POST,
-          url: `/forms/${formId2}/associate-with-stage/`,
-          payload: { component_stage: componentStageId },
-          blockers: [formId2, componentStageId],
-          blocks: [formId2]
-        });
-      } catch (e) {
-        store.dispatch(removeFormFromComponentStage({ formId: formId2 }));
-        throw e;
-      }
-    }
-    async removeFromComponentStage(formId2, componentStageId) {
-      const { store } = this.client;
-      store.dispatch(removeFormFromComponentStage({ formId: formId2 }));
-      try {
-        await this.enqueueRequest({
-          description: "Remove form from component stage",
-          method: HttpMethod.DELETE,
-          url: `/forms/${formId2}/associate-with-stage/`,
-          blockers: [formId2, componentStageId],
-          blocks: [formId2]
-        });
-      } catch (e) {
-        store.dispatch(attachFormToComponentStage({ formId: formId2, componentStageId }));
-        throw e;
-      }
-    }
     async delete(formId2) {
       const { store } = this.client;
       const state = store.getState();
@@ -10367,10 +10305,12 @@ var __publicField = (obj, key, value) => {
   };
   const useAttachImagesToFormRevisionFields = (revision) => {
     const { sdk } = useSDK();
-    const attachments = useAppSelector(selectRevisionAttachments(revision.offline_id));
+    const attachments = useAppSelector(selectRevisionAttachments((revision == null ? void 0 : revision.offline_id) ?? ""));
     return React.useMemo(() => {
+      if (!revision || !attachments)
+        return revision;
       const revisionCopy = structuredClone(revision);
-      for (const attachment of attachments ?? []) {
+      for (const attachment of attachments) {
         const filePromise = sdk.files.fetchFileFromUrl(attachment.file, attachment.file_sha1, attachment.file_name);
         let sectionIndex = -1;
         let fieldIndex = -1;
@@ -10455,6 +10395,9 @@ var __publicField = (obj, key, value) => {
         );
       }
       const revisionWithImages = useAttachImagesToFormRevisionFields(revision);
+      if (!revisionWithImages) {
+        throw new Error("Expected revisionWithImages to be defined");
+      }
       const schema = React.useMemo(() => {
         return formRevisionToSchema(revisionWithImages, { readonly: true });
       }, [revisionWithImages]);
@@ -11780,8 +11723,9 @@ var __publicField = (obj, key, value) => {
         }),
         [initialTitle]
       );
+      const revisionWithImages = useAttachImagesToFormRevisionFields(revision);
       const formik$1 = formik.useFormik({
-        initialValues: wrapRootFieldsWithFieldSection(revision) ?? initialValues,
+        initialValues: wrapRootFieldsWithFieldSection(revisionWithImages) ?? initialValues,
         validate,
         onSubmit: onSave,
         validateOnChange: false,
@@ -12022,7 +11966,6 @@ var __publicField = (obj, key, value) => {
   exports2.addUsers = addUsers;
   exports2.addWorkspace = addWorkspace;
   exports2.areArraysEqual = areArraysEqual;
-  exports2.attachFormToComponentStage = attachFormToComponentStage;
   exports2.authReducer = authReducer;
   exports2.authSlice = authSlice;
   exports2.blobToBase64 = blobToBase64;
@@ -12101,6 +12044,7 @@ var __publicField = (obj, key, value) => {
   exports2.issueReducer = issueReducer;
   exports2.issueSlice = issueSlice;
   exports2.issueToSearchResult = issueToSearchResult;
+  exports2.linkStageToForm = linkStageToForm;
   exports2.literalToCoordinates = literalToCoordinates;
   exports2.logOnlyOnce = logOnlyOnce;
   exports2.makeClient = makeClient;
@@ -12145,7 +12089,6 @@ var __publicField = (obj, key, value) => {
   exports2.removeComponent = removeComponent;
   exports2.removeEmailDomain = removeEmailDomain;
   exports2.removeFavouriteProjectId = removeFavouriteProjectId;
-  exports2.removeFormFromComponentStage = removeFormFromComponentStage;
   exports2.removeIssue = removeIssue;
   exports2.removeIssueComment = removeIssueComment;
   exports2.removeOrganizationAccess = removeOrganizationAccess;
@@ -12178,7 +12121,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectActiveWorkspace = selectActiveWorkspace;
   exports2.selectActiveWorkspaceId = selectActiveWorkspaceId;
   exports2.selectAllAttachments = selectAllAttachments;
-  exports2.selectAllRevisionAttachmentsByLatestRevisionId = selectAllRevisionAttachmentsByLatestRevisionId;
   exports2.selectAppearance = selectAppearance;
   exports2.selectCategories = selectCategories;
   exports2.selectCategoriesOfWorkspace = selectCategoriesOfWorkspace;
@@ -12191,7 +12133,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectCompletedStageIdsForComponent = selectCompletedStageIdsForComponent;
   exports2.selectCompletedStages = selectCompletedStages;
   exports2.selectComponent = selectComponent;
-  exports2.selectComponentStageFormLatestRevision = selectComponentStageFormLatestRevision;
   exports2.selectComponentType = selectComponentType;
   exports2.selectComponentTypeForm = selectComponentTypeForm;
   exports2.selectComponentTypeFromComponent = selectComponentTypeFromComponent;
@@ -12231,7 +12172,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectLatestFormRevision = selectLatestFormRevision;
   exports2.selectLatestRetryTime = selectLatestRetryTime;
   exports2.selectLatestRevisionByFormId = selectLatestRevisionByFormId;
-  exports2.selectLatestRevisionsFromComponentStageIds = selectLatestRevisionsFromComponentStageIds;
   exports2.selectLatestRevisionsFromComponentTypeIds = selectLatestRevisionsFromComponentTypeIds;
   exports2.selectMainWorkspace = selectMainWorkspace;
   exports2.selectMapStyle = selectMapStyle;
@@ -12346,6 +12286,7 @@ var __publicField = (obj, key, value) => {
   exports2.unfavoriteForm = unfavoriteForm;
   exports2.unhideAllCategories = unhideAllCategories;
   exports2.unhideCategory = unhideCategory;
+  exports2.unlinkStageToForm = unlinkStageToForm;
   exports2.updateActiveOrganization = updateActiveOrganization;
   exports2.updateAttachment = updateAttachment;
   exports2.updateComponent = updateComponent;