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

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,14 +960,10 @@ 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);
+  });
   const selectAssetsOfAssetType = restructureCreateSelectorWithArgs(
     toolkit.createSelector([selectAssets, (_state, assetTypeId) => assetTypeId], (components, assetTypeId) => {
       return components.filter((asset) => asset.asset_type === assetTypeId);
@@ -1727,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];
   };
@@ -2003,19 +1967,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)
@@ -2058,9 +2022,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() };
@@ -2365,32 +2326,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)) {
@@ -2419,9 +2354,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(
       [
@@ -2458,9 +2397,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];
   };
@@ -2486,7 +2422,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({
@@ -2805,7 +2740,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],
@@ -4297,7 +4232,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) => {
@@ -4341,7 +4275,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;
     }
@@ -7905,8 +7839,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;
@@ -7939,7 +7873,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;
@@ -7948,7 +7881,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;
@@ -7993,7 +7925,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;