@overmap-ai/core 1.0.58-export-overmap-reducer.8 → 1.0.58-export-overmap-reducer.15

package/dist/overmap-core.umd.cjs

@@ -3567,17 +3567,15 @@ var __publicField = (obj, key, value) => {
         (_state, search) => search
       ],
       (userForms, revisions, search) => {
-        const { searchTerm, maxResults, favorites, owner_organization, owner_user } = search;
+        const { searchTerm, maxResults, favorites, organization } = search;
         const favoriteMatches = [];
         const regularMatches = [];
         for (const [userFormId, userForm] of Object.entries(userForms)) {
           if (favorites !== void 0 && userForm.favorite != favorites)
             continue;
-          if (Number.isInteger(owner_organization) && owner_organization !== userForm.owner_organization) {
+          if (Number.isInteger(organization) && organization !== userForm.organization) {
             continue;
           }
-          if (Number.isInteger(owner_user) && owner_user !== userForm.owner_user)
-            continue;
           const latestRevision = _selectLatestFormRevision(revisions, userFormId);
           if (latestRevision.title.toLowerCase().includes(searchTerm.toLowerCase())) {
             if (userForm.favorite) {
@@ -4362,10 +4360,6 @@ var __publicField = (obj, key, value) => {
         throw new Error(`Failed to update index_workspace of issue ${issue.offline_id} to main workspace`);
       }
     }
-    const indexedForms = Object.values(draft.formReducer.forms).filter((form) => form.index_workspace === workspaceId);
-    for (const form of indexedForms) {
-      form.index_workspace = mainWorkspace.offline_id;
-    }
   }
   const overmapRootReducer = (state, action) => {
     if (action.type === "auth/setLoggedIn" && !action.payload) {
@@ -6747,8 +6741,7 @@ var __publicField = (obj, key, value) => {
       });
     }
   }
-  const separateImageFromFields = async (payload) => {
-    const { fields } = payload;
+  const separateImageFromFields = async (fields) => {
     const images = {};
     const newFields = [];
     for (const section of fields) {
@@ -6774,11 +6767,7 @@ var __publicField = (obj, key, value) => {
       }
       newFields.push({ ...section, fields: newSectionFields });
     }
-    const payloadWithoutImage = {
-      ...payload,
-      fields: newFields
-    };
-    return { payloadWithoutImage, images };
+    return { fields: newFields, images };
   };
   class UserFormService extends BaseApiService {
     constructor() {
@@ -6812,93 +6801,90 @@ var __publicField = (obj, key, value) => {
         });
       });
     }
-    async add(state, initialRevision, url, ownerUser, ownerOrganization, assetTypeId, issueTypeId) {
-      if (!!ownerUser === !!ownerOrganization) {
-        throw new Error("Exactly one of ownerUser and ownerOrganization must be defined.");
-      }
-      const ownerAttrs = {
-        owner_user: ownerUser,
-        owner_organization: ownerOrganization
-      };
-      const currentUser = state.userReducer.currentUser;
-      const activeWorkspaceId = state.workspaceReducer.activeWorkspaceId;
-      const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
-      const offlineFormPayload = offline({ ...ownerAttrs });
-      const offlineRevisionPayload = offline({ ...initialRevision, submitted_at: submittedAt });
-      const retForm = {
-        ...offlineFormPayload,
-        index_workspace: activeWorkspaceId,
-        favorite: true,
-        submitted_at: submittedAt,
-        created_by: currentUser.id,
-        ...assetTypeId && { asset_type: assetTypeId },
-        ...issueTypeId && { issue_type: issueTypeId },
-        ...ownerAttrs
-      };
-      const { payloadWithoutImage, images } = await separateImageFromFields(offlineRevisionPayload);
-      const retRevision = {
-        ...payloadWithoutImage,
-        created_by: currentUser.id,
-        form: retForm.offline_id,
-        revision: 0,
-        submitted_at: submittedAt
-      };
+    async add(ownerId, form, initialRevision, urlPrefix) {
       const { store } = this.client;
-      store.dispatch(addForm(retForm));
-      store.dispatch(addFormRevision(retRevision));
+      const { fields, images } = await separateImageFromFields(initialRevision.fields);
+      const offlineFormRevision = offline({
+        ...initialRevision,
+        fields,
+        created_by: form.created_by,
+        form: form.offline_id,
+        submitted_at: form.submitted_at,
+        revision: "Pending"
+      });
+      store.dispatch(addForm(form));
+      store.dispatch(addFormRevision(offlineFormRevision));
       const formPromise = this.client.enqueueRequest({
         description: "Create form",
         method: HttpMethod.POST,
-        url,
-        queryParams: activeWorkspaceId ? {
-          workspace_id: activeWorkspaceId
-        } : void 0,
+        url: urlPrefix,
         payload: {
-          ...offlineFormPayload,
-          ...assetTypeId && { asset_type: assetTypeId },
-          ...issueTypeId && { issue_type: issueTypeId },
-          initial_revision: payloadWithoutImage
+          // Sending exactly what is currently needed for the endpoint
+          offline_id: form.offline_id,
+          initial_revision: {
+            offline_id: offlineFormRevision.offline_id,
+            submitted_at: offlineFormRevision.submitted_at,
+            title: offlineFormRevision.title,
+            description: offlineFormRevision.description,
+            fields: offlineFormRevision.fields
+          }
         },
-        blockers: assetTypeId ? [assetTypeId] : issueTypeId ? [issueTypeId] : [],
-        blocks: [offlineFormPayload.offline_id, payloadWithoutImage.offline_id]
+        blockers: [ownerId],
+        blocks: [form.offline_id, offlineFormRevision.offline_id]
       });
-      const attachImagesPromises = this.getAttachImagePromises(images, offlineRevisionPayload.offline_id);
+      const attachImagesPromises = this.getAttachImagePromises(images, offlineFormRevision.offline_id);
       void formPromise.catch((e) => {
-        store.dispatch(deleteForm(retForm.offline_id));
-        store.dispatch(deleteFormRevision(retRevision.offline_id));
+        store.dispatch(deleteForm(form.offline_id));
+        store.dispatch(deleteFormRevision(offlineFormRevision.offline_id));
         throw e;
       });
       const settledPromise = Promise.all([formPromise, ...attachImagesPromises]).then(() => formPromise);
-      return [retForm, retRevision, formPromise, settledPromise];
+      return [form, offlineFormRevision, formPromise, settledPromise];
     }
-    async addForOrganization(initialRevision, attachedTo) {
+    addForOrganization(organizationId, initialRevision) {
       const state = this.client.store.getState();
-      const activeOrganizationId = state.organizationReducer.activeOrganizationId;
-      if (!activeOrganizationId) {
-        throw new Error("Cannot add forms for organization when there is no active organization.");
-      }
-      return await this.add(
-        state,
+      const offlineForm = offline({
+        favorite: false,
+        created_by: state.userReducer.currentUser.id,
+        submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+        organization: organizationId
+      });
+      return this.add(
+        organizationId.toString(),
+        offlineForm,
         initialRevision,
-        `/forms/in-organization/${activeOrganizationId}/`,
-        void 0,
-        activeOrganizationId,
-        attachedTo && "assetTypeId" in attachedTo ? attachedTo.assetTypeId : void 0,
-        attachedTo && "issueTypeId" in attachedTo ? attachedTo.issueTypeId : void 0
+        `/organizations/${organizationId}/create-form/`
       );
     }
-    async addForCurrentUser(initialRevision, attachedTo) {
+    addForProject(projectId, initialRevision) {
       const state = this.client.store.getState();
-      const currentUser = state.userReducer.currentUser;
-      return await this.add(
-        state,
-        initialRevision,
-        "/forms/my-forms/",
-        currentUser.id,
-        void 0,
-        attachedTo && "assetTypeId" in attachedTo ? attachedTo.assetTypeId : void 0,
-        attachedTo && "issueTypeId" in attachedTo ? attachedTo.issueTypeId : void 0
-      );
+      const offlineForm = offline({
+        favorite: false,
+        created_by: state.userReducer.currentUser.id,
+        submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+        project: projectId
+      });
+      return this.add(projectId.toString(), offlineForm, initialRevision, `/projects/${projectId}/create-form/`);
+    }
+    addForIssueType(issueTypeId, initialRevision) {
+      const state = this.client.store.getState();
+      const offlineForm = offline({
+        favorite: false,
+        created_by: state.userReducer.currentUser.id,
+        submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+        issue_type: issueTypeId
+      });
+      return this.add(issueTypeId, offlineForm, initialRevision, `/issues/types/${issueTypeId}/create-form/`);
+    }
+    addForAssetType(assetTypeId, initialRevision) {
+      const state = this.client.store.getState();
+      const offlineForm = offline({
+        favorite: false,
+        created_by: state.userReducer.currentUser.id,
+        submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+        asset_type: assetTypeId
+      });
+      return this.add(assetTypeId, offlineForm, initialRevision, `/assets/types/${assetTypeId}/create-form/`);
     }
     async createRevision(formId2, revision) {
       const offlineRevision = offline(revision);
@@ -6909,9 +6895,10 @@ var __publicField = (obj, key, value) => {
         throw new Error("Cannot create form revision when there is no active project.");
       }
       const currentUserId = state.userReducer.currentUser.id;
-      const { payloadWithoutImage, images } = await separateImageFromFields(offlineRevision);
+      const { fields, images } = await separateImageFromFields(offlineRevision.fields);
       const fullRevision = {
-        ...payloadWithoutImage,
+        ...offlineRevision,
+        fields,
         created_by: currentUserId,
         revision: "Pending",
         form: formId2,
@@ -6922,9 +6909,14 @@ var __publicField = (obj, key, value) => {
         description: "Create form revision",
         method: HttpMethod.PATCH,
         url: `/forms/${formId2}/`,
-        payload: { initial_revision: payloadWithoutImage },
-        queryParams: {
-          project_id: activeProjectId.toString()
+        payload: {
+          initial_revision: {
+            offline_id: fullRevision.offline_id,
+            submitted_at: fullRevision.submitted_at,
+            title: fullRevision.title,
+            description: fullRevision.description,
+            fields: fullRevision.fields
+          }
         },
         blockers: [formId2],
         blocks: [offlineRevision.offline_id]
@@ -7009,16 +7001,68 @@ var __publicField = (obj, key, value) => {
     }
     async refreshStore() {
       const { store } = this.client;
-      const result = await this.client.enqueueRequest({
-        description: "Fetch user forms",
+      const activeProjectId = store.getState().projectReducer.activeProjectId;
+      if (!activeProjectId) {
+        throw new Error("No active project");
+      }
+      const forms = [];
+      const revisions = [];
+      const attachments = [];
+      const projectFormsResult = await this.client.enqueueRequest({
+        description: "Fetch project forms",
         method: HttpMethod.GET,
-        url: `/forms/in-project/${store.getState().projectReducer.activeProjectId}/forms/`,
-        blockers: [],
+        url: `/projects/${activeProjectId}/forms/`,
+        blockers: [activeProjectId.toString()],
         blocks: []
       });
-      store.dispatch(setForms(Object.values(result.forms)));
-      store.dispatch(setFormRevisions(Object.values(result.revisions)));
-      store.dispatch(setFormRevisionAttachments(Object.values(result.attachments)));
+      for (const form of projectFormsResult.forms)
+        forms.push(form);
+      for (const revision of projectFormsResult.revisions)
+        revisions.push(revision);
+      for (const attachment of projectFormsResult.attachments)
+        attachments.push(attachment);
+      const organizationFormsResult = await this.client.enqueueRequest({
+        description: "Fetch organization forms",
+        method: HttpMethod.GET,
+        url: `/projects/${activeProjectId}/organizations/forms/`,
+        blockers: [activeProjectId.toString()],
+        blocks: []
+      });
+      for (const form of organizationFormsResult.forms)
+        forms.push(form);
+      for (const revision of organizationFormsResult.revisions)
+        revisions.push(revision);
+      for (const attachment of organizationFormsResult.attachments)
+        attachments.push(attachment);
+      const assetTypeFormsResult = await this.client.enqueueRequest({
+        description: "Fetch asset type forms",
+        method: HttpMethod.GET,
+        url: `/projects/${activeProjectId}/asset-types/forms/`,
+        blockers: [activeProjectId.toString()],
+        blocks: []
+      });
+      for (const form of assetTypeFormsResult.forms)
+        forms.push(form);
+      for (const revision of assetTypeFormsResult.latest_revisions)
+        revisions.push(revision);
+      for (const attachment of assetTypeFormsResult.attachments)
+        attachments.push(attachment);
+      const issueTypeFormsResult = await this.client.enqueueRequest({
+        description: "Fetch issue type forms",
+        method: HttpMethod.GET,
+        url: `/projects/${activeProjectId}/issue-types/forms/`,
+        blockers: [activeProjectId.toString()],
+        blocks: []
+      });
+      for (const form of issueTypeFormsResult.forms)
+        forms.push(form);
+      for (const revision of issueTypeFormsResult.latest_revisions)
+        revisions.push(revision);
+      for (const attachment of issueTypeFormsResult.attachments)
+        attachments.push(attachment);
+      store.dispatch(setForms(forms));
+      store.dispatch(setFormRevisions(revisions));
+      store.dispatch(setFormRevisionAttachments(attachments));
     }
   }
   const isArrayOfFiles = (value) => {
@@ -18474,7 +18518,6 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
     regularIcon
   };
   const orgOptionPrefix = "organization:";
-  const userOptionPrefix = "user:";
   const FormBrowser = React.memo(
     React.forwardRef((props, ref) => {
       const { maxResults = 20, ...entryProps } = props;
@@ -18485,9 +18528,7 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
         const ret = { maxResults, searchTerm: filter };
         if (ownerFilter) {
           if (ownerFilter.startsWith(orgOptionPrefix)) {
-            ret.owner_organization = parseInt(ownerFilter.slice(orgOptionPrefix.length));
-          } else if (ownerFilter.startsWith(userOptionPrefix)) {
-            ret.owner_user = parseInt(ownerFilter.slice(userOptionPrefix.length));
+            ret.organization = parseInt(ownerFilter.slice(orgOptionPrefix.length));
           }
         }
         return ret;
@@ -18512,14 +18553,10 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
         const state = sdk.store.getState();
         const accumulator = {};
         for (const form of attachableUserFormMapping) {
-          const organization = selectOrganization(form.owner_organization || -1)(state);
+          const organization = selectOrganization(form.organization || -1)(state);
           if (organization) {
             accumulator[`${orgOptionPrefix}${organization.id}`] = organization.name;
           }
-          const user = selectUser(form.owner_user || -1)(state);
-          if (user) {
-            accumulator[`${userOptionPrefix}${user.id}`] = user.username;
-          }
         }
         return Object.entries(accumulator).map(([value, label]) => ({ itemContent: label, value }));
       }, [sdk.store, attachableUserFormMapping]);
@@ -18561,11 +18598,7 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
   const FormBrowserEntry = (props) => {
     var _a2;
     const { form, onSelectForm, isFavoriteEditable, handleToggleFavorite } = props;
-    const ownerOrganization = (_a2 = reactRedux.useSelector(selectOrganization(form.owner_organization || -1))) == null ? void 0 : _a2.name;
-    const ownerUser = reactRedux.useSelector(selectUser(form.owner_user || -1));
-    const currentUserId = reactRedux.useSelector(selectCurrentUser).id;
-    const ownedByCurrentUser = !!ownerUser && ownerUser.id === currentUserId;
-    const owner = ownerOrganization ?? (ownedByCurrentUser ? "You" : ownerUser == null ? void 0 : ownerUser.username) ?? "Unknown";
+    const ownerOrganization = (_a2 = reactRedux.useSelector(selectOrganization(form.organization || -1))) == null ? void 0 : _a2.name;
     const handleFavoriteClick = React.useCallback(
       (e) => {
         e.stopPropagation();
@@ -18596,10 +18629,10 @@ Defaulting to \`${$89eedd556c436f6a$var$DEFAULT_ORIENTATION}\`.`;
             /* @__PURE__ */ jsxRuntime.jsx(Text, { children: form.latestRevision.title }),
             form.latestRevision.description && /* @__PURE__ */ jsxRuntime.jsx(blocks.RiIcon, { icon: "RiQuestionLine" })
           ] }),
-          owner && /* @__PURE__ */ jsxRuntime.jsxs(Flex, { align: "center", gap: "2", children: [
+          ownerOrganization && /* @__PURE__ */ jsxRuntime.jsxs(Flex, { align: "center", gap: "2", children: [
             /* @__PURE__ */ jsxRuntime.jsx(blocks.RiIcon, { icon: "RiUserLine" }),
             " ",
-            owner
+            ownerOrganization
           ] })
         ] })
       }