@overmap-ai/core 1.0.63-selector-standardization.7 → 1.0.63-selector-standardization.9

package/dist/overmap-core.umd.cjs

@@ -938,42 +938,15 @@ var __publicField = (obj, key, value) => {
     initialState: initialState$y,
     extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$y)),
     reducers: {
-      initializeAssets: (state, action) => {
-        assetAdapter.initialize(state, action);
-        prevAssets = null;
-      },
-      addAsset: (state, action) => {
-        assetAdapter.addOne(state, action);
-        prevAssets = null;
-      },
-      addAssets: (state, action) => {
-        assetAdapter.addMany(state, action);
-        prevAssets = null;
-      },
-      setAsset: (state, action) => {
-        assetAdapter.setOne(state, action);
-        prevAssets = null;
-      },
-      setAssets: (state, action) => {
-        assetAdapter.setMany(state, action);
-        prevAssets = null;
-      },
-      updateAsset: (state, action) => {
-        assetAdapter.updateOne(state, action);
-        prevAssets = null;
-      },
-      updateAssets: (state, action) => {
-        assetAdapter.updateMany(state, action);
-        prevAssets = null;
-      },
-      deleteAsset: (state, action) => {
-        assetAdapter.deleteOne(state, action);
-        prevAssets = null;
-      },
-      deleteAssets: (state, action) => {
-        assetAdapter.deleteMany(state, action);
-        prevAssets = null;
-      }
+      initializeAssets: assetAdapter.initialize,
+      addAsset: assetAdapter.addOne,
+      addAssets: assetAdapter.addMany,
+      setAsset: assetAdapter.setOne,
+      setAssets: assetAdapter.setMany,
+      updateAsset: assetAdapter.updateOne,
+      updateAssets: assetAdapter.updateMany,
+      deleteAsset: assetAdapter.deleteOne,
+      deleteAssets: assetAdapter.deleteMany
     }
   });
   const {
@@ -987,13 +960,6 @@ var __publicField = (obj, key, value) => {
     setAsset,
     setAssets
   } = assetSlice.actions;
-  let prevAssets = null;
-  const _selectAssets = (state) => {
-    if (!prevAssets) {
-      prevAssets = Object.values(state.assetReducer.instances);
-    }
-    return prevAssets;
-  };
   const selectAssetsMapping = (state) => state.assetReducer.instances;
   const selectAssets = toolkit.createSelector([selectAssetsMapping], (assetsMapping) => {
     return Object.values(assetsMapping);
@@ -1730,11 +1696,6 @@ var __publicField = (obj, key, value) => {
   const userReducer = userSlice.reducer;
   const selectCurrentUser = (state) => state.userReducer.currentUser;
   const selectUsersMapping = (state) => state.userReducer.users;
-  const selectUser = (userId) => (state) => {
-    if (userId === null)
-      return void 0;
-    return state.userReducer.users[userId];
-  };
   const selectUserById = (id) => (state) => {
     return state.userReducer.users[id];
   };
@@ -1813,9 +1774,6 @@ var __publicField = (obj, key, value) => {
     return state.licenseReducer.instances;
   };
   const selectLicense = (id) => (state) => state.licenseReducer.instances[id];
-  const selectActiveLicense = (state) => Object.values(state.licenseReducer.instances).find(
-    (license) => license.project === state.projectReducer.activeProjectId
-  ) ?? null;
   const selectLicenseForProject = (projectId) => (state) => Object.values(state.licenseReducer.instances).find((license) => license.project === projectId);
   const selectActiveStatusLicenses = toolkit.createSelector(
     [selectLicenses],
@@ -2006,19 +1964,19 @@ var __publicField = (obj, key, value) => {
     }
   });
   const { setOrganizations } = organizationSlice.actions;
-  const selectOrganizations = (state) => {
-    return Object.values(state.organizationReducer.organizations);
-  };
   const selectOrganizationsMapping = (state) => {
     return state.organizationReducer.organizations;
   };
+  const selectOrganizations = toolkit.createSelector([selectOrganizationsMapping], (organizationsMapping) => {
+    return Object.values(organizationsMapping);
+  });
+  const selectOrganizationById = (id) => (state) => {
+    return state.organizationReducer.organizations[id];
+  };
   const selectOrganizationsWithAccess = toolkit.createSelector(
     [selectOrganizations],
     (organizations) => Object.values(organizations).filter((organization) => organization.has_access)
   );
-  const selectOrganizationById = (id) => (state) => {
-    return state.organizationReducer.organizations[id];
-  };
   const selectOrganizationUsersIds = toolkit.createSelector(
     [selectOrganizationAccesses],
     (organizationAccesses) => Object.values(organizationAccesses).map((organizationAccess) => organizationAccess.user)
@@ -2061,9 +2019,6 @@ var __publicField = (obj, key, value) => {
       });
     }
   );
-  const selectOrganization = (id) => (state) => {
-    return state.organizationReducer.organizations[id];
-  };
   const organizationReducer = organizationSlice.reducer;
   const createOfflineAction = (request2, baseUrl, serviceName) => {
     const requestWithUuid = request2.uuid ? request2 : { ...request2, uuid: uuid.v4() };
@@ -2368,32 +2323,6 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
-  const selectLatestFormRevisionsOfAssetTypes = restructureCreateSelectorWithArgs(
-    toolkit.createSelector(
-      [
-        (state) => state.formReducer.instances,
-        selectFormRevisionMapping,
-        (_state, assetTypeIds) => assetTypeIds
-      ],
-      (formsMapping, revisions, assetTypeIds) => {
-        const assetTypeIdsSet = new Set(assetTypeIds);
-        const formsOfAssetTypes = {};
-        const ret = {};
-        for (const form of Object.values(formsMapping)) {
-          if (form.asset_type && assetTypeIdsSet.has(form.asset_type)) {
-            formsOfAssetTypes[form.offline_id] = form;
-          }
-        }
-        for (const revision of Object.values(revisions)) {
-          const form = formsOfAssetTypes[revision.form];
-          if (!form || !form.asset_type || ret[form.asset_type] && formRevisionSortFn(ret[form.asset_type], revision) > 0)
-            continue;
-          ret[form.asset_type] = revision;
-        }
-        return ret;
-      }
-    )
-  );
   const selectLatestFormRevisionByForm = toolkit.createSelector([selectFormRevisionMapping], (revisions) => {
     const latestRevisions = {};
     for (const revision of Object.values(revisions)) {
@@ -2422,9 +2351,13 @@ var __publicField = (obj, key, value) => {
     }
   });
   const { initializeForms, setForm, addForm, addForms, updateForm, deleteForm } = formSlice.actions;
-  const selectFormsMapping = (state) => {
+  const formReducer = formSlice.reducer;
+  const selectFormMapping = (state) => {
     return state.formReducer.instances;
   };
+  const selectForms = toolkit.createSelector([selectFormMapping], (formsMapping) => {
+    return Object.values(formsMapping);
+  });
   const selectFilteredForms = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
       [
@@ -2461,9 +2394,6 @@ var __publicField = (obj, key, value) => {
       { memoizeOptions: { equalityCheck: shallowEqual } }
     )
   );
-  const selectFormMapping = (state) => {
-    return state.formReducer.instances;
-  };
   const selectFormById = (formId) => (state) => {
     return state.formReducer.instances[formId];
   };
@@ -2489,7 +2419,6 @@ var __publicField = (obj, key, value) => {
   const selectGeneralFormCount = toolkit.createSelector([selectFormMapping], (formsMapping) => {
     return Object.values(formsMapping).filter((form) => !form.asset_type).length;
   });
-  const formReducer = formSlice.reducer;
   const submissionAdapter = createModelAdapter((submission) => submission.offline_id);
   const initialState$d = submissionAdapter.getInitialState({});
   const formSubmissionSlice = toolkit.createSlice({
@@ -2808,7 +2737,7 @@ var __publicField = (obj, key, value) => {
   });
   const { initializeEmailDomains, addEmailDomain, deleteEmailDomain } = emailDomainsSlice.actions;
   const selectEmailDomainsAsMapping = (state) => state.emailDomainsReducer.instances;
-  const selectEmailDomains = (state) => Object.values(state.emailDomainsReducer.instances);
+  const selectEmailDomains = toolkit.createSelector([selectEmailDomainsAsMapping], (mapping) => Object.values(mapping));
   const selectEmailDomainsOfOrganization = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
       [selectEmailDomains, (_, organizationId) => organizationId],
@@ -4300,7 +4229,6 @@ var __publicField = (obj, key, value) => {
     }
     // TODO: payload does not require asset_type
     bulkAdd(assetsToCreate, workspaceId, assetTypeId, batchSize) {
-      const { store } = this.client;
       const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
       const transactionId = uuid.v4();
       const assetBatches = chunkArray(assetsToCreate, batchSize).map((assetBatch) => {
@@ -4344,7 +4272,7 @@ var __publicField = (obj, key, value) => {
       }
       void Promise.all(batchPromises).then((result) => {
         const allCreatedAssets = result.flat();
-        store.dispatch(addAssets(allCreatedAssets));
+        this.dispatch(addAssets(allCreatedAssets));
       });
       return batchPromises;
     }
@@ -4765,13 +4693,11 @@ var __publicField = (obj, key, value) => {
   class AssetTypeService extends BaseApiService {
     add(assetType) {
       const offlineAssetType = offline(assetType);
-      const { store } = this.client;
-      const activeProjectId = store.getState().projectReducer.activeProjectId;
       this.dispatch(addAssetType(offlineAssetType));
       const promise = this.enqueueRequest({
         description: "Create asset type",
         method: HttpMethod.POST,
-        url: `/projects/${activeProjectId}/asset-types/`,
+        url: `/projects/${assetType.project}/asset-types/`,
         payload: { ...offlineAssetType },
         blockers: [],
         blocks: [offlineAssetType.offline_id]
@@ -5766,10 +5692,6 @@ var __publicField = (obj, key, value) => {
       const offlineRevision = offline(revision);
       const { store } = this.client;
       const state = store.getState();
-      const activeProjectId = state.projectReducer.activeProjectId;
-      if (!activeProjectId) {
-        throw new Error("Cannot create form revision when there is no active project.");
-      }
       const currentUserId = state.userReducer.currentUser.id;
       const { fields, images } = await separateImageFromFields(offlineRevision.fields);
       const fullRevision = {
@@ -5808,10 +5730,9 @@ var __publicField = (obj, key, value) => {
       });
       return [fullRevision, offlineFormRevisionAttachments, promise, attachmentsPromise];
     }
-    async favorite(formId) {
+    async favorite(formId, projectId) {
       const { store } = this.client;
       const state = store.getState();
-      const activeProjectId = state.projectReducer.activeProjectId;
       const form = state.formReducer.instances[formId];
       if (!form) {
         throw new Error(`Expected form to exist, got ${form}`);
@@ -5821,7 +5742,7 @@ var __publicField = (obj, key, value) => {
         await this.enqueueRequest({
           description: "Favorite form",
           method: HttpMethod.POST,
-          url: `/forms/${formId}/favorite/${activeProjectId}/`,
+          url: `/forms/${formId}/favorite/${projectId}/`,
           blockers: [formId, `favorite-${formId}`],
           blocks: [`favorite-${formId}`]
         });
@@ -5830,10 +5751,9 @@ var __publicField = (obj, key, value) => {
         throw e;
       }
     }
-    async unfavorite(formId) {
+    async unfavorite(formId, projectId) {
       const { store } = this.client;
       const state = store.getState();
-      const activeProjectId = state.projectReducer.activeProjectId;
       const form = state.formReducer.instances[formId];
       if (!form) {
         throw new Error(`Expected form to exist, got ${form}`);
@@ -5843,7 +5763,7 @@ var __publicField = (obj, key, value) => {
         return await this.enqueueRequest({
           description: "Unfavorite form",
           method: HttpMethod.DELETE,
-          url: `/forms/${formId}/unfavorite/${activeProjectId}/`,
+          url: `/forms/${formId}/unfavorite/${projectId}/`,
           blockers: [formId, `favorite-${formId}`],
           blocks: [`favorite-${formId}`]
         });
@@ -6055,10 +5975,6 @@ var __publicField = (obj, key, value) => {
     async add(payload) {
       const { store } = this.client;
       const state = store.getState();
-      const activeProjectId = state.projectReducer.activeProjectId;
-      if (!activeProjectId) {
-        throw new Error("Expected an active project");
-      }
       const { values, files } = separateFilesFromValues(payload.values);
       const offlineSubmission = offline({
         ...payload,
@@ -6070,7 +5986,7 @@ var __publicField = (obj, key, value) => {
         description: "Respond to form",
         method: HttpMethod.POST,
         url: `/forms/revisions/${payload.form_revision}/respond/`,
-        payload: { ...offlineSubmission, project: activeProjectId },
+        payload: offlineSubmission,
         blockers: [payload.issue, payload.asset, payload.asset_stage, "add-form-entry"].filter(
           (x) => x !== void 0
         ),
@@ -6291,13 +6207,12 @@ var __publicField = (obj, key, value) => {
   }
   class WorkspaceService extends BaseApiService {
     add(workspace) {
-      const { store } = this.client;
       const offlineWorkspace = offline(workspace);
       this.dispatch(addWorkspace(offlineWorkspace));
       const promise = this.enqueueRequest({
         description: "Create Workspace",
         method: HttpMethod.POST,
-        url: `/projects/${store.getState().projectReducer.activeProjectId}/workspaces/`,
+        url: `/projects/${workspace.project}/workspaces/`,
         payload: offlineWorkspace,
         blockers: ["add-workspace"],
         blocks: [offlineWorkspace.offline_id]
@@ -7558,7 +7473,6 @@ var __publicField = (obj, key, value) => {
   exports2.VerificationCodeType = VerificationCodeType;
   exports2.WorkspaceService = WorkspaceService;
   exports2.YELLOW = YELLOW;
-  exports2._selectAssets = _selectAssets;
   exports2._selectLatestFormRevision = _selectLatestFormRevision;
   exports2._setLatestRetryTime = _setLatestRetryTime;
   exports2.acceptProjectInvite = acceptProjectInvite;
@@ -7821,7 +7735,6 @@ var __publicField = (obj, key, value) => {
   exports2.saveActiveProjectFileBounds = saveActiveProjectFileBounds;
   exports2.searchIssues = searchIssues;
   exports2.selectAccessToken = selectAccessToken;
-  exports2.selectActiveLicense = selectActiveLicense;
   exports2.selectActiveOrganizationAccess = selectActiveOrganizationAccess;
   exports2.selectActiveProject = selectActiveProject;
   exports2.selectActiveProjectAccess = selectActiveProjectAccess;
@@ -7909,8 +7822,8 @@ var __publicField = (obj, key, value) => {
   exports2.selectFormSubmissionsOfAsset = selectFormSubmissionsOfAsset;
   exports2.selectFormSubmissionsOfForm = selectFormSubmissionsOfForm;
   exports2.selectFormSubmissionsOfIssue = selectFormSubmissionsOfIssue;
+  exports2.selectForms = selectForms;
   exports2.selectFormsCount = selectFormsCount;
-  exports2.selectFormsMapping = selectFormsMapping;
   exports2.selectGeneralFormCount = selectGeneralFormCount;
   exports2.selectGeoImageById = selectGeoImageById;
   exports2.selectGeoImageMapping = selectGeoImageMapping;
@@ -7943,7 +7856,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectIssuesOfIssueTypeCount = selectIssuesOfIssueTypeCount;
   exports2.selectLatestFormRevisionByForm = selectLatestFormRevisionByForm;
   exports2.selectLatestFormRevisionOfForm = selectLatestFormRevisionOfForm;
-  exports2.selectLatestFormRevisionsOfAssetTypes = selectLatestFormRevisionsOfAssetTypes;
   exports2.selectLatestRetryTime = selectLatestRetryTime;
   exports2.selectLicense = selectLicense;
   exports2.selectLicenseForProject = selectLicenseForProject;
@@ -7952,7 +7864,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectLicensesOfOrganization = selectLicensesOfOrganization;
   exports2.selectMainWorkspace = selectMainWorkspace;
   exports2.selectNumberOfAssetsOfAssetType = selectNumberOfAssetsOfAssetType;
-  exports2.selectOrganization = selectOrganization;
   exports2.selectOrganizationAccessById = selectOrganizationAccessById;
   exports2.selectOrganizationAccessForUser = selectOrganizationAccessForUser;
   exports2.selectOrganizationAccessUserMapping = selectOrganizationAccessUserMapping;
@@ -7997,7 +7908,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectTeamsOfOrganization = selectTeamsOfOrganization;
   exports2.selectTeamsOfUser = selectTeamsOfUser;
   exports2.selectUploadUrl = selectUploadUrl;
-  exports2.selectUser = selectUser;
   exports2.selectUserById = selectUserById;
   exports2.selectUsersByIds = selectUsersByIds;
   exports2.selectUsersMapping = selectUsersMapping;