@overmap-ai/core 1.0.60-forms-removal.9 → 1.0.60-forms-refactor-1.1

package/dist/overmap-core.js

@@ -379,15 +379,15 @@ const wrapMigration = (migrator) => (state) => {
 };
 const migrations = [initialVersioning, signOut, signOut, createOutboxState];
 const manifest = Object.fromEntries(migrations.map((migration2, i) => [i, wrapMigration(migration2)]));
-const initialState$A = {
+const initialState$B = {
   accessToken: "",
   refreshToken: "",
   isLoggedIn: false
 };
 const authSlice = createSlice({
   name: "auth",
-  initialState: initialState$A,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$A)),
+  initialState: initialState$B,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$B)),
   reducers: {
     setTokens: (state, action) => {
       state.accessToken = action.payload.accessToken;
@@ -418,6 +418,9 @@ const literalToCoordinates = (literal) => {
 const flipCoordinates = (coordinates) => {
   return [coordinates[1], coordinates[0]];
 };
+const flipBounds = (bounds) => {
+  return [flipCoordinates(bounds[0]), flipCoordinates(bounds[1])];
+};
 function offsetPositionByMeters(originalPosition, latMeters, lngMeters) {
   const { lat, lng } = originalPosition;
   const earthRadius = 6378137;
@@ -854,72 +857,23 @@ function createModelAdapter(computeModelId) {
   };
 }
 const categoryAdapter = createModelAdapter((category) => category.offline_id);
-const initialState$z = categoryAdapter.getInitialState({
-  categoryVisibility: {
-    hiddenCategoryIds: [],
-    isNullCategoryHidden: false
-  }
-});
+const initialState$A = categoryAdapter.getInitialState({});
 const categorySlice = createSlice({
   name: "categories",
-  initialState: initialState$z,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$z)),
+  initialState: initialState$A,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$A)),
   reducers: {
-    initializeCategories: (state, action) => {
-      categoryAdapter.initialize(state, action);
-      state.categoryVisibility.hiddenCategoryIds = state.categoryVisibility.hiddenCategoryIds.filter(
-        (categoryId) => action.payload.some((category) => category.offline_id === categoryId)
-      );
-    },
+    initializeCategories: categoryAdapter.initialize,
     addCategory: categoryAdapter.addOne,
     updateCategory: categoryAdapter.updateOne,
-    deleteCategory: categoryAdapter.deleteOne,
-    // Pass in a null value to hide the "No category" category
-    hideCategory: (state, action) => {
-      const categoryId = action.payload;
-      if (categoryId === null) {
-        state.categoryVisibility.isNullCategoryHidden = true;
-      } else if (!(categoryId in state.categoryVisibility.hiddenCategoryIds)) {
-        state.categoryVisibility.hiddenCategoryIds.push(categoryId);
-      }
-    },
-    hideAllCategories: (state) => {
-      state.categoryVisibility.hiddenCategoryIds = Object.keys(state.instances);
-      state.categoryVisibility.isNullCategoryHidden = true;
-    },
-    // Pass in a null value to unhide the "No category" category
-    unhideCategory: (state, action) => {
-      const categoryId = action.payload;
-      if (categoryId === null) {
-        state.categoryVisibility.isNullCategoryHidden = false;
-      } else {
-        state.categoryVisibility.hiddenCategoryIds = state.categoryVisibility.hiddenCategoryIds.filter(
-          (id) => id !== categoryId
-        );
-      }
-    },
-    unhideAllCategories: (state) => {
-      state.categoryVisibility.hiddenCategoryIds = [];
-      state.categoryVisibility.isNullCategoryHidden = false;
-    }
+    deleteCategory: categoryAdapter.deleteOne
   }
 });
-const {
-  initializeCategories,
-  addCategory,
-  updateCategory,
-  deleteCategory,
-  hideCategory,
-  hideAllCategories,
-  unhideCategory,
-  unhideAllCategories
-} = categorySlice.actions;
+const { initializeCategories, addCategory, updateCategory, deleteCategory } = categorySlice.actions;
 const selectCategoryMapping = (state) => state.categoryReducer.instances;
-const _selectActiveWorkspaceId = (state) => state.workspaceReducer.activeWorkspaceId;
-const selectCategories = createSelector(
-  [selectCategoryMapping, _selectActiveWorkspaceId],
-  (mapping, activeWorkspaceId) => activeWorkspaceId ? Object.values(mapping).filter((category) => category.workspace === activeWorkspaceId) : []
-);
+const selectCategories = createSelector([selectCategoryMapping], (categoryMapping) => {
+  return Object.values(categoryMapping);
+});
 const selectCategoriesOfWorkspace = restructureCreateSelectorWithArgs(
   createSelector(
     [selectCategories, (_state, workspaceId) => workspaceId],
@@ -932,36 +886,23 @@ const selectCategoryById = restructureCreateSelectorWithArgs(
     (mapping, categoryId) => mapping[categoryId]
   )
 );
-const selectCategoryVisibility = (state) => state.categoryReducer.categoryVisibility;
-const selectHiddenCategoryCount = (state) => {
-  const { hiddenCategoryIds, isNullCategoryHidden } = state.categoryReducer.categoryVisibility;
-  let hiddenCategoryCount = hiddenCategoryIds.length;
-  if (isNullCategoryHidden)
-    hiddenCategoryCount++;
-  return hiddenCategoryCount;
-};
 const selectIssueCountOfCategory = (categoryId) => (state) => {
   return Object.values(state.issueReducer.instances).filter((issue) => issue.category === categoryId).length;
 };
 const categoryReducer = categorySlice.reducer;
 const assetTypeAdapter = createModelAdapter((assetType) => assetType.offline_id);
-const initialState$y = assetTypeAdapter.getInitialState({
-  hiddenAssetTypeIds: {}
-});
+const initialState$z = assetTypeAdapter.getInitialState({});
 const assetTypeSlice = createSlice({
   name: "assetTypes",
-  initialState: initialState$y,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$y)),
+  initialState: initialState$z,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$z)),
   reducers: {
     initializeAssetTypes: assetTypeAdapter.initialize,
     addAssetType: assetTypeAdapter.addOne,
-    deleteAssetType: assetTypeAdapter.deleteOne,
-    toggleAssetTypeVisibility: (state, action) => {
-      state.hiddenAssetTypeIds[action.payload] = !state.hiddenAssetTypeIds[action.payload];
-    }
+    deleteAssetType: assetTypeAdapter.deleteOne
   }
 });
-const { addAssetType, initializeAssetTypes, deleteAssetType, toggleAssetTypeVisibility } = assetTypeSlice.actions;
+const { addAssetType, initializeAssetTypes, deleteAssetType } = assetTypeSlice.actions;
 const selectAssetTypesMapping = (state) => state.assetTypeReducer.instances;
 const selectAssetTypes = createSelector(
   [selectAssetTypesMapping],
@@ -997,14 +938,13 @@ const selectAssetTypesByName = restructureCreateSelectorWithArgs(
     });
   })
 );
-const selectHiddenAssetTypeIds = (state) => state.assetTypeReducer.hiddenAssetTypeIds;
 const assetTypeReducer = assetTypeSlice.reducer;
 const assetAdapter = createModelAdapter((asset) => asset.offline_id);
-const initialState$x = assetAdapter.getInitialState({});
+const initialState$y = assetAdapter.getInitialState({});
 const assetSlice = createSlice({
   name: "assets",
-  initialState: initialState$x,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$x)),
+  initialState: initialState$y,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$y)),
   reducers: {
     initializeAssets: (state, action) => {
       assetAdapter.initialize(state, action);
@@ -1107,11 +1047,11 @@ const selectAssetTypesFromIds = (assetTypeIds) => (state) => {
 };
 const assetReducer = assetSlice.reducer;
 const assetAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
-const initialState$w = assetAttachmentAdapter.getInitialState({});
+const initialState$x = assetAttachmentAdapter.getInitialState({});
 const assetAttachmentSlice = createSlice({
   name: "assetAttachments",
-  initialState: initialState$w,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$w)),
+  initialState: initialState$x,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$x)),
   reducers: {
     initializeAssetAttachments: assetAttachmentAdapter.initialize,
     addAssetAttachment: assetAttachmentAdapter.addOne,
@@ -1169,13 +1109,13 @@ const selectAttachmentsOfAssetByType = restructureCreateSelectorWithArgs(
   )
 );
 const assetAttachmentReducer = assetAttachmentSlice.reducer;
-const initialState$v = {
+const initialState$w = {
   completionsByAssetId: {}
 };
 const assetStageCompletionSlice = createSlice({
   name: "assetStageCompletions",
-  initialState: initialState$v,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$v)),
+  initialState: initialState$w,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$w)),
   reducers: {
     addStageCompletion: (state, action) => {
       let stageToCompletionDateMapping = state.completionsByAssetId[action.payload.asset];
@@ -1227,11 +1167,11 @@ const selectCompletedStageIdsForAsset = restructureCreateSelectorWithArgs(
 );
 const assetStageCompletionReducer = assetStageCompletionSlice.reducer;
 const assetStageAdapter = createModelAdapter((assetStage) => assetStage.offline_id);
-const initialState$u = assetStageAdapter.getInitialState({});
+const initialState$v = assetStageAdapter.getInitialState({});
 const assetStageSlice = createSlice({
   name: "assetStages",
-  initialState: initialState$u,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$u)),
+  initialState: initialState$v,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$v)),
   reducers: {
     initializeStages: assetStageAdapter.initialize,
     setStage: assetStageAdapter.setOne,
@@ -1300,8 +1240,8 @@ const selectStageFormIdsFromStageIds = restructureCreateSelectorWithArgs(
       if (!stage) {
         throw new Error("No stage exists with the id " + stageId);
       }
-      if (stage.user_form) {
-        ret[stageId] = stage.user_form;
+      if (stage.form) {
+        ret[stageId] = stage.form;
       }
     }
     return ret;
@@ -1312,11 +1252,11 @@ const assetStageReducer = assetStageSlice.reducer;
 const assetTypeAttachmentAdapter = createModelAdapter(
   (attachment) => attachment.offline_id
 );
-const initialState$t = assetTypeAttachmentAdapter.getInitialState({});
+const initialState$u = assetTypeAttachmentAdapter.getInitialState({});
 const assetTypeAttachmentSlice = createSlice({
   name: "assetTypeAttachments",
-  initialState: initialState$t,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$t)),
+  initialState: initialState$u,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$u)),
   reducers: {
     initializeAssetTypeAttachments: assetTypeAttachmentAdapter.initialize,
     addAssetTypeAttachment: assetTypeAttachmentAdapter.addOne,
@@ -1375,31 +1315,19 @@ const selectAttachmentsOfAssetTypeByType = restructureCreateSelectorWithArgs(
 );
 const assetTypeAttachmentReducer = assetTypeAttachmentSlice.reducer;
 const workspaceAdapter = createModelAdapter((workspace) => workspace.offline_id);
-const initialState$s = workspaceAdapter.getInitialState({
-  activeWorkspaceId: null
-});
+const initialState$t = workspaceAdapter.getInitialState({});
 const workspaceSlice = createSlice({
   name: "workspace",
-  initialState: initialState$s,
+  initialState: initialState$t,
   reducers: {
     initializeWorkspaces: workspaceAdapter.initialize,
     setWorkspaces: workspaceAdapter.setMany,
     addWorkspace: workspaceAdapter.addOne,
     updateWorkspace: workspaceAdapter.updateOne,
-    deleteWorkspace: workspaceAdapter.deleteOne,
-    setActiveWorkspaceId: (state, action) => {
-      state.activeWorkspaceId = action.payload;
-    }
+    deleteWorkspace: workspaceAdapter.deleteOne
   }
 });
-const {
-  initializeWorkspaces,
-  setWorkspaces,
-  addWorkspace,
-  updateWorkspace,
-  setActiveWorkspaceId,
-  deleteWorkspace
-} = workspaceSlice.actions;
+const { initializeWorkspaces, setWorkspaces, addWorkspace, updateWorkspace, deleteWorkspace } = workspaceSlice.actions;
 const selectWorkspaceMapping = (state) => state.workspaceReducer.instances;
 const selectWorkspaces = createSelector([selectWorkspaceMapping], (mapping) => Object.values(mapping));
 const selectMainWorkspace = createSelector(
@@ -1408,20 +1336,9 @@ const selectMainWorkspace = createSelector(
     return workspaces.find((workspace) => workspace.name.toLowerCase() === "main");
   }
 );
-const selectWorkspace = restructureCreateSelectorWithArgs(
-  createSelector([selectWorkspaceMapping, (_state, workspaceId) => workspaceId], (mapping, workspaceId) => {
-    return mapping[workspaceId];
-  })
-);
-const selectActiveWorkspaceId = (state) => state.workspaceReducer.activeWorkspaceId;
-const selectActiveWorkspace = createSelector(
-  [selectWorkspaceMapping, selectActiveWorkspaceId],
-  (mapping, activeWorkspaceId) => {
-    if (!activeWorkspaceId)
-      return null;
-    return mapping[activeWorkspaceId];
-  }
-);
+const selectWorkspaceById = (workspaceId) => (state) => {
+  return state.workspaceReducer.instances[workspaceId];
+};
 const selectPermittedWorkspaceIds = createSelector(
   [selectWorkspaceMapping],
   (mapping) => {
@@ -1433,16 +1350,14 @@ const selectPermittedWorkspaceIds = createSelector(
 const workspaceReducer = workspaceSlice.reducer;
 const maxRecentIssues = 10;
 const issueAdapter = createModelAdapter((issue) => issue.offline_id);
-const initialState$r = issueAdapter.getInitialState({
-  visibleStatuses: [IssueStatus.BACKLOG, IssueStatus.SELECTED],
-  visibleUserIds: null,
+const initialState$s = issueAdapter.getInitialState({
   recentIssueIds: []
 });
 const issueSlice = createSlice({
   name: "issues",
-  initialState: initialState$r,
+  initialState: initialState$s,
   extraReducers: (builder) => builder.addCase("RESET", (state) => {
-    Object.assign(state, initialState$r);
+    Object.assign(state, initialState$s);
   }),
   reducers: {
     initializeIssues: issueAdapter.initialize,
@@ -1451,12 +1366,6 @@ const issueSlice = createSlice({
     updateIssue: issueAdapter.updateOne,
     deleteIssue: issueAdapter.deleteOne,
     deleteIssues: issueAdapter.deleteMany,
-    setVisibleStatuses: (state, action) => {
-      state.visibleStatuses = action.payload;
-    },
-    setVisibleUserIds: (state, action) => {
-      state.visibleUserIds = [...new Set(action.payload)];
-    },
     cleanRecentIssues: (state) => {
       state.recentIssueIds = state.recentIssueIds.filter((recentIssue) => state.instances[recentIssue.offlineId]);
     },
@@ -1489,8 +1398,6 @@ const {
   updateIssue,
   deleteIssue,
   deleteIssues,
-  setVisibleStatuses,
-  setVisibleUserIds,
   addToRecentIssues,
   cleanRecentIssues,
   removeRecentIssue,
@@ -1498,51 +1405,6 @@ const {
 } = issueSlice.actions;
 const selectIssueMapping = (state) => state.issueReducer.instances;
 const selectRecentIssueIds = (state) => state.issueReducer.recentIssueIds;
-const selectVisibleUserIds = (state) => state.issueReducer.visibleUserIds;
-const selectVisibleStatuses = (state) => state.issueReducer.visibleStatuses;
-const selectIssues = restructureCreateSelectorWithArgs(
-  createSelector(
-    [
-      selectIssueMapping,
-      selectVisibleUserIds,
-      selectVisibleStatuses,
-      selectCategoryVisibility,
-      selectActiveWorkspaceId,
-      (_state, args) => args
-    ],
-    (mapping, visibleUserIds, visibleStatuses, categoryVisibility, activeWorkspaceId, args) => {
-      let ret = Object.values(mapping);
-      const visibleUserIdsSet = new Set(visibleUserIds);
-      const visibleStatusesSet = new Set(visibleStatuses);
-      if (args.filterByAssignedTo && (visibleUserIds == null ? void 0 : visibleUserIds.length)) {
-        ret = ret.filter((issue) => {
-          return visibleUserIdsSet.has(issue.assigned_to || null);
-        });
-      }
-      if (args.filterByStatus) {
-        ret = ret.filter((issue) => {
-          return visibleStatusesSet.has(issue.status);
-        });
-      }
-      if (args.filterByCategory) {
-        const isNullCategoryHidden = categoryVisibility.isNullCategoryHidden;
-        const hiddenCategoryIds = categoryVisibility.hiddenCategoryIds;
-        ret = ret.filter((issue) => {
-          if (!issue.category) {
-            return !isNullCategoryHidden;
-          }
-          return !hiddenCategoryIds.includes(issue.category);
-        });
-        if (args.filterByWorkspace) {
-          ret = ret.filter((issue) => {
-            return activeWorkspaceId && issue.visible_in_workspaces.includes(activeWorkspaceId);
-          });
-        }
-      }
-      return ret;
-    }
-  )
-);
 const selectIssue = restructureCreateSelectorWithArgs(
   createSelector([selectIssueMapping, (_state, id) => id], (mapping, id) => {
     return mapping[id];
@@ -1639,12 +1501,12 @@ const selectRecentIssuesAsSearchResults = createSelector(
 );
 const issueReducer = issueSlice.reducer;
 const issueTypeAdapter = createModelAdapter((issueType) => issueType.offline_id);
-const initialState$q = issueTypeAdapter.getInitialState({});
+const initialState$r = issueTypeAdapter.getInitialState({});
 const issueTypeSlice = createSlice({
   name: "issueTypes",
-  initialState: initialState$q,
+  initialState: initialState$r,
   extraReducers: (builder) => builder.addCase("RESET", (state) => {
-    Object.assign(state, initialState$q);
+    Object.assign(state, initialState$r);
   }),
   reducers: {
     initializeIssueTypes: issueTypeAdapter.initialize,
@@ -1693,15 +1555,15 @@ const selectIssuesOfIssueTypeCount = (issueTypeId) => (state) => {
   return ((_a2 = selectIssuesOfIssueType(issueTypeId)(state)) == null ? void 0 : _a2.length) ?? 0;
 };
 const issueTypeReducer = issueTypeSlice.reducer;
-const initialState$p = {
+const initialState$q = {
   s3Urls: {}
 };
 const msPerHour = 1e3 * 60 * 60;
 const msPerWeek = msPerHour * 24 * 7;
 const fileSlice = createSlice({
   name: "file",
-  initialState: initialState$p,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$p)),
+  initialState: initialState$q,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$q)),
   reducers: {
     setUploadUrl: (state, action) => {
       const { url, fields, sha1 } = action.payload;
@@ -1782,7 +1644,7 @@ var LicenseStatus = /* @__PURE__ */ ((LicenseStatus2) => {
   LicenseStatus2[LicenseStatus2["PAST_DUE"] = 8] = "PAST_DUE";
   return LicenseStatus2;
 })(LicenseStatus || {});
-const initialState$o = {
+const initialState$p = {
   users: {},
   currentUser: {
     id: 0,
@@ -1793,8 +1655,8 @@ const initialState$o = {
 };
 const userSlice = createSlice({
   name: "users",
-  initialState: initialState$o,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$o)),
+  initialState: initialState$p,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$p)),
   reducers: {
     setUsers: (state, action) => {
       const usersMapping = {};
@@ -1859,11 +1721,11 @@ const userReducer = userSlice.reducer;
 const organizationAccessAdapter = createModelAdapter(
   (organizationAccess) => organizationAccess.offline_id
 );
-const initialState$n = organizationAccessAdapter.getInitialState({});
+const initialState$o = organizationAccessAdapter.getInitialState({});
 const organizationAccessSlice = createSlice({
   name: "organizationAccess",
-  initialState: initialState$n,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$n)),
+  initialState: initialState$o,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$o)),
   reducers: {
     initializeOrganizationAccesses: organizationAccessAdapter.initialize,
     updateOrganizationAccess: organizationAccessAdapter.updateOne,
@@ -1900,11 +1762,11 @@ const selectOrganizationAccessUserMapping = (state) => {
 };
 const organizationAccessReducer = organizationAccessSlice.reducer;
 const licenseAdapter = createModelAdapter((license) => license.offline_id);
-const initialState$m = licenseAdapter.getInitialState({});
+const initialState$n = licenseAdapter.getInitialState({});
 const licenseSlice = createSlice({
   name: "license",
-  initialState: initialState$m,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$m)),
+  initialState: initialState$n,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$n)),
   reducers: {
     setLicenses: licenseAdapter.initialize,
     addLicenses: licenseAdapter.addMany,
@@ -1930,11 +1792,11 @@ const selectLicensesForProjectsMapping = createSelector(
 );
 const licenseReducer = licenseSlice.reducer;
 const projectAccessAdapter = createModelAdapter((projectAccess) => projectAccess.offline_id);
-const initialState$l = projectAccessAdapter.getInitialState({});
+const initialState$m = projectAccessAdapter.getInitialState({});
 const projectAccessSlice = createSlice({
   name: "projectAccess",
-  initialState: initialState$l,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
+  initialState: initialState$m,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$m)),
   reducers: {
     setProjectAccesses: projectAccessAdapter.initialize,
     updateProjectAccess: projectAccessAdapter.updateOne,
@@ -1980,15 +1842,14 @@ const selectProjectAccessUserMapping = (state) => {
   return projectAccesses;
 };
 const projectAccessReducer = projectAccessSlice.reducer;
-const initialState$k = {
+const initialState$l = {
   projects: {},
-  activeProjectId: null,
-  recentProjectIds: [],
-  recentSearchableQueries: []
+  activeProjectId: null
 };
 const projectSlice = createSlice({
   name: "projects",
-  initialState: initialState$k,
+  initialState: initialState$l,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
   reducers: {
     setProjects: (state, action) => {
       const projectsMap = {};
@@ -2068,21 +1929,6 @@ const selectProject = restructureCreateSelectorWithArgs(
     (projects, projectId) => projects[projectId]
   )
 );
-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 projectReducer = projectSlice.reducer;
 const selectProjectUsersIds = createSelector(
   [selectProjectAccessMapping],
@@ -2117,38 +1963,22 @@ const selectSortedProjectUsers = createSelector(
     });
   }
 );
-const initialState$j = {
-  organizations: {},
-  activeOrganizationId: null
+const initialState$k = {
+  organizations: {}
 };
 const organizationSlice = createSlice({
   name: "organizations",
-  initialState: initialState$j,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$j)),
+  initialState: initialState$k,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
   reducers: {
     setOrganizations: (state, action) => {
       for (const org of action.payload) {
         state.organizations[org.id] = org;
       }
-    },
-    updateActiveOrganization: (state, action) => {
-      if (!state.activeOrganizationId) {
-        throw new Error("Cannot update name of active organization. Active organization ID does not exist");
-      }
-      if (state.activeOrganizationId !== action.payload.id) {
-        throw new Error("Tried updating active organization with different organization");
-      }
-      state.organizations[state.activeOrganizationId] = action.payload;
-    },
-    setActiveOrganizationId: (state, action) => {
-      state.activeOrganizationId = action.payload;
     }
   }
 });
-const { setOrganizations, setActiveOrganizationId, updateActiveOrganization } = organizationSlice.actions;
-const selectActiveOrganizationId = (state) => {
-  return state.organizationReducer.activeOrganizationId;
-};
+const { setOrganizations } = organizationSlice.actions;
 const selectOrganizations = (state) => {
   return Object.values(state.organizationReducer.organizations);
 };
@@ -2159,43 +1989,21 @@ const selectOrganizationsWithAccess = createSelector(
   [selectOrganizations],
   (organizations) => Object.values(organizations).filter((organization) => organization.has_access)
 );
-const selectActiveOrganization = (state) => {
-  const id = selectActiveOrganizationId(state);
-  if (!id) {
-    return null;
-  }
-  const organization = state.organizationReducer.organizations[id];
-  if (!organization) {
-    return null;
-  }
-  return organization;
+const selectOrganizationById = (organizationId) => (state) => {
+  return state.organizationReducer.organizations[organizationId];
 };
 const selectOrganizationUsersIds = createSelector(
   [selectOrganizationAccesses],
   (organizationAccesses) => Object.values(organizationAccesses).map((organizationAccess) => organizationAccess.user)
 );
-const selectActiveOrganizationProjects = createSelector(
-  [selectProjects, selectActiveOrganizationId],
-  (projects, activeOrganizationId) => activeOrganizationId ? Object.values(projects).filter((project) => project.owner_organization === activeOrganizationId) : []
-);
-const selectActiveOrganizationLicenses = createSelector(
-  [selectActiveOrganizationId, selectLicenses],
-  (activeOrganizationId, licenses) => !activeOrganizationId ? [] : Object.values(licenses).filter((license) => license.organization_owner === activeOrganizationId)
+const selectProjectsOfOrganization = restructureCreateSelectorWithArgs(
+  createSelector([selectProjects, (_, organizationId) => organizationId], (projects, organizationId) => {
+    return Object.values(projects).filter((project) => project.owner_organization === organizationId);
+  })
 );
-const selectSortedOrganizationLicenses = createSelector(
-  [selectActiveOrganizationLicenses, selectProjects],
-  (licences, projects) => licences.sort((licenseA, licenseB) => {
-    if (!licenseA.project) {
-      return 1;
-    }
-    if (!licenseB.project) {
-      return -1;
-    }
-    return projects[licenseA.project].name.toLowerCase().localeCompare(
-      projects[licenseB.project].name.toLowerCase(),
-      void 0,
-      { numeric: true }
-    );
+const selectLicensesOfOrganization = restructureCreateSelectorWithArgs(
+  createSelector([selectLicenses, (_, organizationId) => organizationId], (licenses, organizationId) => {
+    return Object.values(licenses).filter((license) => license.organization_owner === organizationId);
   })
 );
 const selectOrganizationUsersAsMapping = createSelector(
@@ -2244,14 +2052,14 @@ const createOfflineAction = (request2, baseUrl, serviceName) => {
     }
   };
 };
-const initialState$i = {
+const initialState$j = {
   deletedRequests: [],
   latestRetryTime: 0
 };
 const outboxSlice = createSlice({
   name: "outbox",
-  initialState: initialState$i,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$i)),
+  initialState: initialState$j,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$j)),
   reducers: {
     // enqueueActions is a reducer that does nothing but enqueue API request to the Redux Offline outbox
     // Whenever an issue is being created, a reducer addIssue() is responsible for adding it to the offline store
@@ -2283,16 +2091,15 @@ const selectDeletedRequests = (state) => state.outboxReducer.deletedRequests;
 const selectLatestRetryTime = (state) => state.outboxReducer.latestRetryTime;
 const { enqueueRequest, markForDeletion, markAsDeleted, _setLatestRetryTime } = outboxSlice.actions;
 const outboxReducer = outboxSlice.reducer;
-const initialState$h = {
+const initialState$i = {
   projectFiles: {},
   activeProjectFileId: null,
-  isImportingProjectFile: false,
-  enabledProjectFiles: {}
+  isImportingProjectFile: false
 };
 const projectFileSlice = createSlice({
   name: "projectFiles",
-  initialState: initialState$h,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$h)),
+  initialState: initialState$i,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$i)),
   reducers: {
     addOrReplaceProjectFiles: (state, action) => {
       for (let fileObj of action.payload) {
@@ -2317,9 +2124,6 @@ const projectFileSlice = createSlice({
       }
       state.projectFiles[action.payload.offline_id] = action.payload;
     },
-    setProjectFileVisible: (state, action) => {
-      state.enabledProjectFiles[action.payload.fileId] = action.payload.visible;
-    },
     setIsImportingProjectFile: (state, action) => {
       state.isImportingProjectFile = action.payload;
     },
@@ -2339,19 +2143,14 @@ const projectFileSlice = createSlice({
     // TODO: Move to MapContext. Should not be persisted.
     setActiveProjectFileId: (state, action) => {
       state.activeProjectFileId = action.payload;
-      if (action.payload) {
-        state.enabledProjectFiles[action.payload] = true;
-      }
     },
     removeProjectFile: (state, action) => {
       delete state.projectFiles[action.payload];
-      delete state.enabledProjectFiles[action.payload];
     },
     removeProjectFilesOfProject: (state, action) => {
       const filesToDelete = Object.values(state.projectFiles).filter((file) => file.project === action.payload);
       for (const file of filesToDelete) {
         delete state.projectFiles[file.offline_id];
-        delete state.enabledProjectFiles[file.offline_id];
       }
     },
     resetProjectFileObjectUrls: (state, ..._args) => {
@@ -2364,7 +2163,6 @@ const projectFileSlice = createSlice({
 const {
   addOrReplaceProjectFiles,
   addOrReplaceProjectFile,
-  setProjectFileVisible,
   setIsImportingProjectFile,
   setActiveProjectFileId,
   saveActiveProjectFileBounds,
@@ -2372,33 +2170,25 @@ const {
   removeProjectFilesOfProject,
   resetProjectFileObjectUrls
 } = projectFileSlice.actions;
-const selectEnabledProjectFiles = (state) => state.projectFileReducer.enabledProjectFiles;
-const selectProjectFileVisibility = createSelector(
-  [selectEnabledProjectFiles],
-  (enabledProjectFiles) => {
-    const ret = {};
-    for (const [fileId, enabled] of Object.entries(enabledProjectFiles)) {
-      ret[fileId] = enabled === true || enabled === void 0;
-    }
-    return ret;
-  }
-);
-const selectEnabledProjectFileMapping = (state) => state.projectFileReducer.projectFiles;
+const selectProjectFileMapping = (state) => state.projectFileReducer.projectFiles;
 const selectProjectFiles = createSelector(
-  [selectEnabledProjectFileMapping, selectActiveProjectId],
+  [selectProjectFileMapping, selectActiveProjectId],
   (mapping, activeProjectId) => {
     return Object.values(mapping).filter((file) => file.project === activeProjectId).sort((a, b) => a.z_index - b.z_index);
   }
 );
 const selectActiveProjectFileId = (state) => state.projectFileReducer.activeProjectFileId;
 const selectIsImportingProjectFile = (state) => state.projectFileReducer.isImportingProjectFile;
+const selectProjectFileById = (id) => (state) => {
+  return state.projectFileReducer.projectFiles[id];
+};
 const projectFileReducer = projectFileSlice.reducer;
 const projectAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
-const initialState$g = projectAttachmentAdapter.getInitialState({});
+const initialState$h = projectAttachmentAdapter.getInitialState({});
 const projectAttachmentSlice = createSlice({
   name: "projectAttachments",
-  initialState: initialState$g,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$g)),
+  initialState: initialState$h,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$h)),
   reducers: {
     initializeProjectAttachments: projectAttachmentAdapter.initialize,
     addProjectAttachment: projectAttachmentAdapter.addOne,
@@ -2456,12 +2246,12 @@ const selectAttachmentsOfProjectByType = restructureCreateSelectorWithArgs(
   )
 );
 const projectAttachmentReducer = projectAttachmentSlice.reducer;
-const initialState$f = {
+const initialState$g = {
   isRehydrated: false
 };
 const rehydratedSlice = createSlice({
   name: "rehydrated",
-  initialState: initialState$f,
+  initialState: initialState$g,
   // The `reducers` field lets us define reducers and generate associated actions
   reducers: {
     setRehydrated: (state, action) => {
@@ -2472,13 +2262,13 @@ const rehydratedSlice = createSlice({
 const { setRehydrated } = rehydratedSlice.actions;
 const selectRehydrated = (state) => state.rehydratedReducer.isRehydrated;
 const rehydratedReducer = rehydratedSlice.reducer;
-const initialState$e = {
+const initialState$f = {
   isFetchingInitialData: false
 };
 const settingSlice = createSlice({
   name: "settings",
-  initialState: initialState$e,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$e)),
+  initialState: initialState$f,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$f)),
   reducers: {
     setIsFetchingInitialData: (state, action) => {
       state.isFetchingInitialData = action.payload;
@@ -2502,11 +2292,11 @@ const formRevisionSortFn = (formRevisionA, formRevisionB) => {
   }
 };
 const formRevisionAdapter = createModelAdapter((revision) => revision.offline_id);
-const initialState$d = formRevisionAdapter.getInitialState({});
+const initialState$e = formRevisionAdapter.getInitialState({});
 const formRevisionsSlice = createSlice({
   name: "formRevisions",
-  initialState: initialState$d,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$d)),
+  initialState: initialState$e,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$e)),
   reducers: {
     initializeFormRevisions: formRevisionAdapter.initialize,
     setFormRevision: formRevisionAdapter.setOne,
@@ -2567,11 +2357,11 @@ const selectLatestFormRevisionsOfAssetTypes = restructureCreateSelectorWithArgs(
       selectFormRevisionMapping,
       (_state, assetTypeIds) => assetTypeIds
     ],
-    (userForms, revisions, assetTypeIds) => {
+    (formsMapping, revisions, assetTypeIds) => {
       const assetTypeIdsSet = new Set(assetTypeIds);
       const formsOfAssetTypes = {};
       const ret = {};
-      for (const form of Object.values(userForms)) {
+      for (const form of Object.values(formsMapping)) {
         if (form.asset_type && assetTypeIdsSet.has(form.asset_type)) {
           formsOfAssetTypes[form.offline_id] = form;
         }
@@ -2599,11 +2389,11 @@ const selectLatestFormRevisionByForm = createSelector([selectFormRevisionMapping
 });
 const formRevisionReducer = formRevisionsSlice.reducer;
 const formAdapter = createModelAdapter((form) => form.offline_id);
-const initialState$c = formAdapter.getInitialState({});
+const initialState$d = formAdapter.getInitialState({});
 const formSlice = createSlice({
   name: "forms",
-  initialState: initialState$c,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
+  initialState: initialState$d,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$d)),
   reducers: {
     setForms: formAdapter.initialize,
     setForm: formAdapter.setOne,
@@ -2624,22 +2414,22 @@ const selectFilteredForms = restructureCreateSelectorWithArgs(
       (state) => state.formRevisionReducer.instances,
       (_state, search) => search
     ],
-    (userForms, revisions, search) => {
+    (formsMapping, revisions, search) => {
       const { searchTerm, maxResults, favorites, organization } = search;
       const favoriteMatches = [];
       const regularMatches = [];
-      for (const [userFormId, userForm] of Object.entries(userForms)) {
-        if (favorites !== void 0 && userForm.favorite != favorites)
+      for (const [formId, form] of Object.entries(formsMapping)) {
+        if (favorites !== void 0 && form.favorite != favorites)
           continue;
-        if (Number.isInteger(organization) && organization !== userForm.organization) {
+        if (Number.isInteger(organization) && organization !== form.organization) {
           continue;
         }
-        const latestRevision = _selectLatestFormRevision(revisions, userFormId);
+        const latestRevision = _selectLatestFormRevision(revisions, formId);
         if (latestRevision.title.toLowerCase().includes(searchTerm.toLowerCase())) {
-          if (userForm.favorite) {
-            favoriteMatches.push({ ...userForm, latestRevision });
+          if (form.favorite) {
+            favoriteMatches.push({ ...form, latestRevision });
           } else {
-            regularMatches.push({ ...userForm, latestRevision });
+            regularMatches.push({ ...form, latestRevision });
           }
         }
         if (favoriteMatches.length >= maxResults) {
@@ -2653,43 +2443,41 @@ const selectFilteredForms = restructureCreateSelectorWithArgs(
     { memoizeOptions: { equalityCheck: shallowEqual } }
   )
 );
-const selectForm = restructureCreateSelectorWithArgs(
-  createSelector([selectFormsMapping, (_, formId) => formId], (userForms, formId) => {
-    return userForms[formId];
-  })
-);
+const selectForm = (formId) => (state) => {
+  return state.formReducer.instances[formId];
+};
 const selectFormMapping = (state) => {
   return state.formReducer.instances;
 };
 const selectFormOfAssetType = restructureCreateSelectorWithArgs(
   createSelector(
     [selectFormMapping, (_state, assetTypeId) => assetTypeId],
-    (userForms, assetTypeId) => {
-      return Object.values(userForms).find((userForm) => userForm.asset_type === assetTypeId);
+    (formsMapping, assetTypeId) => {
+      return Object.values(formsMapping).find((form) => form.asset_type === assetTypeId);
     }
   )
 );
 const selectFormOfIssueType = restructureCreateSelectorWithArgs(
   createSelector(
     [selectFormMapping, (_state, issueTypeId) => issueTypeId],
-    (userForms, issueTypeId) => {
-      return Object.values(userForms).find((userForm) => userForm.issue_type === issueTypeId);
+    (formsMapping, issueTypeId) => {
+      return Object.values(formsMapping).find((form) => form.issue_type === issueTypeId);
     }
   )
 );
-const selectFormsCount = createSelector([selectFormMapping], (userForms) => {
-  return Object.keys(userForms).length;
+const selectFormsCount = createSelector([selectFormMapping], (formsMapping) => {
+  return Object.keys(formsMapping).length;
 });
-const selectGeneralFormCount = createSelector([selectFormMapping], (userForms) => {
-  return Object.values(userForms).filter((form) => !form.asset_type).length;
+const selectGeneralFormCount = createSelector([selectFormMapping], (formsMapping) => {
+  return Object.values(formsMapping).filter((form) => !form.asset_type).length;
 });
 const formReducer = formSlice.reducer;
 const submissionAdapter = createModelAdapter((submission) => submission.offline_id);
-const initialState$b = submissionAdapter.getInitialState({});
+const initialState$c = submissionAdapter.getInitialState({});
 const formSubmissionSlice = createSlice({
   name: "formSubmissions",
-  initialState: initialState$b,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$b)),
+  initialState: initialState$c,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
   reducers: {
     setFormSubmission: submissionAdapter.setOne,
     setFormSubmissions: submissionAdapter.setMany,
@@ -2809,29 +2597,32 @@ const selectFormSubmissionsOfAsset = restructureCreateSelectorWithArgs(
     }
   )
 );
-const selectFormSubmissionsByAssets = createSelector([selectFormSubmissionsMapping, selectAssetsMapping], (submissions, assets) => {
-  var _a2;
-  const assetSubmissionMapping = {};
-  for (const assetId in assets) {
-    assetSubmissionMapping[assetId] = [];
-  }
-  for (const submissionId in submissions) {
-    const submission = submissions[submissionId];
-    if (submission.asset) {
-      (_a2 = assetSubmissionMapping[submission.asset]) == null ? void 0 : _a2.push(submission);
+const selectFormSubmissionsByAssets = createSelector(
+  [selectFormSubmissionsMapping, selectAssetsMapping],
+  (submissions, assets) => {
+    var _a2;
+    const assetSubmissionMapping = {};
+    for (const assetId in assets) {
+      assetSubmissionMapping[assetId] = [];
+    }
+    for (const submissionId in submissions) {
+      const submission = submissions[submissionId];
+      if (submission.asset) {
+        (_a2 = assetSubmissionMapping[submission.asset]) == null ? void 0 : _a2.push(submission);
+      }
     }
+    return assetSubmissionMapping;
   }
-  return assetSubmissionMapping;
-});
+);
 const formSubmissionReducer = formSubmissionSlice.reducer;
 const formSubmissionAttachmentAdapter = createModelAdapter(
   (attachment) => attachment.offline_id
 );
-const initialState$a = formSubmissionAttachmentAdapter.getInitialState({});
+const initialState$b = formSubmissionAttachmentAdapter.getInitialState({});
 const formSubmissionAttachmentSlice = createSlice({
   name: "formSubmissionAttachments",
-  initialState: initialState$a,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$a)),
+  initialState: initialState$b,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$b)),
   reducers: {
     initializeFormSubmissionAttachments: formSubmissionAttachmentAdapter.initialize,
     addFormSubmissionAttachment: formSubmissionAttachmentAdapter.addOne,
@@ -2870,11 +2661,11 @@ const formSubmissionAttachmentReducer = formSubmissionAttachmentSlice.reducer;
 const formRevisionAttachmentAdapter = createModelAdapter(
   (attachment) => attachment.offline_id
 );
-const initialState$9 = formRevisionAttachmentAdapter.getInitialState({});
+const initialState$a = formRevisionAttachmentAdapter.getInitialState({});
 const formRevisionAttachmentSlice = createSlice({
   name: "formRevisionAttachments",
-  initialState: initialState$9,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$9)),
+  initialState: initialState$a,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$a)),
   reducers: {
     initializeFormRevisionAttachments: formRevisionAttachmentAdapter.initialize,
     addFormRevisionAttachment: formRevisionAttachmentAdapter.addOne,
@@ -2898,12 +2689,12 @@ const {
   deleteFormRevisionAttachment,
   deleteFormRevisionAttachments
 } = formRevisionAttachmentSlice.actions;
-const selectUserFormRevisionAttachmentsMapping = (state) => {
+const selectFormRevisionAttachmentsMapping = (state) => {
   return state.formRevisionAttachmentReducer.instances;
 };
 const selectAttachmentsOfFormRevision = restructureCreateSelectorWithArgs(
   createSelector(
-    [selectUserFormRevisionAttachmentsMapping, (_state, revisionId) => revisionId],
+    [selectFormRevisionAttachmentsMapping, (_state, revisionId) => revisionId],
     (attachments, revisionId) => {
       return Object.values(attachments).filter((attachment) => attachment.revision === revisionId);
     }
@@ -2911,10 +2702,10 @@ const selectAttachmentsOfFormRevision = restructureCreateSelectorWithArgs(
 );
 const formRevisionAttachmentReducer = formRevisionAttachmentSlice.reducer;
 const emailDomainAdapter = createModelAdapter((emailDomain) => emailDomain.offline_id);
-const initialState$8 = emailDomainAdapter.getInitialState({});
+const initialState$9 = emailDomainAdapter.getInitialState({});
 const emailDomainsSlice = createSlice({
   name: "emailDomains",
-  initialState: initialState$8,
+  initialState: initialState$9,
   reducers: {
     initializeEmailDomains: emailDomainAdapter.initialize,
     addEmailDomain: emailDomainAdapter.addOne,
@@ -2933,14 +2724,14 @@ const selectEmailDomainsOfOrganization = restructureCreateSelectorWithArgs(
   )
 );
 const emailDomainsReducer = emailDomainsSlice.reducer;
-const initialState$7 = {
+const initialState$8 = {
   documents: {}
 };
 const documentSlice = createSlice({
   name: "documents",
-  initialState: initialState$7,
+  initialState: initialState$8,
   extraReducers: (builder) => builder.addCase("RESET", (state) => {
-    Object.assign(state, initialState$7);
+    Object.assign(state, initialState$8);
   }),
   reducers: {
     setDocuments: (state, action) => {
@@ -3115,11 +2906,11 @@ const selectRootDocuments = createSelector(
 );
 const documentsReducer = documentSlice.reducer;
 const documentAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
-const initialState$6 = documentAttachmentAdapter.getInitialState({});
+const initialState$7 = documentAttachmentAdapter.getInitialState({});
 const documentAttachmentSlice = createSlice({
   name: "documentAttachments",
-  initialState: initialState$6,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
+  initialState: initialState$7,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$7)),
   reducers: {
     initializeDocumentAttachments: documentAttachmentAdapter.initialize,
     addDocumentAttachment: documentAttachmentAdapter.addOne,
@@ -3178,11 +2969,11 @@ const selectAttachmentsOfDocumentByType = restructureCreateSelectorWithArgs(
 );
 const documentAttachmentReducer = documentAttachmentSlice.reducer;
 const teamAdapter = createModelAdapter((team) => team.offline_id);
-const initialState$5 = teamAdapter.getInitialState({});
+const initialState$6 = teamAdapter.getInitialState({});
 const teamSlice = createSlice({
   name: "teams",
-  initialState: initialState$5,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$5)),
+  initialState: initialState$6,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
   reducers: {
     setTeam: teamAdapter.setOne,
     setTeams: teamAdapter.initialize,
@@ -3216,11 +3007,11 @@ const teamReducer = teamSlice.reducer;
 const agentUserConversationAdapter = createModelAdapter(
   (conversation) => conversation.offline_id
 );
-const initialState$4 = agentUserConversationAdapter.getInitialState({});
+const initialState$5 = agentUserConversationAdapter.getInitialState({});
 const agentsSlice = createSlice({
   name: "agents",
-  initialState: initialState$4,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$4)),
+  initialState: initialState$5,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$5)),
   reducers: {
     initializeConversations: agentUserConversationAdapter.initialize,
     addConversation: agentUserConversationAdapter.addOne,
@@ -3242,11 +3033,11 @@ const selectConversation = restructureCreateSelectorWithArgs(
 );
 const agentsReducer = agentsSlice.reducer;
 const issueCommentAdapter = createModelAdapter((comment) => comment.offline_id);
-const initialState$3 = issueCommentAdapter.getInitialState({});
+const initialState$4 = issueCommentAdapter.getInitialState({});
 const issueCommentSlice = createSlice({
   name: "issueComments",
-  initialState: initialState$3,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$3)),
+  initialState: initialState$4,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$4)),
   reducers: {
     addIssueComment: issueCommentAdapter.addOne,
     addIssueComments: issueCommentAdapter.addMany,
@@ -3275,11 +3066,11 @@ const selectCommentsOfIssue = restructureCreateSelectorWithArgs(
 );
 const issueCommentReducer = issueCommentSlice.reducer;
 const issueUpdateAdapter = createModelAdapter((issueUpdate) => issueUpdate.offline_id);
-const initialState$2 = issueUpdateAdapter.getInitialState({});
+const initialState$3 = issueUpdateAdapter.getInitialState({});
 const issueUpdateSlice = createSlice({
   name: "issueUpdates",
-  initialState: initialState$2,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$2)),
+  initialState: initialState$3,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$3)),
   reducers: {
     initializeIssueUpdates: issueUpdateAdapter.setMany,
     setIssueUpdate: issueUpdateAdapter.setOne,
@@ -3308,11 +3099,11 @@ const selectIssueUpdatesOfIssue = restructureCreateSelectorWithArgs(
 );
 const issueUpdateReducer = issueUpdateSlice.reducer;
 const issueAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
-const initialState$1 = issueAttachmentAdapter.getInitialState({});
+const initialState$2 = issueAttachmentAdapter.getInitialState({});
 const issueAttachmentSlice = createSlice({
   name: "issueAttachments",
-  initialState: initialState$1,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$1)),
+  initialState: initialState$2,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$2)),
   reducers: {
     initializeIssueAttachments: issueAttachmentAdapter.initialize,
     addIssueAttachment: issueAttachmentAdapter.addOne,
@@ -3370,15 +3161,59 @@ const selectAttachmentsOfIssueByType = restructureCreateSelectorWithArgs(
   )
 );
 const issueAttachmentReducer = issueAttachmentSlice.reducer;
-const initialState = {
+const initialState$1 = {
   version: 0
 };
 const versioningSlice = createSlice({
   name: "versioning",
-  initialState,
+  initialState: initialState$1,
   reducers: {}
 });
 const versioningReducer = versioningSlice.reducer;
+const geoImageAdapter = createModelAdapter((model) => model.offline_id);
+const initialState = geoImageAdapter.getInitialState({});
+const geoImageSlice = createSlice({
+  name: "geoImages",
+  initialState,
+  extraReducers: (builder) => {
+    builder.addCase("RESET", (state) => {
+      Object.assign(state, initialState);
+    });
+  },
+  reducers: {
+    initializeGeoImages: geoImageAdapter.initialize,
+    setGeoImage: geoImageAdapter.setOne,
+    setGeoImages: geoImageAdapter.setMany,
+    addGeoImage: geoImageAdapter.addOne,
+    addGeoImages: geoImageAdapter.addMany,
+    updateGeoImage: geoImageAdapter.updateOne,
+    updateGeoImages: geoImageAdapter.updateMany,
+    deleteGeoImage: geoImageAdapter.deleteOne,
+    deleteGeoImages: geoImageAdapter.deleteMany
+  }
+});
+const {
+  initializeGeoImages,
+  setGeoImage,
+  setGeoImages,
+  addGeoImage,
+  addGeoImages,
+  updateGeoImage,
+  updateGeoImages,
+  deleteGeoImage,
+  deleteGeoImages
+} = geoImageSlice.actions;
+const selectGeoImageMapping = (state) => state.geoImageReducer.instances;
+const selectGeoImages = (state) => Object.values(state.geoImageReducer.instances);
+const selectGeoImageById = (id) => (state) => {
+  return state.geoImageReducer.instances[id];
+};
+const selectGeoImagesOfProject = restructureCreateSelectorWithArgs(
+  createSelector([selectGeoImages, (_, projectId) => projectId], (mapImages, projectId) => {
+    return mapImages.filter((mapImage) => mapImage.project === projectId);
+  })
+);
+const geoImageReducer = geoImageSlice.reducer;
 const fullAssetMarkerSize = 45;
 const DEFAULT_ISSUE_STATUS = IssueStatus.BACKLOG;
 const DEFAULT_ISSUE_PRIORITY = IssuePriority.MEDIUM;
@@ -3450,7 +3285,8 @@ const overmapReducers = {
   teamReducer,
   agentsReducer,
   issueCommentReducer,
-  issueUpdateReducer
+  issueUpdateReducer,
+  geoImageReducer
 };
 const overmapReducer = combineReducers(overmapReducers);
 const resetStore = "RESET";
@@ -4006,8 +3842,6 @@ class JWTService extends BaseAuthService {
     console.debug(this.constructor.name, "clearing auth;");
     this.dispatch(setLoggedIn(false));
     this.clearTokens();
-    this.dispatch(setActiveProjectId(null));
-    this.dispatch(setActiveWorkspaceId(null));
     this.dispatch({ type: RESET_STATE });
     this.dispatch({ type: resetStore });
   }
@@ -4504,13 +4338,13 @@ class AssetStageService extends BaseApiService {
     if (!stage) {
       throw new Error(`No asset stage with id ${stageId} found in the store`);
     }
-    this.dispatch(updateStage({ ...stage, user_form: formId }));
+    this.dispatch(updateStage({ ...stage, form: formId }));
     try {
       await this.enqueueRequest({
         description: "Link asset stage to form",
         method: HttpMethod.POST,
         url: `/assets/stages/${stageId}/associate-with-form/`,
-        payload: { user_form: formId },
+        payload: { form: formId },
         blockers: [stageId, formId],
         blocks: [stageId]
       });
@@ -4525,7 +4359,7 @@ class AssetStageService extends BaseApiService {
     if (!stage) {
       throw new Error(`No asset stage with id ${stageId} found in the store`);
     }
-    this.dispatch(updateStage({ ...stage, user_form: void 0 }));
+    this.dispatch(updateStage({ ...stage, form: void 0 }));
     try {
       await this.enqueueRequest({
         description: "Unlink asset stage from form",
@@ -4550,39 +4384,7 @@ class AssetStageService extends BaseApiService {
     this.dispatch(initializeStages(result));
   }
 }
-const AttachmentModelMeta = {
-  [AttachmentModel.Issue]: {
-    name: "issue",
-    attachUrlPrefix: "/issues",
-    deleteUrlPrefix: "/issues",
-    fetchUrlPostfix: "/issue-attachments"
-  },
-  [AttachmentModel.Asset]: {
-    name: "asset",
-    attachUrlPrefix: "/assets",
-    deleteUrlPrefix: "/assets",
-    fetchUrlPostfix: "/asset-attachments"
-  },
-  [AttachmentModel.AssetType]: {
-    name: "asset type",
-    attachUrlPrefix: "/assets/types",
-    deleteUrlPrefix: "/assets/types",
-    fetchUrlPostfix: "/asset-type-attachments"
-  },
-  [AttachmentModel.Project]: {
-    name: "project",
-    attachUrlPrefix: "/projects",
-    deleteUrlPrefix: "/projects",
-    fetchUrlPostfix: "/attachments"
-  },
-  [AttachmentModel.Document]: {
-    name: "document",
-    attachUrlPrefix: "/documents",
-    deleteUrlPrefix: "/documents",
-    fetchUrlPostfix: "/document-attachments"
-  }
-};
-class BaseAttachmentService extends BaseApiService {
+class BaseUploadService extends BaseApiService {
   getNumberOfAttachmentsWithSha1(sha1) {
     const {
       issueAttachmentReducer: issueAttachmentReducer2,
@@ -4590,8 +4392,9 @@ class BaseAttachmentService extends BaseApiService {
       assetTypeAttachmentReducer: assetTypeAttachmentReducer2,
       documentAttachmentReducer: documentAttachmentReducer2,
       projectAttachmentReducer: projectAttachmentReducer2,
+      formRevisionAttachmentReducer: formRevisionAttachmentReducer2,
       formSubmissionAttachmentReducer: formSubmissionAttachmentReducer2,
-      formRevisionAttachmentReducer: formRevisionAttachmentReducer2
+      geoImageReducer: geoImageReducer2
     } = this.client.store.getState();
     const objectsWithSha1 = [].concat(
       Object.values(issueAttachmentReducer2.instances),
@@ -4600,7 +4403,8 @@ class BaseAttachmentService extends BaseApiService {
       Object.values(documentAttachmentReducer2.instances),
       Object.values(projectAttachmentReducer2.instances),
       Object.values(formRevisionAttachmentReducer2.instances),
-      Object.values(formSubmissionAttachmentReducer2.instances)
+      Object.values(formSubmissionAttachmentReducer2.instances),
+      Object.values(geoImageReducer2.instances)
     );
     return objectsWithSha1.filter((object) => object.file_sha1 === sha1).length;
   }
@@ -4620,6 +4424,40 @@ class BaseAttachmentService extends BaseApiService {
       });
     }
   }
+}
+const AttachmentModelMeta = {
+  [AttachmentModel.Issue]: {
+    name: "issue",
+    attachUrlPrefix: "/issues",
+    deleteUrlPrefix: "/issues",
+    fetchUrlPostfix: "/issue-attachments"
+  },
+  [AttachmentModel.Asset]: {
+    name: "asset",
+    attachUrlPrefix: "/assets",
+    deleteUrlPrefix: "/assets",
+    fetchUrlPostfix: "/asset-attachments"
+  },
+  [AttachmentModel.AssetType]: {
+    name: "asset type",
+    attachUrlPrefix: "/assets/types",
+    deleteUrlPrefix: "/assets/types",
+    fetchUrlPostfix: "/asset-type-attachments"
+  },
+  [AttachmentModel.Project]: {
+    name: "project",
+    attachUrlPrefix: "/projects",
+    deleteUrlPrefix: "/projects",
+    fetchUrlPostfix: "/attachments"
+  },
+  [AttachmentModel.Document]: {
+    name: "document",
+    attachUrlPrefix: "/documents",
+    deleteUrlPrefix: "/documents",
+    fetchUrlPostfix: "/document-attachments"
+  }
+};
+class BaseAttachmentService extends BaseUploadService {
   async attachFiles(files, modelId, buildOfflineAttachment) {
     const { store } = this.client;
     const currentUser = store.getState().userReducer.currentUser;
@@ -4975,11 +4813,10 @@ class IssueService extends BaseApiService {
   // Basic CRUD functions
   // TODO: Once all models are represented in `Created<TModel>`, use `Created` in `OptimisticModelResult`, so we don't
   //  have to repeat it for all optimistic model results (all optimistic results are created).
-  add(issue, issueType = null) {
+  add(issue, workspaceId, issueType = null) {
     const { store } = this.client;
     const dateWithoutMilliseconds = /* @__PURE__ */ new Date();
     const state = store.getState();
-    const workspaceId = state.workspaceReducer.activeWorkspaceId;
     const currentUserId = state.userReducer.currentUser.id;
     dateWithoutMilliseconds.setMilliseconds(0);
     if (!workspaceId) {
@@ -5490,10 +5327,6 @@ class ProjectService extends BaseApiService {
     if (!project) {
       throw new Error("Expected project to exist");
     }
-    const activeProjectId = state.projectReducer.activeProjectId;
-    if (activeProjectId === projectId) {
-      this.dispatch({ type: "project/setActiveProjectId", payload: null });
-    }
     const filesToDelete = selectProjectFiles(state).filter((file) => file.project === projectId);
     this.dispatch(removeProjectFilesOfProject(project.id));
     const attachmentsOfProject = selectAttachmentsOfProject(project.id)(state);
@@ -5520,7 +5353,6 @@ class ProjectService extends BaseApiService {
       this.dispatch(setProjectAccesses(Object.values(projectAccesses)));
       this.dispatch(addOrReplaceProjectFiles(filesToDelete));
       this.dispatch(setProjectAttachments(attachmentsOfProject));
-      this.dispatch(setActiveProjectId(activeProjectId));
       this.dispatch({ type: "rehydrated/setRehydrated", payload: true });
       if (license) {
         this.dispatch(updateLicense({ ...license, project: project.id }));
@@ -5591,7 +5423,7 @@ const separateImageFromFields = async (fields) => {
   }
   return { fields: newFields, images };
 };
-class UserFormService extends BaseApiService {
+class FormService extends BaseApiService {
   constructor() {
     super(...arguments);
     // Attach images to revision, after uploading them to S3
@@ -5797,17 +5629,17 @@ class UserFormService extends BaseApiService {
   async delete(formId) {
     const { store } = this.client;
     const state = store.getState();
-    const userForm = selectForm(formId)(state);
-    if (!userForm) {
-      throw new Error("Expected userForm to exist");
+    const form = selectForm(formId)(state);
+    if (!form) {
+      throw new Error("Expected form to exist");
     }
-    const userFormSubmissions = selectFormSubmissionsOfForm(formId)(state);
-    if (userFormSubmissions && userFormSubmissions.length > 0) {
-      this.dispatch(deleteFormSubmissions(userFormSubmissions.map(({ offline_id }) => offline_id)));
+    const formSubmissions = selectFormSubmissionsOfForm(formId)(state);
+    if (formSubmissions && formSubmissions.length > 0) {
+      this.dispatch(deleteFormSubmissions(formSubmissions.map(({ offline_id }) => offline_id)));
     }
-    const userFormRevisions = selectFormRevisionsOfForm(formId)(state);
-    if (userFormRevisions && userFormRevisions.length > 0) {
-      this.dispatch(deleteFormRevisions(userFormRevisions.map(({ offline_id }) => offline_id)));
+    const formRevisions = selectFormRevisionsOfForm(formId)(state);
+    if (formRevisions && formRevisions.length > 0) {
+      this.dispatch(deleteFormRevisions(formRevisions.map(({ offline_id }) => offline_id)));
     }
     this.dispatch(deleteForm(formId));
     try {
@@ -5819,12 +5651,12 @@ class UserFormService extends BaseApiService {
         blocks: []
       });
     } catch (e) {
-      this.dispatch(addForm(userForm));
-      if (userFormRevisions && userFormRevisions.length > 0) {
-        this.dispatch(addFormRevisions(userFormRevisions));
+      this.dispatch(addForm(form));
+      if (formRevisions && formRevisions.length > 0) {
+        this.dispatch(addFormRevisions(formRevisions));
       }
-      if (userFormSubmissions && userFormSubmissions.length > 0) {
-        this.dispatch(addFormSubmissions(userFormSubmissions));
+      if (formSubmissions && formSubmissions.length > 0) {
+        this.dispatch(addFormSubmissions(formSubmissions));
       }
       throw e;
     }
@@ -5910,7 +5742,7 @@ const separateFilesFromValues = (values) => {
   }
   return { values: newValues, files };
 };
-class UserFormSubmissionService extends BaseApiService {
+class FormSubmissionService extends BaseUploadService {
   constructor() {
     super(...arguments);
     // Attach files to submission, after uploading them to S3
@@ -5991,7 +5823,6 @@ class UserFormSubmissionService extends BaseApiService {
   // TODO: adapt the support bulk adding to any model type
   async bulkAdd(args, batchSize) {
     const { formRevision, commonFieldValues, fieldValuesByAsset } = args;
-    const allFilesRecord = {};
     const { values: fileSeperatedCommonFieldValues, files: commonFiles } = separateFilesFromValues(commonFieldValues);
     const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
     const transactionId = v4();
@@ -6033,7 +5864,6 @@ class UserFormSubmissionService extends BaseApiService {
             file_type: file.type,
             size: file.size
           };
-          allFilesRecord[sha1] = filePayload;
           filePaylods.push(filePayload);
         }
         return {
@@ -6069,22 +5899,7 @@ class UserFormSubmissionService extends BaseApiService {
         blocks
       });
       void promise.then(({ presigned_urls }) => {
-        for (const [sha1, presignedUrl] of Object.entries(presigned_urls)) {
-          const file = allFilesRecord[sha1];
-          if (!file)
-            continue;
-          void this.enqueueRequest({
-            url: presignedUrl.url,
-            description: "Upload file",
-            method: HttpMethod.POST,
-            isExternalUrl: true,
-            isAuthNeeded: false,
-            attachmentHash: sha1,
-            blockers: [`s3-${file.sha1}.${file.extension}`],
-            blocks: [sha1],
-            s3url: presignedUrl
-          });
-        }
+        this.processPresignedUrls(presigned_urls);
       });
       prevBatchId = batchId;
       batchPromises.push(promise);
@@ -6555,7 +6370,7 @@ class OrganizationService extends BaseApiService {
     });
   }
   async update(organization) {
-    const promise = this.enqueueRequest({
+    return this.enqueueRequest({
       description: "Edit organization",
       method: HttpMethod.PATCH,
       url: `/organizations/${organization.id}/`,
@@ -6563,10 +6378,6 @@ class OrganizationService extends BaseApiService {
       blockers: [`add-org-${organization.name}`, organization.id.toString()],
       blocks: [organization.id.toString()]
     });
-    return promise.then((result) => {
-      this.dispatch(updateActiveOrganization(organization));
-      return result;
-    });
   }
   async invite(organizationId, email) {
     return this.enqueueRequest({
@@ -7144,6 +6955,179 @@ class UserService extends BaseApiService {
     this.dispatch(setUsers(Object.values(usersRecord)));
   }
 }
+class GeoImageService extends BaseUploadService {
+  async add(payload) {
+    const { store } = this.client;
+    const { file, ...payloadWithoutFile } = payload;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const currentUser = store.getState().userReducer.currentUser;
+    const projectId = payloadWithoutFile.project;
+    const sha1 = await hashFile(file);
+    const filePayload = {
+      sha1,
+      file_type: file.type,
+      extension: file.name.split(".").pop(),
+      size: file.size
+    };
+    const offlineMapImage = offline({
+      ...payloadWithoutFile,
+      file_name: file.name,
+      file_sha1: sha1,
+      file: URL.createObjectURL(file),
+      submitted_at: submittedAt,
+      created_by: currentUser.id
+    });
+    store.dispatch(addGeoImage(offlineMapImage));
+    const promise = this.enqueueRequest({
+      description: "Add geo image",
+      method: HttpMethod.POST,
+      url: "/geo-images/",
+      payload: {
+        offline_id: offlineMapImage.offline_id,
+        submitted_at: submittedAt,
+        title: offlineMapImage.title,
+        description: offlineMapImage.description,
+        geo_marker: offlineMapImage.geo_marker,
+        canvas_marker: offlineMapImage.canvas_marker,
+        sha1: offlineMapImage.file_sha1,
+        project: offlineMapImage.project,
+        file_name: offlineMapImage.file_name,
+        direction: offlineMapImage.direction,
+        original_date: offlineMapImage.original_date,
+        file: filePayload
+      },
+      blocks: [projectId.toString()],
+      blockers: [projectId.toString()]
+    });
+    promise.then((result) => {
+      this.processPresignedUrls(result.presigned_urls);
+      store.dispatch(setGeoImage(result.geo_image));
+    }).catch(() => {
+      store.dispatch(deleteGeoImage(offlineMapImage.offline_id));
+    });
+    return [offlineMapImage, promise.then((result) => result.geo_image)];
+  }
+  async bulkAdd(payloads, projectId) {
+    const { store } = this.client;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const currentUser = store.getState().userReducer.currentUser;
+    const offlineGeoImages = [];
+    const offlineIds = [];
+    const geoImagePayloads = [];
+    const filePayloadRecord = {};
+    for (const payloadAndFile of payloads) {
+      const { file, ...payload } = payloadAndFile;
+      const sha1 = await hashFile(file);
+      if (!(sha1 in filePayloadRecord)) {
+        filePayloadRecord[sha1] = {
+          sha1,
+          file_type: file.type,
+          extension: file.name.split(".").pop(),
+          size: file.size
+        };
+        await this.client.files.addCache(file, sha1);
+      }
+      const offlineMapImage = offline({
+        ...payload,
+        file_name: file.name,
+        file_sha1: sha1,
+        file: URL.createObjectURL(file),
+        submitted_at: submittedAt,
+        created_by: currentUser.id,
+        project: projectId
+      });
+      offlineGeoImages.push(offlineMapImage);
+      offlineIds.push(offlineMapImage.offline_id);
+      geoImagePayloads.push({
+        offline_id: offlineMapImage.offline_id,
+        sha1: offlineMapImage.file_sha1,
+        file_name: offlineMapImage.file_name,
+        title: offlineMapImage.title,
+        description: offlineMapImage.description,
+        geo_marker: offlineMapImage.geo_marker,
+        canvas_marker: offlineMapImage.canvas_marker,
+        direction: offlineMapImage.direction,
+        original_date: offlineMapImage.original_date
+      });
+    }
+    store.dispatch(addGeoImages(offlineGeoImages));
+    const promise = this.enqueueRequest({
+      description: "Bulk add geo images",
+      method: HttpMethod.POST,
+      url: "/geo-images/bulk/",
+      payload: {
+        submitted_at: submittedAt,
+        project: projectId,
+        geo_images: geoImagePayloads,
+        files: Object.values(filePayloadRecord)
+      },
+      blocks: [projectId.toString()],
+      blockers: offlineIds
+    });
+    promise.then((result) => {
+      this.processPresignedUrls(result.presigned_urls);
+      store.dispatch(setGeoImages(result.geo_images));
+    }).catch(() => {
+      store.dispatch(deleteGeoImages(offlineIds));
+    });
+    return [offlineGeoImages, promise.then((result) => result.geo_images)];
+  }
+  update(payload) {
+    const { store } = this.client;
+    const state = store.getState();
+    const geoImageToUpdate = selectGeoImageById(payload.offline_id)(state);
+    if (!geoImageToUpdate) {
+      throw new Error(`Map image with offline_id ${payload.offline_id} does not exist in the store`);
+    }
+    const updatedGeoImage = { ...geoImageToUpdate, ...payload };
+    store.dispatch(updateGeoImage(updatedGeoImage));
+    const promise = this.enqueueRequest({
+      description: "Update geo image",
+      method: HttpMethod.PATCH,
+      url: `/geo-images/${payload.offline_id}/`,
+      payload,
+      blocks: [payload.offline_id],
+      blockers: [payload.offline_id]
+    });
+    promise.then((result) => {
+      store.dispatch(setGeoImage(result));
+    }).catch(() => {
+      store.dispatch(setGeoImage(geoImageToUpdate));
+    });
+    return [updatedGeoImage, promise];
+  }
+  async delete(geoImageId) {
+    const { store } = this.client;
+    const state = store.getState();
+    const geoImageToDelete = selectGeoImageById(geoImageId)(state);
+    if (!geoImageToDelete) {
+      throw new Error(`Map image with offline_id ${geoImageId} does not exist in the store`);
+    }
+    store.dispatch(deleteGeoImage(geoImageId));
+    const promise = this.enqueueRequest({
+      description: "Delete geo image",
+      method: HttpMethod.DELETE,
+      url: `/geo-images/${geoImageId}/`,
+      blocks: [geoImageId],
+      blockers: [geoImageId]
+    });
+    promise.catch(() => {
+      store.dispatch(setGeoImage(geoImageToDelete));
+    });
+    return promise;
+  }
+  async refreshStore(projectId) {
+    const { store } = this.client;
+    const result = await this.enqueueRequest({
+      description: "Get geo images",
+      method: HttpMethod.GET,
+      url: `/projects/${projectId}/geo-images/`,
+      blocks: [projectId.toString()],
+      blockers: []
+    });
+    store.dispatch(initializeGeoImages(result));
+  }
+}
 export {
   APIError,
   AgentService,
@@ -7167,7 +7151,10 @@ export {
   EmailDomainsService,
   EmailVerificationService,
   FileService,
+  FormService,
+  FormSubmissionService,
   GREEN,
+  GeoImageService,
   HttpMethod,
   IssueAttachmentService,
   IssueCommentService,
@@ -7193,8 +7180,6 @@ export {
   ProjectFileService,
   ProjectService,
   TeamService,
-  UserFormService,
-  UserFormSubmissionService,
   UserService,
   VERSION_REDUCER_KEY,
   VerificationCodeType,
@@ -7229,6 +7214,8 @@ export {
   addFormSubmissionAttachments,
   addFormSubmissions,
   addForms,
+  addGeoImage,
+  addGeoImages,
   addIssue,
   addIssueAttachment,
   addIssueAttachments,
@@ -7304,6 +7291,8 @@ export {
   deleteFormSubmissionAttachment,
   deleteFormSubmissionAttachments,
   deleteFormSubmissions,
+  deleteGeoImage,
+  deleteGeoImages,
   deleteIssue,
   deleteIssueAttachment,
   deleteIssueAttachments,
@@ -7337,6 +7326,7 @@ export {
   fileReducer,
   fileSlice,
   fileToBlob,
+  flipBounds,
   flipCoordinates,
   formReducer,
   formRevisionAttachmentReducer,
@@ -7351,6 +7341,8 @@ export {
   fullAssetMarkerSize,
   generateBadgeColors,
   genericMemo,
+  geoImageReducer,
+  geoImageSlice,
   getFileIdentifier,
   getFileS3Key,
   getLocalDateString,
@@ -7359,8 +7351,6 @@ export {
   getRenamedFile,
   getStageColor,
   hashFile,
-  hideAllCategories,
-  hideCategory,
   initSDK,
   initializeAssetAttachments,
   initializeAssetTypeAttachments,
@@ -7373,6 +7363,7 @@ export {
   initializeFormRevisionAttachments,
   initializeFormRevisions,
   initializeFormSubmissionAttachments,
+  initializeGeoImages,
   initializeIssueAttachments,
   initializeIssueTypes,
   initializeIssueUpdates,
@@ -7445,18 +7436,12 @@ export {
   searchIssues,
   selectAccessToken,
   selectActiveLicense,
-  selectActiveOrganization,
   selectActiveOrganizationAccess,
-  selectActiveOrganizationId,
-  selectActiveOrganizationLicenses,
-  selectActiveOrganizationProjects,
   selectActiveProject,
   selectActiveProjectAccess,
   selectActiveProjectFileId,
   selectActiveProjectId,
   selectActiveStatusLicenses,
-  selectActiveWorkspace,
-  selectActiveWorkspaceId,
   selectAllDocumentAttachments,
   selectAllProjectAttachments,
   selectAncestorIdsOfDocument,
@@ -7493,7 +7478,6 @@ export {
   selectCategoriesOfWorkspace,
   selectCategoryById,
   selectCategoryMapping,
-  selectCategoryVisibility,
   selectCommentsOfIssue,
   selectCompletedStageIdsForAsset,
   selectCompletedStages,
@@ -7510,8 +7494,6 @@ export {
   selectEmailDomains,
   selectEmailDomainsAsMapping,
   selectEmailDomainsOfOrganization,
-  selectEnabledProjectFileMapping,
-  selectEnabledProjectFiles,
   selectFavouriteProjects,
   selectFilteredForms,
   selectForm,
@@ -7519,6 +7501,7 @@ export {
   selectFormOfAssetType,
   selectFormOfIssueType,
   selectFormRevision,
+  selectFormRevisionAttachmentsMapping,
   selectFormRevisionMapping,
   selectFormRevisions,
   selectFormRevisionsOfForm,
@@ -7535,8 +7518,10 @@ export {
   selectFormsCount,
   selectFormsMapping,
   selectGeneralFormCount,
-  selectHiddenAssetTypeIds,
-  selectHiddenCategoryCount,
+  selectGeoImageById,
+  selectGeoImageMapping,
+  selectGeoImages,
+  selectGeoImagesOfProject,
   selectIsFetchingInitialData,
   selectIsImportingProjectFile,
   selectIsLoggedIn,
@@ -7553,7 +7538,6 @@ export {
   selectIssueTypesOfOrganization,
   selectIssueUpdateMapping,
   selectIssueUpdatesOfIssue,
-  selectIssues,
   selectIssuesOfIssueType,
   selectIssuesOfIssueTypeCount,
   selectLatestFormRevisionByForm,
@@ -7564,6 +7548,7 @@ export {
   selectLicenseForProject,
   selectLicenses,
   selectLicensesForProjectsMapping,
+  selectLicensesOfOrganization,
   selectMainWorkspace,
   selectNumberOfAssetTypesMatchingCaseInsensitiveName,
   selectNumberOfAssetsOfAssetType,
@@ -7572,6 +7557,7 @@ export {
   selectOrganizationAccessForUser,
   selectOrganizationAccessUserMapping,
   selectOrganizationAccesses,
+  selectOrganizationById,
   selectOrganizationUsersAsMapping,
   selectOrganizationUsersIds,
   selectOrganizations,
@@ -7586,21 +7572,21 @@ export {
   selectProjectAccesses,
   selectProjectAttachment,
   selectProjectAttachmentMapping,
-  selectProjectFileVisibility,
+  selectProjectFileById,
+  selectProjectFileMapping,
   selectProjectFiles,
   selectProjectUsersAsMapping,
   selectProjectUsersIds,
   selectProjects,
+  selectProjectsOfOrganization,
   selectProjectsWithAccess,
   selectRecentIssueIds,
   selectRecentIssuesAsSearchResults,
   selectRehydrated,
   selectRootDocuments,
   selectSortedFormSubmissionsOfForm,
-  selectSortedOrganizationLicenses,
   selectSortedOrganizationUsers,
   selectSortedProjectUsers,
-  selectSortedProjects,
   selectStage,
   selectStageFormIdsFromStageIds,
   selectStageMapping,
@@ -7615,17 +7601,12 @@ export {
   selectTeamsOfUser,
   selectUploadUrl,
   selectUser,
-  selectUserFormRevisionAttachmentsMapping,
   selectUsersAsMapping,
-  selectVisibleStatuses,
-  selectVisibleUserIds,
-  selectWorkspace,
+  selectWorkspaceById,
   selectWorkspaceMapping,
   selectWorkspaces,
-  setActiveOrganizationId,
   setActiveProjectFileId,
   setActiveProjectId,
-  setActiveWorkspaceId,
   setAsset,
   setAssetAttachment,
   setAssetAttachments,
@@ -7646,6 +7627,8 @@ export {
   setFormSubmissionAttachments,
   setFormSubmissions,
   setForms,
+  setGeoImage,
+  setGeoImages,
   setIsFetchingInitialData,
   setIsImportingProjectFile,
   setIssueAttachment,
@@ -7661,7 +7644,6 @@ export {
   setProjectAccesses,
   setProjectAttachment,
   setProjectAttachments,
-  setProjectFileVisible,
   setProjects,
   setRehydrated,
   setStage,
@@ -7672,8 +7654,6 @@ export {
   setTourStep,
   setUploadUrl,
   setUsers,
-  setVisibleStatuses,
-  setVisibleUserIds,
   setWorkspaces,
   settingReducer,
   settingSlice,
@@ -7685,11 +7665,7 @@ export {
   teamSlice,
   toFileNameSafeString,
   toOfflineIdRecord,
-  toggleAssetTypeVisibility,
   truncate,
-  unhideAllCategories,
-  unhideCategory,
-  updateActiveOrganization,
   updateAsset,
   updateAssetAttachment,
   updateAssetAttachments,
@@ -7708,6 +7684,8 @@ export {
   updateFormSubmissionAttachment,
   updateFormSubmissionAttachments,
   updateFormSubmissions,
+  updateGeoImage,
+  updateGeoImages,
   updateIssue,
   updateIssueAttachment,
   updateIssueAttachments,