@overmap-ai/core 1.0.31 → 1.0.32

package/dist/overmap-core.js

@@ -2357,8 +2357,7 @@ const selectUsersAsMapping = (state) => state.userReducer.users;
 const selectFavouriteProjects = (state) => state.userReducer.currentUser.profile.favourite_project_ids;
 const userReducer = userSlice.reducer;
 const initialState$a = {
-  organizationAccesses: {},
-  activeOrganizationAccessId: null
+  organizationAccesses: {}
 };
 const organizationAccessSlice = createSlice({
   name: "organizationAccess",
@@ -2394,31 +2393,25 @@ const organizationAccessSlice = createSlice({
           `Tried to remove organization access with ID that doesn't exist: ${action.payload.offline_id}`
         );
       }
-    },
-    setActiveOrganizationAccessId: (state, action) => {
-      state.activeOrganizationAccessId = action.payload;
     }
   }
 });
-const {
-  setOrganizationAccesses,
-  updateOrganizationAccess,
-  removeOrganizationAccess,
-  setActiveOrganizationAccessId
-} = organizationAccessSlice.actions;
+const { setOrganizationAccesses, updateOrganizationAccess, removeOrganizationAccess } = organizationAccessSlice.actions;
 const selectOrganizationAccesses = (state) => {
   return state.organizationAccessReducer.organizationAccesses;
 };
 const selectOrganizationAccess = (organizationAccessId) => (state) => {
   return state.organizationAccessReducer.organizationAccesses[organizationAccessId];
 };
-const selectActiveOrganizationAccess = (state) => {
-  const activeOrganizationAccessId = state.organizationAccessReducer.activeOrganizationAccessId;
-  if (!activeOrganizationAccessId) {
-    return null;
+const selectActiveOrganizationAccess = createSelector(
+  [selectCurrentUser, selectOrganizationAccesses],
+  (currentUser, organizationAccesses) => {
+    const activeOrganizationAccess = Object.values(organizationAccesses).find(
+      (organizationAccess) => organizationAccess.user === currentUser.id
+    );
+    return activeOrganizationAccess ?? null;
   }
-  return state.organizationAccessReducer.organizationAccesses[activeOrganizationAccessId] ?? null;
-};
+);
 const selectOrganizationAccessForUser = (user) => (state) => {
   return Object.values(state.organizationAccessReducer.organizationAccesses).find(
     (organizationAccess) => organizationAccess.user === user.id
@@ -2467,6 +2460,10 @@ const selectActiveOrganizationId = (state) => {
 const selectOrganizations = (state) => {
   return Object.values(state.organizationReducer.organizations);
 };
+const selectOrganizationsWithAccess = createSelector(
+  [selectOrganizations],
+  (organizations) => Object.values(organizations).filter((organization) => organization.has_access)
+);
 const selectActiveOrganization = (state) => {
   const id = selectActiveOrganizationId(state);
   if (!id) {
@@ -2719,6 +2716,21 @@ const selectActiveProject = (state) => {
 const selectRecentProjects = (state) => {
   return state.projectReducer.recentProjectIds;
 };
+const selectSortedProjects = createSelector(
+  [selectActiveProject, selectProjects],
+  (activeProject, projects) => {
+    return Object.values(projects).sort((projectA, projectB) => {
+      if (activeProject) {
+        if (activeProject.id === projectA.id) {
+          return -1;
+        } else if (activeProject.id === projectB.id) {
+          return 1;
+        }
+      }
+      return projectA.name.toLowerCase().localeCompare(projectB.name.toLowerCase(), void 0, { numeric: true });
+    });
+  }
+);
 const selectCreateProjectType = (state) => state.projectReducer.createProjectType;
 const projectReducer = projectSlice.reducer;
 const selectProjectUsersIds = createSelector(
@@ -4060,7 +4072,6 @@ class AuthService extends BaseApiService {
     store.dispatch(setLoggedIn(false));
     store.dispatch(clearTokens());
     store.dispatch(setActiveProjectId(null));
-    store.dispatch(setActiveOrganizationAccessId(null));
     store.dispatch(setActiveWorkspaceId(null));
     store.dispatch({ type: RESET_STATE });
     store.dispatch({ type: resetStore });
@@ -4903,26 +4914,27 @@ class MainService extends BaseApiService {
       }
     }
     store.dispatch(setCurrentUser(data.user));
+    store.dispatch(addUsers(data.project_owners));
     const organizationsData = data.organizations;
     store.dispatch(setOrganizations(organizationsData));
     const validProjects = projects.filter((project) => !project.invited);
-    const firstOrg = organizationsData[0];
+    const activeOrganizationId = store.getState().organizationReducer.activeOrganizationId;
+    const firstOrg = organizationsData.find((organization) => organization.has_access);
     const currProjObj = projects.find((project) => project.id === currentProjectId);
     const isOrgProject = !!(currProjObj == null ? void 0 : currProjObj.owner_organization);
-    const userIsInProjectOrg = isOrgProject && organizationsData.some((organization) => organization.id === currProjObj.owner_organization);
+    const userIsInProjectOrg = isOrgProject && organizationsData.some(
+      (organization) => organization.has_access && organization.id === currProjObj.owner_organization
+    );
     let currentOrgId = null;
-    if (userIsInProjectOrg) {
+    if (activeOrganizationId) {
+      currentOrgId = activeOrganizationId;
+    } else if (userIsInProjectOrg) {
       currentOrgId = currProjObj.owner_organization;
     } else if (firstOrg) {
       currentOrgId = firstOrg.id;
     }
     if (currentOrgId) {
-      store.dispatch(setActiveOrganizationId(currentOrgId));
-      const orgUsersResultPromise = this.fetchOrganizationUsers(currentOrgId);
-      const organizationAccessRefreshPromise = this.client.organizationAccess.refreshStore();
-      const orgUsersResult = await orgUsersResultPromise;
-      await organizationAccessRefreshPromise;
-      store.dispatch(addUsers(orgUsersResult));
+      await this.client.organizations.fetchInitialOrganizationData(currentOrgId, false);
     }
     if (!isProjectIdValid) {
       if (validProjects.length !== 0) {
@@ -4977,7 +4989,6 @@ class MainService extends BaseApiService {
       void this.client.userForms.refreshStore().then(() => {
         void this.client.userFormSubmissions.refreshStore().then();
       });
-      void this.client.emailDomains.refreshStore().then();
     }
     if (currentProjectId) {
       const [_offlineAttachments, promise] = this.client.attachments.fetchAll(currentProjectId);
@@ -5689,16 +5700,8 @@ class OrganizationAccessService extends BaseApiService {
       blockers: [],
       blocks: []
     });
-    const currentUser = state.userReducer.currentUser;
     const organizationAccesses = result;
-    const activeOrganizationAccess = organizationAccesses.find(
-      (organizationAccess) => organizationAccess.user === currentUser.id
-    );
-    if (!activeOrganizationAccess) {
-      throw new Error("Current user does not have an organization access instance");
-    }
     store.dispatch(setOrganizationAccesses(organizationAccesses));
-    store.dispatch(setActiveOrganizationAccessId(activeOrganizationAccess.offline_id));
   }
 }
 const cachedRequestPromises = {};
@@ -5966,6 +5969,37 @@ class EmailDomainsService extends BaseApiService {
   }
 }
 class OrganizationService extends BaseApiService {
+  async fetchInitialOrganizationData(organizationId, showLoading) {
+    if (showLoading) {
+      this.client.store.dispatch(setIsFetchingInitialData(true));
+    }
+    return this.enqueueRequest({
+      description: "Get initial organization data",
+      method: HttpMethod.GET,
+      url: `/organizations/${organizationId}/initial-data/`,
+      payload: {},
+      isAuthNeeded: true,
+      blockers: [],
+      blocks: [organizationId.toString()]
+    }).then((result) => {
+      this._processInitialOrganizationData(result, showLoading);
+      return result;
+    });
+  }
+  _processInitialOrganizationData(data, showLoading) {
+    const { store } = this.client;
+    const activeOrganization = data.organization;
+    const organizationAccesses = data.organization_accesses;
+    const emailDomains = data.email_domains;
+    const users = data.users;
+    store.dispatch(addUsers(users));
+    store.dispatch(setActiveOrganizationId(activeOrganization.id));
+    store.dispatch(setOrganizationAccesses(organizationAccesses));
+    store.dispatch(setEmailDomains(emailDomains));
+    if (showLoading) {
+      store.dispatch(setIsFetchingInitialData(false));
+    }
+  }
   async create(name) {
     const result = await this.enqueueRequest({
       description: "Create organization",
@@ -10978,6 +11012,7 @@ export {
   selectOrganizationUsersAsMapping,
   selectOrganizationUsersIds,
   selectOrganizations,
+  selectOrganizationsWithAccess,
   selectPermittedWorkspaceIds,
   selectPhotoAttachmentsOfIssue,
   selectProjectAccess,
@@ -10999,6 +11034,7 @@ export {
   selectSortedEmailDomains,
   selectSortedOrganizationUsers,
   selectSortedProjectUsers,
+  selectSortedProjects,
   selectStageMapping,
   selectStages,
   selectStagesFromComponentType,
@@ -11020,7 +11056,6 @@ export {
   selectWorkspaceMapping,
   selectWorkspaces,
   setActiveIssueId,
-  setActiveOrganizationAccessId,
   setActiveOrganizationId,
   setActiveProjectFileId,
   setActiveProjectId,