@overmap-ai/core 1.0.29-org-switcher-and-bug-fixes.6 → 1.0.29

package/dist/overmap-core.js

@@ -2348,7 +2348,8 @@ const selectUsersAsMapping = (state) => state.userReducer.users;
 const selectFavouriteProjects = (state) => state.userReducer.currentUser.profile.favourite_project_ids;
 const userReducer = userSlice.reducer;
 const initialState$a = {
-  organizationAccesses: {}
+  organizationAccesses: {},
+  activeOrganizationAccessId: null
 };
 const organizationAccessSlice = createSlice({
   name: "organizationAccess",
@@ -2384,28 +2385,31 @@ 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 } = organizationAccessSlice.actions;
+const {
+  setOrganizationAccesses,
+  updateOrganizationAccess,
+  removeOrganizationAccess,
+  setActiveOrganizationAccessId
+} = organizationAccessSlice.actions;
 const selectOrganizationAccesses = (state) => {
   return state.organizationAccessReducer.organizationAccesses;
 };
 const selectOrganizationAccess = (organizationAccessId) => (state) => {
   return state.organizationAccessReducer.organizationAccesses[organizationAccessId];
 };
-const selectActiveOrganizationAccess = createSelector(
-  [selectCurrentUser, selectOrganizationAccesses],
-  (currentUser, organizationAccesses) => {
-    const activeOrganizationAccess = Object.values(organizationAccesses).find(
-      (organizationAccess) => organizationAccess.user === currentUser.id
-    );
-    if (!activeOrganizationAccess) {
-      return null;
-    }
-    return activeOrganizationAccess;
+const selectActiveOrganizationAccess = (state) => {
+  const activeOrganizationAccessId = state.organizationAccessReducer.activeOrganizationAccessId;
+  if (!activeOrganizationAccessId) {
+    return null;
   }
-);
+  return state.organizationAccessReducer.organizationAccesses[activeOrganizationAccessId] ?? null;
+};
 const selectOrganizationAccessForUser = (user) => (state) => {
   return Object.values(state.organizationAccessReducer.organizationAccesses).find(
     (organizationAccess) => organizationAccess.user === user.id
@@ -2454,11 +2458,6 @@ const selectActiveOrganizationId = (state) => {
 const selectOrganizations = (state) => {
   return Object.values(state.organizationReducer.organizations);
 };
-const selectOrganizationsWithAccess = (state) => {
-  return Object.values(state.organizationReducer.organizations).filter(
-    (organization) => organization.has_access
-  );
-};
 const selectActiveOrganization = (state) => {
   const id = selectActiveOrganizationId(state);
   if (!id) {
@@ -4030,6 +4029,7 @@ 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 });
@@ -4872,26 +4872,25 @@ class MainService extends BaseApiService {
       }
     }
     store.dispatch(setCurrentUser(data.user));
-    store.dispatch(addUsers(data.project_owners));
     const organizationsData = data.organizations;
     store.dispatch(setOrganizations(organizationsData));
-    const activeOrganizationId = store.getState().organizationReducer.activeOrganizationId;
-    const firstOrg = organizationsData.find((organization) => organization.has_access);
+    const firstOrg = organizationsData[0];
     const currProjObj = projects.find((project) => project.id === currentProjectId);
     const isOrgProject = !!(currProjObj == null ? void 0 : currProjObj.owner_organization);
-    const userIsInProjectOrg = isOrgProject && organizationsData.some(
-      (organization) => organization.has_access && organization.id === currProjObj.owner_organization
-    );
+    const userIsInProjectOrg = isOrgProject && organizationsData.some((organization) => organization.id === currProjObj.owner_organization);
     let currentOrgId = null;
-    if (activeOrganizationId) {
-      currentOrgId = activeOrganizationId;
-    } else if (userIsInProjectOrg) {
+    if (userIsInProjectOrg) {
       currentOrgId = currProjObj.owner_organization;
     } else if (firstOrg) {
       currentOrgId = firstOrg.id;
     }
     if (currentOrgId) {
-      await this.client.organizations.fetchInitialOrganizationData(currentOrgId, false);
+      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));
     }
     if (!isProjectIdValid) {
       if (projects.length !== 0) {
@@ -4944,6 +4943,7 @@ 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);
@@ -5644,8 +5644,16 @@ 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 = {};
@@ -5913,37 +5921,6 @@ class EmailDomainsService extends BaseApiService {
   }
 }
 class OrganizationService extends BaseApiService {
-  async fetchInitialOrganizationData(organization_id, showLoading) {
-    if (showLoading) {
-      this.client.store.dispatch(setIsFetchingInitialData(true));
-    }
-    return this.enqueueRequest({
-      description: "Get initial organization data",
-      method: HttpMethod.GET,
-      url: `/organizations/${organization_id}/initial-data/`,
-      payload: {},
-      isAuthNeeded: true,
-      blockers: [],
-      blocks: []
-    }).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 email_domains = data.email_domains;
-    const users = data.users;
-    store.dispatch(addUsers(users));
-    store.dispatch(setActiveOrganizationId(activeOrganization.id));
-    store.dispatch(setOrganizationAccesses(organizationAccesses));
-    store.dispatch(setEmailDomains(email_domains));
-    if (showLoading) {
-      store.dispatch(setIsFetchingInitialData(false));
-    }
-  }
   async create(name) {
     const result = await this.enqueueRequest({
       description: "Create organization",
@@ -6312,7 +6289,6 @@ export {
   selectOrganizationUsersAsMapping,
   selectOrganizationUsersIds,
   selectOrganizations,
-  selectOrganizationsWithAccess,
   selectPermittedWorkspaceIds,
   selectPhotoAttachmentsOfIssue,
   selectProjectAccess,
@@ -6354,6 +6330,7 @@ export {
   selectWorkspaceMapping,
   selectWorkspaces,
   setActiveIssueId,
+  setActiveOrganizationAccessId,
   setActiveOrganizationId,
   setActiveProjectFileId,
   setActiveProjectId,