@overmap-ai/core 1.0.17 → 1.0.18-fix-misc-issues.0

package/dist/overmap-core.js

@@ -2339,8 +2339,7 @@ const selectLatestRetryTime = (state) => state.outboxReducer.latestRetryTime;
 const { enqueueRequest, markForDeletion, markAsDeleted, _setLatestRetryTime } = outboxSlice.actions;
 const outboxReducer = outboxSlice.reducer;
 const initialState$8 = {
-  projectAccesses: {},
-  activeProjectAccessId: null
+  projectAccesses: {}
 };
 const projectAccessSlice = createSlice({
   name: "projectAccess",
@@ -2383,19 +2382,10 @@ const projectAccessSlice = createSlice({
           delete state.projectAccesses[projectAccess.offline_id];
         }
       }
-    },
-    setActiveProjectAccessId: (state, action) => {
-      state.activeProjectAccessId = action.payload;
     }
   }
 });
-const {
-  setProjectAccesses,
-  updateProjectAccess,
-  removeProjectAccess,
-  removeProjectAccessesOfProject,
-  setActiveProjectAccessId
-} = projectAccessSlice.actions;
+const { setProjectAccesses, updateProjectAccess, removeProjectAccess, removeProjectAccessesOfProject } = projectAccessSlice.actions;
 const selectProjectAccesses = (state) => {
   return state.projectAccessReducer.projectAccesses;
 };
@@ -2403,11 +2393,11 @@ const selectProjectAccess = (projectAccessId) => (state) => {
   return state.projectAccessReducer.projectAccesses[projectAccessId];
 };
 const selectActiveProjectAccess = (state) => {
-  const activeProjectAccessId = state.projectAccessReducer.activeProjectAccessId;
-  if (!activeProjectAccessId) {
-    return null;
-  }
-  return state.projectAccessReducer.projectAccesses[activeProjectAccessId] ?? null;
+  const currentUser = state.userReducer.currentUser;
+  const activeProjectId = state.projectReducer.activeProjectId;
+  return Object.values(state.projectAccessReducer.projectAccesses).find((projectAccess) => {
+    return projectAccess.user === currentUser.id && projectAccess.project === activeProjectId;
+  }) ?? null;
 };
 const selectProjectAccessForUser = (user) => (state) => {
   return Object.values(state.projectAccessReducer.projectAccesses).find(
@@ -3828,7 +3818,7 @@ class AuthService extends BaseApiService {
         return [responsePromise.then(parseTokens), uuid];
       } catch (e) {
         if (logoutOnFailure) {
-          this.logout();
+          void this.logout().then();
         }
         throw e;
       }
@@ -3903,16 +3893,16 @@ class AuthService extends BaseApiService {
   /**
    * Logs the user out
    */
-  logout() {
+  async logout() {
     const { store } = this.client;
     store.dispatch(setLoggedIn(false));
     store.dispatch(clearTokens());
     store.dispatch(setActiveProjectId(null));
-    store.dispatch(setActiveProjectAccessId(null));
     store.dispatch(setActiveOrganizationAccessId(null));
     store.dispatch(setActiveWorkspaceId(null));
     store.dispatch({ type: RESET_STATE });
     store.dispatch({ type: resetStore });
+    await localforage.clear();
     window.location.reload();
   }
   /**
@@ -3930,7 +3920,7 @@ class AuthService extends BaseApiService {
       store.dispatch(setTokens({ accessToken, refreshToken }));
     } catch (e) {
       console.error("Could not renew tokens; logging out.");
-      this.logout();
+      await this.logout();
       throw e;
     }
   }
@@ -4870,7 +4860,6 @@ class ProjectAccessService extends BaseApiService {
       throw new Error("Current user does not have a project access instance");
     }
     store.dispatch(setProjectAccesses(result));
-    store.dispatch(setActiveProjectAccessId(activeProjectAccess.offline_id));
   }
 }
 class ProjectFileService extends BaseApiService {
@@ -6063,7 +6052,6 @@ export {
   setActiveIssueId,
   setActiveOrganizationAccessId,
   setActiveOrganizationId,
-  setActiveProjectAccessId,
   setActiveProjectFileId,
   setActiveProjectId,
   setActiveWorkspaceId,