@overmap-ai/core 1.0.38-component-fields.31 → 1.0.38-component-fields.33

package/dist/overmap-core.umd.cjs

@@ -3212,7 +3212,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) => {
@@ -3325,19 +3324,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;
   });
@@ -5656,21 +5642,13 @@ var __publicField = (obj, key, value) => {
     }
     async attachToComponentStage(formId2, componentStageId) {
       const { store } = this.client;
-      const activeProjectId = store.getState().projectReducer.activeProjectId;
-      if (!activeProjectId) {
-        throw new Error("Expected an active project.");
-      }
       store.dispatch(attachFormToComponentStage({ formId: formId2, componentStageId }));
       try {
         await this.enqueueRequest({
           description: "Attach form to component stage",
-          method: HttpMethod.PATCH,
-          url: `/forms/${formId2}/`,
+          method: HttpMethod.POST,
+          url: `/forms/${formId2}/associate-with-stage/`,
           payload: { component_stage: componentStageId },
-          queryParams: {
-            project_id: activeProjectId.toString(),
-            component_stage: componentStageId
-          },
           blockers: [formId2, componentStageId],
           blocks: [formId2]
         });
@@ -5681,21 +5659,12 @@ var __publicField = (obj, key, value) => {
     }
     async removeFromComponentStage(formId2, componentStageId) {
       const { store } = this.client;
-      const activeProjectId = store.getState().projectReducer.activeProjectId;
-      if (!activeProjectId) {
-        throw new Error("Expected an active project.");
-      }
       store.dispatch(removeFormFromComponentStage({ formId: formId2 }));
       try {
         await this.enqueueRequest({
           description: "Remove form from component stage",
-          method: HttpMethod.PATCH,
-          url: `/forms/${formId2}/`,
-          payload: { component_stage: void 0 },
-          queryParams: {
-            project_id: activeProjectId.toString(),
-            component_stage: componentStageId
-          },
+          method: HttpMethod.DELETE,
+          url: `/forms/${formId2}/associate-with-stage/`,
           blockers: [formId2, componentStageId],
           blocks: [formId2]
         });
@@ -10384,10 +10353,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;
@@ -10472,6 +10443,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]);
@@ -11797,8 +11771,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,
@@ -12195,7 +12170,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;