@overmap-ai/core 1.0.63-selector-standardization.6 → 1.0.63-selector-standardization.8

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,14 +972,10 @@ 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);
+});
 const selectAssetsOfAssetType = restructureCreateSelectorWithArgs(
   createSelector([selectAssets, (_state, assetTypeId) => assetTypeId], (components, assetTypeId) => {
     return components.filter((asset) => asset.asset_type === assetTypeId);
@@ -1739,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];
 };
@@ -2015,19 +1979,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)
@@ -2070,9 +2034,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() };
@@ -2377,32 +2338,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)) {
@@ -2431,9 +2366,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(
     [
@@ -2470,9 +2409,6 @@ const selectFilteredForms = restructureCreateSelectorWithArgs(
     { memoizeOptions: { equalityCheck: shallowEqual } }
   )
 );
-const selectFormMapping = (state) => {
-  return state.formReducer.instances;
-};
 const selectFormById = (formId) => (state) => {
   return state.formReducer.instances[formId];
 };
@@ -2498,7 +2434,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({
@@ -2817,7 +2752,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],
@@ -4309,7 +4244,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) => {
@@ -4353,7 +4287,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;
   }
@@ -7918,8 +7852,8 @@ export {
   selectFormSubmissionsOfAsset,
   selectFormSubmissionsOfForm,
   selectFormSubmissionsOfIssue,
+  selectForms,
   selectFormsCount,
-  selectFormsMapping,
   selectGeneralFormCount,
   selectGeoImageById,
   selectGeoImageMapping,
@@ -7952,7 +7886,6 @@ export {
   selectIssuesOfIssueTypeCount,
   selectLatestFormRevisionByForm,
   selectLatestFormRevisionOfForm,
-  selectLatestFormRevisionsOfAssetTypes,
   selectLatestRetryTime,
   selectLicense,
   selectLicenseForProject,
@@ -7961,7 +7894,6 @@ export {
   selectLicensesOfOrganization,
   selectMainWorkspace,
   selectNumberOfAssetsOfAssetType,
-  selectOrganization,
   selectOrganizationAccessById,
   selectOrganizationAccessForUser,
   selectOrganizationAccessUserMapping,
@@ -8006,7 +7938,6 @@ export {
   selectTeamsOfOrganization,
   selectTeamsOfUser,
   selectUploadUrl,
-  selectUser,
   selectUserById,
   selectUsersByIds,
   selectUsersMapping,