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

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

@@ -3216,7 +3216,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) => {
@@ -3329,19 +3328,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;
 });
@@ -5660,21 +5646,13 @@ class UserFormService extends BaseApiService {
   }
   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]
       });
@@ -5685,21 +5663,12 @@ class UserFormService extends BaseApiService {
   }
   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]
       });
@@ -10388,10 +10357,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;
@@ -10476,6 +10447,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]);
@@ -11801,8 +11775,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,
@@ -12200,7 +12175,6 @@ export {
   selectActiveWorkspace,
   selectActiveWorkspaceId,
   selectAllAttachments,
-  selectAllRevisionAttachmentsByLatestRevisionId,
   selectAppearance,
   selectCategories,
   selectCategoriesOfWorkspace,