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

package/dist/overmap-core.js

@@ -950,42 +950,15 @@ const assetSlice = createSlice({
   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 {
@@ -999,13 +972,6 @@ const {
   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 = createSelector([selectAssetsMapping], (assetsMapping) => {
   return Object.values(assetsMapping);
@@ -1742,11 +1708,6 @@ const {
 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];
 };
@@ -1825,9 +1786,6 @@ const selectLicenses = (state) => {
   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 = createSelector(
   [selectLicenses],
@@ -2018,19 +1976,19 @@ const organizationSlice = createSlice({
   }
 });
 const { setOrganizations } = organizationSlice.actions;
-const selectOrganizations = (state) => {
-  return Object.values(state.organizationReducer.organizations);
-};
 const selectOrganizationsMapping = (state) => {
   return state.organizationReducer.organizations;
 };
+const selectOrganizations = createSelector([selectOrganizationsMapping], (organizationsMapping) => {
+  return Object.values(organizationsMapping);
+});
+const selectOrganizationById = (id) => (state) => {
+  return state.organizationReducer.organizations[id];
+};
 const selectOrganizationsWithAccess = createSelector(
   [selectOrganizations],
   (organizations) => Object.values(organizations).filter((organization) => organization.has_access)
 );
-const selectOrganizationById = (id) => (state) => {
-  return state.organizationReducer.organizations[id];
-};
 const selectOrganizationUsersIds = createSelector(
   [selectOrganizationAccesses],
   (organizationAccesses) => Object.values(organizationAccesses).map((organizationAccess) => organizationAccess.user)
@@ -2073,9 +2031,6 @@ const selectSortedOrganizationUsers = createSelector(
     });
   }
 );
-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: v4() };
@@ -2380,32 +2335,6 @@ const selectFormRevisionsOfForm = restructureCreateSelectorWithArgs(
     }
   )
 );
-const selectLatestFormRevisionsOfAssetTypes = restructureCreateSelectorWithArgs(
-  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 = createSelector([selectFormRevisionMapping], (revisions) => {
   const latestRevisions = {};
   for (const revision of Object.values(revisions)) {
@@ -2434,9 +2363,13 @@ const formSlice = createSlice({
   }
 });
 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 = createSelector([selectFormMapping], (formsMapping) => {
+  return Object.values(formsMapping);
+});
 const selectFilteredForms = restructureCreateSelectorWithArgs(
   createSelector(
     [
@@ -2473,9 +2406,6 @@ const selectFilteredForms = restructureCreateSelectorWithArgs(
     { memoizeOptions: { equalityCheck: shallowEqual } }
   )
 );
-const selectFormMapping = (state) => {
-  return state.formReducer.instances;
-};
 const selectFormById = (formId) => (state) => {
   return state.formReducer.instances[formId];
 };
@@ -2501,7 +2431,6 @@ const selectFormsCount = createSelector([selectFormMapping], (formsMapping) => {
 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);
 const initialState$d = submissionAdapter.getInitialState({});
 const formSubmissionSlice = createSlice({
@@ -2820,7 +2749,7 @@ const emailDomainsSlice = createSlice({
 });
 const { initializeEmailDomains, addEmailDomain, deleteEmailDomain } = emailDomainsSlice.actions;
 const selectEmailDomainsAsMapping = (state) => state.emailDomainsReducer.instances;
-const selectEmailDomains = (state) => Object.values(state.emailDomainsReducer.instances);
+const selectEmailDomains = createSelector([selectEmailDomainsAsMapping], (mapping) => Object.values(mapping));
 const selectEmailDomainsOfOrganization = restructureCreateSelectorWithArgs(
   createSelector(
     [selectEmailDomains, (_, organizationId) => organizationId],
@@ -4312,7 +4241,6 @@ class AssetService extends BaseApiService {
   }
   // TODO: payload does not require asset_type
   bulkAdd(assetsToCreate, workspaceId, assetTypeId, batchSize) {
-    const { store } = this.client;
     const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
     const transactionId = v4();
     const assetBatches = chunkArray(assetsToCreate, batchSize).map((assetBatch) => {
@@ -4356,7 +4284,7 @@ class AssetService extends BaseApiService {
     }
     void Promise.all(batchPromises).then((result) => {
       const allCreatedAssets = result.flat();
-      store.dispatch(addAssets(allCreatedAssets));
+      this.dispatch(addAssets(allCreatedAssets));
     });
     return batchPromises;
   }
@@ -4777,13 +4705,11 @@ class AssetAttachmentService extends BaseAttachmentService {
 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]
@@ -5778,10 +5704,6 @@ class FormService extends BaseUploadService {
     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 = {
@@ -5820,10 +5742,9 @@ class FormService extends BaseUploadService {
     });
     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}`);
@@ -5833,7 +5754,7 @@ class FormService extends BaseUploadService {
       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}`]
       });
@@ -5842,10 +5763,9 @@ class FormService extends BaseUploadService {
       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}`);
@@ -5855,7 +5775,7 @@ class FormService extends BaseUploadService {
       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}`]
       });
@@ -6067,10 +5987,6 @@ class FormSubmissionService extends BaseUploadService {
   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,
@@ -6082,7 +5998,7 @@ class FormSubmissionService extends BaseUploadService {
       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
       ),
@@ -6303,13 +6219,12 @@ class FormSubmissionService extends BaseUploadService {
 }
 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]
@@ -7571,7 +7486,6 @@ export {
   VerificationCodeType,
   WorkspaceService,
   YELLOW,
-  _selectAssets,
   _selectLatestFormRevision,
   _setLatestRetryTime,
   acceptProjectInvite,
@@ -7834,7 +7748,6 @@ export {
   saveActiveProjectFileBounds,
   searchIssues,
   selectAccessToken,
-  selectActiveLicense,
   selectActiveOrganizationAccess,
   selectActiveProject,
   selectActiveProjectAccess,
@@ -7922,8 +7835,8 @@ export {
   selectFormSubmissionsOfAsset,
   selectFormSubmissionsOfForm,
   selectFormSubmissionsOfIssue,
+  selectForms,
   selectFormsCount,
-  selectFormsMapping,
   selectGeneralFormCount,
   selectGeoImageById,
   selectGeoImageMapping,
@@ -7956,7 +7869,6 @@ export {
   selectIssuesOfIssueTypeCount,
   selectLatestFormRevisionByForm,
   selectLatestFormRevisionOfForm,
-  selectLatestFormRevisionsOfAssetTypes,
   selectLatestRetryTime,
   selectLicense,
   selectLicenseForProject,
@@ -7965,7 +7877,6 @@ export {
   selectLicensesOfOrganization,
   selectMainWorkspace,
   selectNumberOfAssetsOfAssetType,
-  selectOrganization,
   selectOrganizationAccessById,
   selectOrganizationAccessForUser,
   selectOrganizationAccessUserMapping,
@@ -8010,7 +7921,6 @@ export {
   selectTeamsOfOrganization,
   selectTeamsOfUser,
   selectUploadUrl,
-  selectUser,
   selectUserById,
   selectUsersByIds,
   selectUsersMapping,