@overmap-ai/core 1.0.71-mapbox.1 → 1.0.71-mapbox.3

package/dist/overmap-core.umd.cjs

@@ -489,6 +489,7 @@ var __publicField = (obj, key, value) => {
   const DEFAULT_ISSUE_PRIORITY = IssuePriority.MEDIUM;
   const OUTBOX_RETRY_DELAY = 6e4;
   const EMPTY_ARRAY = Object.freeze([]);
+  const EMPTY_OBJECT = Object.freeze({});
   let debug = false;
   const REACT_APP_DEBUG_MEMOIZATION = {}.REACT_APP_DEBUG_MEMOIZATION || "";
   if (["true", "1"].includes(REACT_APP_DEBUG_MEMOIZATION.toLowerCase())) {
@@ -542,6 +543,9 @@ var __publicField = (obj, key, value) => {
   const fallbackToEmptyArray = (array) => {
     return array.length === 0 ? EMPTY_ARRAY : array;
   };
+  const fallbackToEmptyObject = (object) => {
+    return Object.keys(object).length === 0 ? EMPTY_OBJECT : object;
+  };
   const primaryColor = "#2D55E2";
   const successColor = "#349C55";
   const warningColor = "#FFA620";
@@ -828,12 +832,6 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
-  const selectCategoriesOfWorkspace = restructureCreateSelectorWithArgs(
-    toolkit.createSelector(
-      [selectCategories, (_state, workspaceId) => workspaceId],
-      (categories, workspaceId) => categories.filter((category) => category.workspace === workspaceId)
-    )
-  );
   const selectIssueCountOfCategory = (categoryId) => (state) => {
     return Object.values(state.issueReducer.instances).filter((issue) => issue.category === categoryId).length;
   };
@@ -869,7 +867,7 @@ var __publicField = (obj, key, value) => {
   } = assetSlice.actions;
   const selectAssetsMapping = (state) => state.assetReducer.instances;
   const selectAssets = toolkit.createSelector([selectAssetsMapping], (assetsMapping) => {
-    return Object.values(assetsMapping);
+    return fallbackToEmptyArray(Object.values(assetsMapping));
   });
   const selectAssetsOfAssetType = restructureCreateSelectorWithArgs(
     toolkit.createSelector([selectAssets, (_state, assetTypeId) => assetTypeId], (assets, assetTypeId) => {
@@ -944,13 +942,17 @@ var __publicField = (obj, key, value) => {
       [selectAssetAttachments, (_state, assetId) => assetId],
       (attachments, assetId) => {
         const attachmentsOfAsset = attachments.filter(({ asset }) => assetId === asset);
-        const fileAttachments = attachmentsOfAsset.filter(
-          // this null check here is necessary, there are cases where file_type is null or undefined
-          ({ file_type }) => !file_type || !file_type.startsWith("image/")
+        const fileAttachments = fallbackToEmptyArray(
+          attachmentsOfAsset.filter(
+            // this null check here is necessary, there are cases where file_type is null or undefined
+            ({ file_type }) => !file_type || !file_type.startsWith("image/")
+          )
         );
-        const imageAttachments = attachmentsOfAsset.filter(
-          // this null check here is necessary, there are cases where file_type is null or undefined
-          ({ file_type }) => file_type && file_type.startsWith("image/")
+        const imageAttachments = fallbackToEmptyArray(
+          attachmentsOfAsset.filter(
+            // this null check here is necessary, there are cases where file_type is null or undefined
+            ({ file_type }) => file_type && file_type.startsWith("image/")
+          )
         );
         return { fileAttachments, imageAttachments };
       }
@@ -997,17 +999,9 @@ var __publicField = (obj, key, value) => {
           completedStagesByAsset[asset] = {};
         completedStagesByAsset[asset][stage] = submitted_at;
       }
-      return completedStagesByAsset;
+      return fallbackToEmptyObject(completedStagesByAsset);
     }
   );
-  const selectCompletedStageIdsForAsset = restructureCreateSelectorWithArgs(
-    toolkit.createSelector(
-      [selectAssetStageCompletionMapping, (_state, asset) => asset],
-      (completedStages, asset) => {
-        return Object.keys(completedStages[asset.offline_id] ?? {});
-      }
-    )
-  );
   const selectAssetStageCompletionById = (id) => (state) => {
     return state.assetStageCompletionReducer.instances[id];
   };
@@ -1070,7 +1064,7 @@ var __publicField = (obj, key, value) => {
           assetTypeStagesMapping[stageId] = stage;
         }
       }
-      return assetTypeStagesMapping;
+      return fallbackToEmptyObject(assetTypeStagesMapping);
     })
   );
   const selectStagesOfAssetType = restructureCreateSelectorWithArgs(
@@ -1466,7 +1460,7 @@ var __publicField = (obj, key, value) => {
     for (const organizationAccess of Object.values(state.organizationAccessReducer.instances)) {
       organizationAccesses[organizationAccess.user] = organizationAccess;
     }
-    return organizationAccesses;
+    return fallbackToEmptyObject(organizationAccesses);
   };
   const organizationAccessReducer = organizationAccessSlice.reducer;
   const licenseAdapter = createModelAdapter((license) => license.offline_id);
@@ -1495,7 +1489,9 @@ var __publicField = (obj, key, value) => {
   );
   const selectLicensesForProjectsMapping = toolkit.createSelector(
     [selectLicenses],
-    (licenses) => Object.values(licenses).filter((license) => license.project).reduce((accum, license) => ({ ...accum, [license.project]: license }), {})
+    (licenses) => fallbackToEmptyObject(
+      Object.values(licenses).filter((license) => license.project).reduce((accum, license) => ({ ...accum, [license.project]: license }), {})
+    )
   );
   const licenseReducer = licenseSlice.reducer;
   const projectAccessAdapter = createModelAdapter((projectAccess) => projectAccess.offline_id);
@@ -1541,7 +1537,7 @@ var __publicField = (obj, key, value) => {
     for (const projectAccess of Object.values(state.projectAccessReducer.instances)) {
       projectAccesses[projectAccess.user] = projectAccess;
     }
-    return projectAccesses;
+    return fallbackToEmptyObject(projectAccesses);
   };
   const projectAccessReducer = projectAccessSlice.reducer;
   const initialState$m = {
@@ -1619,13 +1615,15 @@ var __publicField = (obj, key, value) => {
   const projectReducer = projectSlice.reducer;
   const selectProjectMapping = (state) => state.projectReducer.projects;
   const selectActiveProjectId = (state) => state.projectReducer.activeProjectId;
-  const selectActiveProject = (state) => {
-    const activeProjectId = selectActiveProjectId(state);
-    if (!activeProjectId) {
-      return null;
+  const selectActiveProject = toolkit.createSelector(
+    [selectProjectMapping, selectActiveProjectId],
+    (projectsMapping, activeprojectId) => {
+      if (activeprojectId === null) {
+        return null;
+      }
+      return projectsMapping[activeprojectId] ?? null;
     }
-    return state.projectReducer.projects[activeProjectId] ?? null;
-  };
+  );
   const selectProjectById = (id) => (state) => {
     return state.projectReducer.projects[id];
   };
@@ -1640,22 +1638,24 @@ var __publicField = (obj, key, value) => {
   const selectSortedProjectUsers = toolkit.createSelector(
     [selectCurrentUser, selectProjectUsersAsMapping, selectProjectAccessUserMapping],
     (currentUser, userMapping, projectAccessMapping) => {
-      return Object.values(userMapping).sort((userA, userB) => {
-        if (userA.id === (currentUser == null ? void 0 : currentUser.id)) {
-          return -1;
-        } else if (userB.id === (currentUser == null ? void 0 : currentUser.id)) {
+      return fallbackToEmptyArray(
+        Object.values(userMapping).sort((userA, userB) => {
+          if (userA.id === (currentUser == null ? void 0 : currentUser.id)) {
+            return -1;
+          } else if (userB.id === (currentUser == null ? void 0 : currentUser.id)) {
+            return 1;
+          }
+          const projectAccessesA = projectAccessMapping[userA.id];
+          const projectAccessesB = projectAccessMapping[userB.id];
+          if ((projectAccessesA == null ? void 0 : projectAccessesA.access_level) === (projectAccessesB == null ? void 0 : projectAccessesB.access_level)) {
+            return userA.username.localeCompare(userB.username);
+          }
+          if ((projectAccessesA == null ? void 0 : projectAccessesA.access_level) === ProjectAccessLevel.ADMIN) {
+            return -1;
+          }
           return 1;
-        }
-        const projectAccessesA = projectAccessMapping[userA.id];
-        const projectAccessesB = projectAccessMapping[userB.id];
-        if ((projectAccessesA == null ? void 0 : projectAccessesA.access_level) === (projectAccessesB == null ? void 0 : projectAccessesB.access_level)) {
-          return userA.username.localeCompare(userB.username);
-        }
-        if ((projectAccessesA == null ? void 0 : projectAccessesA.access_level) === ProjectAccessLevel.ADMIN) {
-          return -1;
-        }
-        return 1;
-      });
+        })
+      );
     }
   );
   const initialState$l = {
@@ -1714,27 +1714,31 @@ var __publicField = (obj, key, value) => {
   );
   const selectOrganizationUsersAsMapping = toolkit.createSelector(
     [selectOrganizationUsersIds, selectUsersMapping],
-    (organizationUserIds, users) => organizationUserIds.reduce((accum, userId) => ({ ...accum, [userId]: users[userId] }), {})
+    (organizationUserIds, users) => fallbackToEmptyObject(
+      organizationUserIds.reduce((accum, userId) => ({ ...accum, [userId]: users[userId] }), {})
+    )
   );
   const selectSortedOrganizationUsers = toolkit.createSelector(
     [selectCurrentUser, selectOrganizationUsersAsMapping, selectOrganizationAccessUserMapping],
     (currentUser, userMapping, organizationAccessMapping) => {
-      return Object.values(userMapping).sort((userA, userB) => {
-        if (userA.id === (currentUser == null ? void 0 : currentUser.id)) {
-          return -1;
-        } else if (userB.id === (currentUser == null ? void 0 : currentUser.id)) {
+      return fallbackToEmptyArray(
+        Object.values(userMapping).sort((userA, userB) => {
+          if (userA.id === (currentUser == null ? void 0 : currentUser.id)) {
+            return -1;
+          } else if (userB.id === (currentUser == null ? void 0 : currentUser.id)) {
+            return 1;
+          }
+          const organizationAccessesA = organizationAccessMapping[userA.id];
+          const organizationAccessesB = organizationAccessMapping[userB.id];
+          if ((organizationAccessesA == null ? void 0 : organizationAccessesA.access_level) === (organizationAccessesB == null ? void 0 : organizationAccessesB.access_level)) {
+            return userA.username.localeCompare(userB.username);
+          }
+          if ((organizationAccessesA == null ? void 0 : organizationAccessesA.access_level) === OrganizationAccessLevel.ADMIN) {
+            return -1;
+          }
           return 1;
-        }
-        const organizationAccessesA = organizationAccessMapping[userA.id];
-        const organizationAccessesB = organizationAccessMapping[userB.id];
-        if ((organizationAccessesA == null ? void 0 : organizationAccessesA.access_level) === (organizationAccessesB == null ? void 0 : organizationAccessesB.access_level)) {
-          return userA.username.localeCompare(userB.username);
-        }
-        if ((organizationAccessesA == null ? void 0 : organizationAccessesA.access_level) === OrganizationAccessLevel.ADMIN) {
-          return -1;
-        }
-        return 1;
-      });
+        })
+      );
     }
   );
   const organizationReducer = organizationSlice.reducer;
@@ -1882,11 +1886,11 @@ var __publicField = (obj, key, value) => {
       );
     }
   );
-  const selectActiveProjectFileId = (state) => state.projectFileReducer.activeProjectFileId;
-  const selectIsImportingProjectFile = (state) => state.projectFileReducer.isImportingProjectFile;
   const selectProjectFileById = (id) => (state) => {
     return state.projectFileReducer.projectFiles[id];
   };
+  const selectActiveProjectFileId = (state) => state.projectFileReducer.activeProjectFileId;
+  const selectIsImportingProjectFile = (state) => state.projectFileReducer.isImportingProjectFile;
   const projectFileReducer = projectFileSlice.reducer;
   const projectAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
   const initialState$i = projectAttachmentAdapter.getInitialState({});
@@ -2656,8 +2660,8 @@ var __publicField = (obj, key, value) => {
     [selectDocumentsMapping],
     (mapping) => Object.values(mapping)
   );
-  const selectDocumentById = (documentId) => (state) => {
-    return state.documentsReducer.documents[documentId];
+  const selectDocumentById = (id) => (state) => {
+    return state.documentsReducer.documents[id];
   };
   const selectDocumentsByIds = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
@@ -3011,7 +3015,9 @@ var __publicField = (obj, key, value) => {
     deleteGeoImages
   } = geoImageSlice.actions;
   const selectGeoImageMapping = (state) => state.geoImageReducer.instances;
-  const selectGeoImages = (state) => Object.values(state.geoImageReducer.instances);
+  const selectGeoImages = toolkit.createSelector([selectGeoImageMapping], (geoImagesMapping) => {
+    return Object.values(geoImagesMapping);
+  });
   const selectGeoImageById = (id) => (state) => {
     return state.geoImageReducer.instances[id];
   };
@@ -5073,13 +5079,9 @@ var __publicField = (obj, key, value) => {
       const { store } = this.client;
       const state = store.getState();
       const activeProjectFileId = state.projectFileReducer.activeProjectFileId;
-      const activeProjectId = state.projectReducer.activeProjectId;
       if (!activeProjectFileId) {
         throw new Error("No active project file");
       }
-      if (!activeProjectId) {
-        throw new Error("No active project");
-      }
       const activeProjectFile = state.projectFileReducer.projectFiles[activeProjectFileId];
       if (!activeProjectFile) {
         throw new Error("No active project file");
@@ -5104,7 +5106,7 @@ var __publicField = (obj, key, value) => {
           this.client.files.uploadFileToS3(activeProjectFile.file_sha1).then(([fileProps]) => {
             resolve({
               method: HttpMethod.POST,
-              url: `/projects/${activeProjectId}/files/`,
+              url: `/projects/${activeProjectFile.project}/files/`,
               payload: {
                 ...activeProjectFile,
                 ...fileProps
@@ -7292,6 +7294,7 @@ var __publicField = (obj, key, value) => {
   exports2.DocumentAttachmentService = DocumentAttachmentService;
   exports2.DocumentService = DocumentService;
   exports2.EMPTY_ARRAY = EMPTY_ARRAY;
+  exports2.EMPTY_OBJECT = EMPTY_OBJECT;
   exports2.EmailDomainsService = EmailDomainsService;
   exports2.EmailVerificationService = EmailVerificationService;
   exports2.FileService = FileService;
@@ -7472,6 +7475,7 @@ var __publicField = (obj, key, value) => {
   exports2.enqueueRequest = enqueueRequest;
   exports2.errorColor = errorColor;
   exports2.fallbackToEmptyArray = fallbackToEmptyArray;
+  exports2.fallbackToEmptyObject = fallbackToEmptyObject;
   exports2.fileReducer = fileReducer;
   exports2.fileSlice = fileSlice;
   exports2.fileToBlob = fileToBlob;
@@ -7624,11 +7628,9 @@ var __publicField = (obj, key, value) => {
   exports2.selectAttachmentsOfProjectByType = selectAttachmentsOfProjectByType;
   exports2.selectCategories = selectCategories;
   exports2.selectCategoriesByIds = selectCategoriesByIds;
-  exports2.selectCategoriesOfWorkspace = selectCategoriesOfWorkspace;
   exports2.selectCategoryById = selectCategoryById;
   exports2.selectCategoryMapping = selectCategoryMapping;
   exports2.selectCommentsOfIssue = selectCommentsOfIssue;
-  exports2.selectCompletedStageIdsForAsset = selectCompletedStageIdsForAsset;
   exports2.selectCompletedStagesByAsset = selectCompletedStagesByAsset;
   exports2.selectConversation = selectConversation;
   exports2.selectConversationMapping = selectConversationMapping;