@overmap-ai/core 1.0.63-selector-standardization.0 → 1.0.63-selector-standardization.3

package/dist/overmap-core.js

@@ -1011,7 +1011,7 @@ const selectAssetTypes = createSelector(
   [selectAssetTypesMapping],
   (mapping) => Object.values(mapping)
 );
-const selectAssetTypeId = (id) => (state) => {
+const selectAssetTypeById = (id) => (state) => {
   return state.assetTypeReducer.instances[id];
 };
 const selectAssetTypesByIds = restructureCreateSelectorWithArgs(
@@ -1135,19 +1135,7 @@ const selectAssetToAssetTypeMapping = createSelector(
   }
 );
 const selectNumberOfAssetsOfAssetType = (assetTypeId) => (state) => {
-  var _a2;
-  if (!assetTypeId)
-    return 0;
-  return (_a2 = selectAssetsOfAssetType(assetTypeId)(state)) == null ? void 0 : _a2.length;
-};
-const selectAssetTypesFromIds = (assetTypeIds) => (state) => {
-  return assetTypeIds.reduce((acc, assetTypeId) => {
-    const assetType = state.assetTypeReducer.instances[assetTypeId];
-    if (assetType) {
-      acc.push(assetType);
-    }
-    return acc;
-  }, []);
+  return selectAssetsOfAssetType(assetTypeId)(state).length;
 };
 const assetReducer = assetSlice.reducer;
 const assetAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
@@ -1357,8 +1345,8 @@ const selectMainWorkspace = createSelector(
     return workspaces.find((workspace) => workspace.name.toLowerCase() === "main");
   }
 );
-const selectWorkspaceById = (workspaceId) => (state) => {
-  return state.workspaceReducer.instances[workspaceId];
+const selectWorkspaceById = (id) => (state) => {
+  return state.workspaceReducer.instances[id];
 };
 const selectPermittedWorkspaceIds = createSelector(
   [selectWorkspaceMapping],
@@ -1559,8 +1547,8 @@ const selectIssueTypes = createSelector(
     return Object.values(issueTypes);
   }
 );
-const selectIssueTypeById = (issueTypeId) => (state) => {
-  return state.issueTypeReducer.instances[issueTypeId];
+const selectIssueTypeById = (id) => (state) => {
+  return state.issueTypeReducer.instances[id];
 };
 const selectIssueTypesByIds = (issueTypeIds) => (state) => {
   const issueTypes = [];
@@ -1591,8 +1579,7 @@ const selectIssuesOfIssueType = restructureCreateSelectorWithArgs(
   )
 );
 const selectIssuesOfIssueTypeCount = (issueTypeId) => (state) => {
-  var _a2;
-  return ((_a2 = selectIssuesOfIssueType(issueTypeId)(state)) == null ? void 0 : _a2.length) ?? 0;
+  return selectIssuesOfIssueType(issueTypeId)(state).length;
 };
 const issueTypeReducer = issueTypeSlice.reducer;
 const initialState$q = {
@@ -1757,8 +1744,8 @@ const selectUser = (userId) => (state) => {
     return void 0;
   return state.userReducer.users[userId];
 };
-const selectUserById = (userId) => (state) => {
-  return state.userReducer.users[userId];
+const selectUserById = (id) => (state) => {
+  return state.userReducer.users[id];
 };
 const selectUsersByIds = restructureCreateSelectorWithArgs(
   createSelector([selectUsersMapping, (_state, userIds) => userIds], (usersMapping, userIds) => {
@@ -1793,8 +1780,8 @@ const { initializeOrganizationAccesses, updateOrganizationAccess, deleteOrganiza
 const selectOrganizationAccesses = (state) => {
   return state.organizationAccessReducer.instances;
 };
-const selectOrganizationAccess = (organizationAccessId) => (state) => {
-  return state.organizationAccessReducer.instances[organizationAccessId];
+const selectOrganizationAccessById = (id) => (state) => {
+  return state.organizationAccessReducer.instances[id];
 };
 const selectActiveOrganizationAccess = createSelector(
   [selectCurrentUser, selectOrganizationAccesses],
@@ -1834,7 +1821,7 @@ const { initializeLicences, addLicenses, updateLicense } = licenseSlice.actions;
 const selectLicenses = (state) => {
   return state.licenseReducer.instances;
 };
-const selectLicense = (licenseId) => (state) => state.licenseReducer.instances[licenseId];
+const selectLicense = (id) => (state) => state.licenseReducer.instances[id];
 const selectActiveLicense = (state) => Object.values(state.licenseReducer.instances).find(
   (license) => license.project === state.projectReducer.activeProjectId
 ) ?? null;
@@ -1871,8 +1858,8 @@ const selectProjectAccesses = createSelector(
     return Object.values(projectAccesses);
   }
 );
-const selectProjectAccessById = (projectAccessId) => (state) => {
-  return state.projectAccessReducer.instances[projectAccessId];
+const selectProjectAccessById = (id) => (state) => {
+  return state.projectAccessReducer.instances[id];
 };
 const selectActiveProjectAccess = (state) => {
   const currentUser = state.userReducer.currentUser;
@@ -1967,7 +1954,7 @@ const {
   addActiveProjectFormSubmissionsCount
 } = projectSlice.actions;
 const projectReducer = projectSlice.reducer;
-const selectProjects = (state) => state.projectReducer.projects;
+const selectProjectMapping = (state) => state.projectReducer.projects;
 const selectActiveProjectId = (state) => state.projectReducer.activeProjectId;
 const selectActiveProject = (state) => {
   const activeProjectId = selectActiveProjectId(state);
@@ -1976,8 +1963,8 @@ const selectActiveProject = (state) => {
   }
   return state.projectReducer.projects[activeProjectId] ?? null;
 };
-const selectProjectById = (projectId) => (state) => {
-  return state.projectReducer.projects[projectId];
+const selectProjectById = (id) => (state) => {
+  return state.projectReducer.projects[id];
 };
 const selectProjectUsersIds = createSelector(
   [selectProjectAccessMapping],
@@ -1988,7 +1975,7 @@ const selectProjectUsersAsMapping = createSelector(
   (projectUserIds, users) => projectUserIds.reduce((accum, userId) => ({ ...accum, [userId]: users[userId] }), {})
 );
 const selectProjectsWithAccess = createSelector(
-  [selectProjects],
+  [selectProjectMapping],
   (projects) => Object.values(projects).filter((project) => !project.invited)
 );
 const selectSortedProjectUsers = createSelector(
@@ -2038,17 +2025,20 @@ const selectOrganizationsWithAccess = createSelector(
   [selectOrganizations],
   (organizations) => Object.values(organizations).filter((organization) => organization.has_access)
 );
-const selectOrganizationById = (organizationId) => (state) => {
-  return state.organizationReducer.organizations[organizationId];
+const selectOrganizationById = (id) => (state) => {
+  return state.organizationReducer.organizations[id];
 };
 const selectOrganizationUsersIds = createSelector(
   [selectOrganizationAccesses],
   (organizationAccesses) => Object.values(organizationAccesses).map((organizationAccess) => organizationAccess.user)
 );
 const selectProjectsOfOrganization = restructureCreateSelectorWithArgs(
-  createSelector([selectProjects, (_, organizationId) => organizationId], (projects, organizationId) => {
-    return Object.values(projects).filter((project) => project.organization_owner === organizationId);
-  })
+  createSelector(
+    [selectProjectMapping, (_, organizationId) => organizationId],
+    (projects, organizationId) => {
+      return Object.values(projects).filter((project) => project.organization_owner === organizationId);
+    }
+  )
 );
 const selectLicensesOfOrganization = restructureCreateSelectorWithArgs(
   createSelector([selectLicenses, (_, organizationId) => organizationId], (licenses, organizationId) => {
@@ -2266,16 +2256,13 @@ const selectAllProjectAttachments = createSelector(
   [selectProjectAttachmentMapping],
   (mapping) => Object.values(mapping)
 );
-const selectProjectAttachment = (attachmentId) => (state) => {
-  return state.projectAttachmentReducer.instances[attachmentId];
+const selectProjectAttachment = (id) => (state) => {
+  return state.projectAttachmentReducer.instances[id];
 };
 const selectAttachmentsOfProject = restructureCreateSelectorWithArgs(
-  createSelector(
-    [selectAllProjectAttachments, (_state, projectId) => projectId],
-    (attachments, projectId) => {
-      return attachments.filter(({ project }) => projectId === project);
-    }
-  )
+  createSelector([selectAllProjectAttachments, (_, projectId) => projectId], (attachments, projectId) => {
+    return attachments.filter(({ project }) => projectId === project);
+  })
 );
 const selectAttachmentsOfProjectByType = restructureCreateSelectorWithArgs(
   createSelector(
@@ -2352,7 +2339,7 @@ const selectFormRevisions = createSelector(
   [selectFormRevisionMapping],
   (formRevisions) => Object.values(formRevisions)
 );
-const selectFormRevisionId = (formRevisionId) => (state) => {
+const selectFormRevisionById = (formRevisionId) => (state) => {
   return state.formRevisionReducer.instances[formRevisionId];
 };
 const _selectLatestFormRevision = (formRevisions, formId) => {
@@ -3117,8 +3104,8 @@ const selectTeamsMapping = (state) => state.teamReducer.instances;
 const selectTeams = createSelector([selectTeamsMapping], (teams) => {
   return Object.values(teams);
 });
-const selectTeamById = (teamId) => (state) => {
-  return state.teamReducer.instances[teamId];
+const selectTeamById = (id) => (state) => {
+  return state.teamReducer.instances[id];
 };
 const selectTeamsOfOrganization = restructureCreateSelectorWithArgs(
   createSelector(
@@ -3270,8 +3257,8 @@ const selectAttachmentsOfIssue = restructureCreateSelectorWithArgs(
     }
   )
 );
-const selectIssueAttachment = (attachmentId) => (root) => {
-  return root.issueAttachmentReducer.instances[attachmentId];
+const selectIssueAttachmentById = (id) => (root) => {
+  return root.issueAttachmentReducer.instances[id];
 };
 const selectAttachmentsOfIssueByType = restructureCreateSelectorWithArgs(
   createSelector(
@@ -3494,7 +3481,7 @@ function handleWorkspaceRemoval(draft, action) {
     throw new Error("Tried to delete main workspace");
   }
   const categoriesInThisWorkspace = new Set(
-    (selectCategoriesOfWorkspace(workspaceId)(draft) ?? []).map((category) => category.offline_id)
+    selectCategoriesOfWorkspace(workspaceId)(draft).map((category) => category.offline_id)
   );
   for (const issue of issuesVisibleInWorkspace) {
     if (issue.category && categoriesInThisWorkspace.has(issue.category)) {
@@ -4305,7 +4292,7 @@ class AssetService extends BaseApiService {
   async deleteAllAssetsOfAssetType(assetTypeId) {
     const { store } = this.client;
     const state = store.getState();
-    const allAssetsOfAssetType = selectAssetsOfAssetType(assetTypeId)(state) ?? [];
+    const allAssetsOfAssetType = selectAssetsOfAssetType(assetTypeId)(state);
     const allAssetsOfAssetTypeIds = allAssetsOfAssetType.map((c) => c.offline_id);
     const affectedOfflineIds = [assetTypeId, ...allAssetsOfAssetTypeIds];
     store.dispatch(deleteAssets(allAssetsOfAssetTypeIds));
@@ -4814,11 +4801,11 @@ class AssetTypeService extends BaseApiService {
   async delete(assetTypeId) {
     const { store } = this.client;
     const state = store.getState();
-    const assetType = selectAssetTypeId(assetTypeId)(state);
+    const assetType = selectAssetTypeById(assetTypeId)(state);
     if (!assetType) {
       throw new Error(`Expected asset type with offline_id ${assetTypeId} to exist`);
     }
-    const stagesOfAssetType = selectStagesOfAssetType(assetTypeId)(state) ?? [];
+    const stagesOfAssetType = selectStagesOfAssetType(assetTypeId)(state);
     const attachmentsOfAssetType = selectAttachmentsOfAssetType(assetTypeId)(state);
     this.dispatch(deleteAssetType(assetTypeId));
     if (stagesOfAssetType.length > 0) {
@@ -4987,7 +4974,7 @@ class IssueAttachmentService extends BaseAttachmentService {
     __publicField(this, "removeAttachments", deleteIssueAttachments);
     __publicField(this, "removeAttachment", deleteIssueAttachment);
     __publicField(this, "setAttachment", setIssueAttachment);
-    __publicField(this, "selectAttachment", selectIssueAttachment);
+    __publicField(this, "selectAttachment", selectIssueAttachmentById);
   }
   buildOfflineAttachment(data) {
     return offline({
@@ -5290,7 +5277,7 @@ class IssueTypeService extends BaseApiService {
     if (!issueTypeToDelete) {
       throw new Error(`IssueType with offline_id ${issueTypeId} does not exist in the store.`);
     }
-    const issuesOfIssueType = selectIssuesOfIssueType(issueTypeId)(state) ?? [];
+    const issuesOfIssueType = selectIssuesOfIssueType(issueTypeId)(state);
     this.dispatch(removeIssueType(issueTypeId));
     this.dispatch(deleteIssues(issuesOfIssueType.map((issue) => issue.offline_id)));
     const promise = this.enqueueRequest({
@@ -5534,7 +5521,7 @@ class ProjectService extends BaseApiService {
   async delete(projectId) {
     const { store } = this.client;
     const state = store.getState();
-    const projects = selectProjects(state);
+    const projects = selectProjectMapping(state);
     const project = projects[projectId];
     if (!project) {
       throw new Error("Expected project to exist");
@@ -5882,11 +5869,11 @@ class FormService extends BaseUploadService {
       throw new Error("Expected form to exist");
     }
     const formSubmissions = selectFormSubmissionsOfForm(formId)(state);
-    if (formSubmissions && formSubmissions.length > 0) {
+    if (formSubmissions.length > 0) {
       this.dispatch(deleteFormSubmissions(formSubmissions.map(({ offline_id }) => offline_id)));
     }
     const formRevisions = selectFormRevisionsOfForm(formId)(state);
-    if (formRevisions && formRevisions.length > 0) {
+    if (formRevisions.length > 0) {
       this.dispatch(deleteFormRevisions(formRevisions.map(({ offline_id }) => offline_id)));
     }
     this.dispatch(deleteForm(formId));
@@ -5900,10 +5887,10 @@ class FormService extends BaseUploadService {
       });
     } catch (e) {
       this.dispatch(addForm(form));
-      if (formRevisions && formRevisions.length > 0) {
+      if (formRevisions.length > 0) {
         this.dispatch(addFormRevisions(formRevisions));
       }
-      if (formSubmissions && formSubmissions.length > 0) {
+      if (formSubmissions.length > 0) {
         this.dispatch(addFormSubmissions(formSubmissions));
       }
       throw e;
@@ -7864,11 +7851,10 @@ export {
   selectAssetTypeAttachment,
   selectAssetTypeAttachmentMapping,
   selectAssetTypeAttachments,
-  selectAssetTypeId,
+  selectAssetTypeById,
   selectAssetTypeStagesMapping,
   selectAssetTypes,
   selectAssetTypesByIds,
-  selectAssetTypesFromIds,
   selectAssetTypesMapping,
   selectAssets,
   selectAssetsByIds,
@@ -7917,7 +7903,7 @@ export {
   selectFormOfAssetType,
   selectFormOfIssueType,
   selectFormRevisionAttachmentsMapping,
-  selectFormRevisionId,
+  selectFormRevisionById,
   selectFormRevisionMapping,
   selectFormRevisions,
   selectFormRevisionsOfForm,
@@ -7947,7 +7933,7 @@ export {
   selectIssueAssociationsOfAsset,
   selectIssueAssociationsOfIssue,
   selectIssueAssociationsToIssue,
-  selectIssueAttachment,
+  selectIssueAttachmentById,
   selectIssueAttachmentMapping,
   selectIssueAttachments,
   selectIssueById,
@@ -7976,7 +7962,7 @@ export {
   selectMainWorkspace,
   selectNumberOfAssetsOfAssetType,
   selectOrganization,
-  selectOrganizationAccess,
+  selectOrganizationAccessById,
   selectOrganizationAccessForUser,
   selectOrganizationAccessUserMapping,
   selectOrganizationAccesses,
@@ -7998,9 +7984,9 @@ export {
   selectProjectFileById,
   selectProjectFileMapping,
   selectProjectFiles,
+  selectProjectMapping,
   selectProjectUsersAsMapping,
   selectProjectUsersIds,
-  selectProjects,
   selectProjectsOfOrganization,
   selectProjectsWithAccess,
   selectRecentIssueIds,