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

package/dist/forms/utils.d.ts

@@ -6,4 +6,4 @@ import { UserFormRevision } from "../typings";
 export declare const hasKeys: (errors: object) => boolean;
 export declare const validateForm: (schema: ISchema, form: Form | FormikUserFormRevision) => FormikErrors<Form> | FormikErrors<import('./builder/typings').NewForm> | undefined;
 export declare const initialFormValues: (fields: BaseFormElement[], values: Form) => Form;
-export declare const useAttachImagesToFormRevisionFields: (revision: UserFormRevision) => UserFormRevision;
+export declare const useAttachImagesToFormRevisionFields: (revision: UserFormRevision | undefined) => UserFormRevision | undefined;

package/dist/overmap-core.js

@@ -1677,6 +1677,22 @@ const componentStageSlice = createSlice({
       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;
     }
   }
 });
@@ -1721,7 +1737,7 @@ const selectStagesFromStageIds = restructureCreateSelectorWithArgs(
     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: {},
@@ -3097,22 +3113,6 @@ const userFormSlice = createSlice({
       }
       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];
     }
@@ -3128,8 +3128,6 @@ const {
   deleteUserFormSubmissions,
   favoriteForm,
   unfavoriteForm,
-  attachFormToComponentStage,
-  removeFormFromComponentStage,
   deleteUserForm,
   deleteUserFormRevision,
   deleteUserFormRevisions,
@@ -3216,7 +3214,6 @@ const selectUserForm = (formId2) => (state) => {
 const selectSubmissionMapping = (state) => state.userFormReducer.submissions;
 const selectSubmissions = createSelector([selectSubmissionMapping], (submissions) => Object.values(submissions));
 const selectRevisionMapping = (state) => state.userFormReducer.revisions;
-const selectRevisionAttachmentsMapping = (state) => state.userFormReducer.revisionAttachments;
 const selectRevisions = createSelector([selectRevisionMapping], (revisions) => Object.values(revisions));
 const selectRevisionsForForm = restructureCreateSelectorWithArgs(
   createSelector([selectRevisions, (_state, formId2) => formId2], (revisions, formId2) => {
@@ -3286,38 +3283,6 @@ const selectLatestRevisionsFromComponentTypeIds = restructureCreateSelectorWithA
     }
   )
 );
-const selectComponentStageFormLatestRevision = restructureCreateSelectorWithArgs(
-  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(
-  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 = createSelector([selectRevisionMapping], (revisions) => {
   const latestRevisions = {};
   for (const revision of Object.values(revisions)) {
@@ -3329,19 +3294,6 @@ const selectLatestRevisionByFormId = createSelector([selectRevisionMapping], (re
   }
   return latestRevisions;
 });
-const selectAllRevisionAttachmentsByLatestRevisionId = 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 = createSelector([selectUserFormMapping], (userForms) => {
   return Object.keys(userForms).length;
 });
@@ -4713,6 +4665,39 @@ class ComponentStageService extends BaseApiService {
       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({
@@ -5498,13 +5483,10 @@ class UserFormService extends BaseApiService {
       });
     });
   }
-  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
@@ -5520,7 +5502,6 @@ class UserFormService extends BaseApiService {
       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);
@@ -5543,10 +5524,9 @@ class UserFormService extends BaseApiService {
       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);
@@ -5558,7 +5538,7 @@ class UserFormService extends BaseApiService {
     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) {
@@ -5570,22 +5550,13 @@ class UserFormService extends BaseApiService {
       `/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);
@@ -5658,39 +5629,6 @@ class UserFormService extends BaseApiService {
       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();
@@ -10371,10 +10309,12 @@ const initialFormValues = (fields, values) => {
 };
 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 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;
@@ -10459,6 +10399,9 @@ const FormSubmissionViewer = memo(
       );
     }
     const revisionWithImages = useAttachImagesToFormRevisionFields(revision);
+    if (!revisionWithImages) {
+      throw new Error("Expected revisionWithImages to be defined");
+    }
     const schema = useMemo(() => {
       return formRevisionToSchema(revisionWithImages, { readonly: true });
     }, [revisionWithImages]);
@@ -11784,8 +11727,9 @@ const FormBuilder = memo(
       }),
       [initialTitle]
     );
+    const revisionWithImages = useAttachImagesToFormRevisionFields(revision);
     const formik = useFormik({
-      initialValues: wrapRootFieldsWithFieldSection(revision) ?? initialValues,
+      initialValues: wrapRootFieldsWithFieldSection(revisionWithImages) ?? initialValues,
       validate,
       onSubmit: onSave,
       validateOnChange: false,
@@ -12027,7 +11971,6 @@ export {
   addUsers,
   addWorkspace,
   areArraysEqual,
-  attachFormToComponentStage,
   authReducer,
   authSlice,
   blobToBase64,
@@ -12106,6 +12049,7 @@ export {
   issueReducer,
   issueSlice,
   issueToSearchResult,
+  linkStageToForm,
   literalToCoordinates,
   logOnlyOnce,
   makeClient,
@@ -12150,7 +12094,6 @@ export {
   removeComponent,
   removeEmailDomain,
   removeFavouriteProjectId,
-  removeFormFromComponentStage,
   removeIssue,
   removeIssueComment,
   removeOrganizationAccess,
@@ -12183,7 +12126,6 @@ export {
   selectActiveWorkspace,
   selectActiveWorkspaceId,
   selectAllAttachments,
-  selectAllRevisionAttachmentsByLatestRevisionId,
   selectAppearance,
   selectCategories,
   selectCategoriesOfWorkspace,
@@ -12196,7 +12138,6 @@ export {
   selectCompletedStageIdsForComponent,
   selectCompletedStages,
   selectComponent,
-  selectComponentStageFormLatestRevision,
   selectComponentType,
   selectComponentTypeForm,
   selectComponentTypeFromComponent,
@@ -12236,7 +12177,6 @@ export {
   selectLatestFormRevision,
   selectLatestRetryTime,
   selectLatestRevisionByFormId,
-  selectLatestRevisionsFromComponentStageIds,
   selectLatestRevisionsFromComponentTypeIds,
   selectMainWorkspace,
   selectMapStyle,
@@ -12351,6 +12291,7 @@ export {
   unfavoriteForm,
   unhideAllCategories,
   unhideCategory,
+  unlinkStageToForm,
   updateActiveOrganization,
   updateAttachment,
   updateComponent,