@overmap-ai/core 1.0.60-forms-refactor-1.0 → 1.0.60-forms-refactor-1.1

package/dist/overmap-core.js

@@ -2357,11 +2357,11 @@ const selectLatestFormRevisionsOfAssetTypes = restructureCreateSelectorWithArgs(
       selectFormRevisionMapping,
       (_state, assetTypeIds) => assetTypeIds
     ],
-    (userForms, revisions, assetTypeIds) => {
+    (formsMapping, revisions, assetTypeIds) => {
       const assetTypeIdsSet = new Set(assetTypeIds);
       const formsOfAssetTypes = {};
       const ret = {};
-      for (const form of Object.values(userForms)) {
+      for (const form of Object.values(formsMapping)) {
         if (form.asset_type && assetTypeIdsSet.has(form.asset_type)) {
           formsOfAssetTypes[form.offline_id] = form;
         }
@@ -2414,22 +2414,22 @@ const selectFilteredForms = restructureCreateSelectorWithArgs(
       (state) => state.formRevisionReducer.instances,
       (_state, search) => search
     ],
-    (userForms, revisions, search) => {
+    (formsMapping, revisions, 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)
+      for (const [formId, form] of Object.entries(formsMapping)) {
+        if (favorites !== void 0 && form.favorite != favorites)
           continue;
-        if (Number.isInteger(organization) && organization !== userForm.organization) {
+        if (Number.isInteger(organization) && organization !== form.organization) {
           continue;
         }
-        const latestRevision = _selectLatestFormRevision(revisions, userFormId);
+        const latestRevision = _selectLatestFormRevision(revisions, formId);
         if (latestRevision.title.toLowerCase().includes(searchTerm.toLowerCase())) {
-          if (userForm.favorite) {
-            favoriteMatches.push({ ...userForm, latestRevision });
+          if (form.favorite) {
+            favoriteMatches.push({ ...form, latestRevision });
           } else {
-            regularMatches.push({ ...userForm, latestRevision });
+            regularMatches.push({ ...form, latestRevision });
           }
         }
         if (favoriteMatches.length >= maxResults) {
@@ -2443,35 +2443,33 @@ const selectFilteredForms = restructureCreateSelectorWithArgs(
     { memoizeOptions: { equalityCheck: shallowEqual } }
   )
 );
-const selectForm = restructureCreateSelectorWithArgs(
-  createSelector([selectFormsMapping, (_, formId) => formId], (userForms, formId) => {
-    return userForms[formId];
-  })
-);
+const selectForm = (formId) => (state) => {
+  return state.formReducer.instances[formId];
+};
 const selectFormMapping = (state) => {
   return state.formReducer.instances;
 };
 const selectFormOfAssetType = restructureCreateSelectorWithArgs(
   createSelector(
     [selectFormMapping, (_state, assetTypeId) => assetTypeId],
-    (userForms, assetTypeId) => {
-      return Object.values(userForms).find((userForm) => userForm.asset_type === assetTypeId);
+    (formsMapping, assetTypeId) => {
+      return Object.values(formsMapping).find((form) => form.asset_type === assetTypeId);
     }
   )
 );
 const selectFormOfIssueType = restructureCreateSelectorWithArgs(
   createSelector(
     [selectFormMapping, (_state, issueTypeId) => issueTypeId],
-    (userForms, issueTypeId) => {
-      return Object.values(userForms).find((userForm) => userForm.issue_type === issueTypeId);
+    (formsMapping, issueTypeId) => {
+      return Object.values(formsMapping).find((form) => form.issue_type === issueTypeId);
     }
   )
 );
-const selectFormsCount = createSelector([selectFormMapping], (userForms) => {
-  return Object.keys(userForms).length;
+const selectFormsCount = createSelector([selectFormMapping], (formsMapping) => {
+  return Object.keys(formsMapping).length;
 });
-const selectGeneralFormCount = createSelector([selectFormMapping], (userForms) => {
-  return Object.values(userForms).filter((form) => !form.asset_type).length;
+const selectGeneralFormCount = createSelector([selectFormMapping], (formsMapping) => {
+  return Object.values(formsMapping).filter((form) => !form.asset_type).length;
 });
 const formReducer = formSlice.reducer;
 const submissionAdapter = createModelAdapter((submission) => submission.offline_id);
@@ -2691,12 +2689,12 @@ const {
   deleteFormRevisionAttachment,
   deleteFormRevisionAttachments
 } = formRevisionAttachmentSlice.actions;
-const selectUserFormRevisionAttachmentsMapping = (state) => {
+const selectFormRevisionAttachmentsMapping = (state) => {
   return state.formRevisionAttachmentReducer.instances;
 };
 const selectAttachmentsOfFormRevision = restructureCreateSelectorWithArgs(
   createSelector(
-    [selectUserFormRevisionAttachmentsMapping, (_state, revisionId) => revisionId],
+    [selectFormRevisionAttachmentsMapping, (_state, revisionId) => revisionId],
     (attachments, revisionId) => {
       return Object.values(attachments).filter((attachment) => attachment.revision === revisionId);
     }
@@ -5631,17 +5629,17 @@ class FormService extends BaseApiService {
   async delete(formId) {
     const { store } = this.client;
     const state = store.getState();
-    const userForm = selectForm(formId)(state);
-    if (!userForm) {
-      throw new Error("Expected userForm to exist");
+    const form = selectForm(formId)(state);
+    if (!form) {
+      throw new Error("Expected form to exist");
     }
-    const userFormSubmissions = selectFormSubmissionsOfForm(formId)(state);
-    if (userFormSubmissions && userFormSubmissions.length > 0) {
-      this.dispatch(deleteFormSubmissions(userFormSubmissions.map(({ offline_id }) => offline_id)));
+    const formSubmissions = selectFormSubmissionsOfForm(formId)(state);
+    if (formSubmissions && formSubmissions.length > 0) {
+      this.dispatch(deleteFormSubmissions(formSubmissions.map(({ offline_id }) => offline_id)));
     }
-    const userFormRevisions = selectFormRevisionsOfForm(formId)(state);
-    if (userFormRevisions && userFormRevisions.length > 0) {
-      this.dispatch(deleteFormRevisions(userFormRevisions.map(({ offline_id }) => offline_id)));
+    const formRevisions = selectFormRevisionsOfForm(formId)(state);
+    if (formRevisions && formRevisions.length > 0) {
+      this.dispatch(deleteFormRevisions(formRevisions.map(({ offline_id }) => offline_id)));
     }
     this.dispatch(deleteForm(formId));
     try {
@@ -5653,12 +5651,12 @@ class FormService extends BaseApiService {
         blocks: []
       });
     } catch (e) {
-      this.dispatch(addForm(userForm));
-      if (userFormRevisions && userFormRevisions.length > 0) {
-        this.dispatch(addFormRevisions(userFormRevisions));
+      this.dispatch(addForm(form));
+      if (formRevisions && formRevisions.length > 0) {
+        this.dispatch(addFormRevisions(formRevisions));
       }
-      if (userFormSubmissions && userFormSubmissions.length > 0) {
-        this.dispatch(addFormSubmissions(userFormSubmissions));
+      if (formSubmissions && formSubmissions.length > 0) {
+        this.dispatch(addFormSubmissions(formSubmissions));
       }
       throw e;
     }
@@ -7503,6 +7501,7 @@ export {
   selectFormOfAssetType,
   selectFormOfIssueType,
   selectFormRevision,
+  selectFormRevisionAttachmentsMapping,
   selectFormRevisionMapping,
   selectFormRevisions,
   selectFormRevisionsOfForm,
@@ -7602,7 +7601,6 @@ export {
   selectTeamsOfUser,
   selectUploadUrl,
   selectUser,
-  selectUserFormRevisionAttachmentsMapping,
   selectUsersAsMapping,
   selectWorkspaceById,
   selectWorkspaceMapping,