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

package/dist/overmap-core.umd.cjs

@@ -367,15 +367,15 @@ var __publicField = (obj, key, value) => {
   };
   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 = toolkit.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;
@@ -406,6 +406,9 @@ var __publicField = (obj, key, value) => {
   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;
@@ -842,72 +845,23 @@ var __publicField = (obj, key, value) => {
     };
   }
   const categoryAdapter = createModelAdapter((category) => category.offline_id);
-  const initialState$z = categoryAdapter.getInitialState({
-    categoryVisibility: {
-      hiddenCategoryIds: [],
-      isNullCategoryHidden: false
-    }
-  });
+  const initialState$A = categoryAdapter.getInitialState({});
   const categorySlice = toolkit.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 = toolkit.createSelector(
-    [selectCategoryMapping, _selectActiveWorkspaceId],
-    (mapping, activeWorkspaceId) => activeWorkspaceId ? Object.values(mapping).filter((category) => category.workspace === activeWorkspaceId) : []
-  );
+  const selectCategories = toolkit.createSelector([selectCategoryMapping], (categoryMapping) => {
+    return Object.values(categoryMapping);
+  });
   const selectCategoriesOfWorkspace = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
       [selectCategories, (_state, workspaceId) => workspaceId],
@@ -920,36 +874,23 @@ var __publicField = (obj, key, value) => {
       (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 = toolkit.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 = toolkit.createSelector(
     [selectAssetTypesMapping],
@@ -985,14 +926,13 @@ var __publicField = (obj, key, value) => {
       });
     })
   );
-  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 = toolkit.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);
@@ -1095,11 +1035,11 @@ var __publicField = (obj, key, value) => {
   };
   const assetReducer = assetSlice.reducer;
   const assetAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
-  const initialState$w = assetAttachmentAdapter.getInitialState({});
+  const initialState$x = assetAttachmentAdapter.getInitialState({});
   const assetAttachmentSlice = toolkit.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,
@@ -1157,13 +1097,13 @@ var __publicField = (obj, key, value) => {
     )
   );
   const assetAttachmentReducer = assetAttachmentSlice.reducer;
-  const initialState$v = {
+  const initialState$w = {
     completionsByAssetId: {}
   };
   const assetStageCompletionSlice = toolkit.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];
@@ -1215,11 +1155,11 @@ var __publicField = (obj, key, value) => {
   );
   const assetStageCompletionReducer = assetStageCompletionSlice.reducer;
   const assetStageAdapter = createModelAdapter((assetStage) => assetStage.offline_id);
-  const initialState$u = assetStageAdapter.getInitialState({});
+  const initialState$v = assetStageAdapter.getInitialState({});
   const assetStageSlice = toolkit.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,
@@ -1288,8 +1228,8 @@ var __publicField = (obj, key, value) => {
         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;
@@ -1300,11 +1240,11 @@ var __publicField = (obj, key, value) => {
   const assetTypeAttachmentAdapter = createModelAdapter(
     (attachment) => attachment.offline_id
   );
-  const initialState$t = assetTypeAttachmentAdapter.getInitialState({});
+  const initialState$u = assetTypeAttachmentAdapter.getInitialState({});
   const assetTypeAttachmentSlice = toolkit.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,
@@ -1363,31 +1303,19 @@ var __publicField = (obj, key, value) => {
   );
   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 = toolkit.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 = toolkit.createSelector([selectWorkspaceMapping], (mapping) => Object.values(mapping));
   const selectMainWorkspace = toolkit.createSelector(
@@ -1396,20 +1324,9 @@ var __publicField = (obj, key, value) => {
       return workspaces.find((workspace) => workspace.name.toLowerCase() === "main");
     }
   );
-  const selectWorkspace = restructureCreateSelectorWithArgs(
-    toolkit.createSelector([selectWorkspaceMapping, (_state, workspaceId) => workspaceId], (mapping, workspaceId) => {
-      return mapping[workspaceId];
-    })
-  );
-  const selectActiveWorkspaceId = (state) => state.workspaceReducer.activeWorkspaceId;
-  const selectActiveWorkspace = toolkit.createSelector(
-    [selectWorkspaceMapping, selectActiveWorkspaceId],
-    (mapping, activeWorkspaceId) => {
-      if (!activeWorkspaceId)
-        return null;
-      return mapping[activeWorkspaceId];
-    }
-  );
+  const selectWorkspaceById = (workspaceId) => (state) => {
+    return state.workspaceReducer.instances[workspaceId];
+  };
   const selectPermittedWorkspaceIds = toolkit.createSelector(
     [selectWorkspaceMapping],
     (mapping) => {
@@ -1421,16 +1338,14 @@ var __publicField = (obj, key, value) => {
   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 = toolkit.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,
@@ -1439,12 +1354,6 @@ var __publicField = (obj, key, value) => {
       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]);
       },
@@ -1477,8 +1386,6 @@ var __publicField = (obj, key, value) => {
     updateIssue,
     deleteIssue,
     deleteIssues,
-    setVisibleStatuses,
-    setVisibleUserIds,
     addToRecentIssues,
     cleanRecentIssues,
     removeRecentIssue,
@@ -1486,51 +1393,6 @@ var __publicField = (obj, key, value) => {
   } = 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(
-    toolkit.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(
     toolkit.createSelector([selectIssueMapping, (_state, id) => id], (mapping, id) => {
       return mapping[id];
@@ -1627,12 +1489,12 @@ var __publicField = (obj, key, value) => {
   );
   const issueReducer = issueSlice.reducer;
   const issueTypeAdapter = createModelAdapter((issueType) => issueType.offline_id);
-  const initialState$q = issueTypeAdapter.getInitialState({});
+  const initialState$r = issueTypeAdapter.getInitialState({});
   const issueTypeSlice = toolkit.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,
@@ -1681,15 +1543,15 @@ var __publicField = (obj, key, value) => {
     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 = toolkit.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;
@@ -1770,7 +1632,7 @@ var __publicField = (obj, key, value) => {
     LicenseStatus2[LicenseStatus2["PAST_DUE"] = 8] = "PAST_DUE";
     return LicenseStatus2;
   })(LicenseStatus || {});
-  const initialState$o = {
+  const initialState$p = {
     users: {},
     currentUser: {
       id: 0,
@@ -1781,8 +1643,8 @@ var __publicField = (obj, key, value) => {
   };
   const userSlice = toolkit.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 = {};
@@ -1847,11 +1709,11 @@ var __publicField = (obj, key, value) => {
   const organizationAccessAdapter = createModelAdapter(
     (organizationAccess) => organizationAccess.offline_id
   );
-  const initialState$n = organizationAccessAdapter.getInitialState({});
+  const initialState$o = organizationAccessAdapter.getInitialState({});
   const organizationAccessSlice = toolkit.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,
@@ -1888,11 +1750,11 @@ var __publicField = (obj, key, value) => {
   };
   const organizationAccessReducer = organizationAccessSlice.reducer;
   const licenseAdapter = createModelAdapter((license) => license.offline_id);
-  const initialState$m = licenseAdapter.getInitialState({});
+  const initialState$n = licenseAdapter.getInitialState({});
   const licenseSlice = toolkit.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,
@@ -1918,11 +1780,11 @@ var __publicField = (obj, key, value) => {
   );
   const licenseReducer = licenseSlice.reducer;
   const projectAccessAdapter = createModelAdapter((projectAccess) => projectAccess.offline_id);
-  const initialState$l = projectAccessAdapter.getInitialState({});
+  const initialState$m = projectAccessAdapter.getInitialState({});
   const projectAccessSlice = toolkit.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,
@@ -1968,15 +1830,14 @@ var __publicField = (obj, key, value) => {
     return projectAccesses;
   };
   const projectAccessReducer = projectAccessSlice.reducer;
-  const initialState$k = {
+  const initialState$l = {
     projects: {},
-    activeProjectId: null,
-    recentProjectIds: [],
-    recentSearchableQueries: []
+    activeProjectId: null
   };
   const projectSlice = toolkit.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 = {};
@@ -2056,21 +1917,6 @@ var __publicField = (obj, key, value) => {
       (projects, projectId) => projects[projectId]
     )
   );
-  const selectSortedProjects = toolkit.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 = toolkit.createSelector(
     [selectProjectAccessMapping],
@@ -2105,38 +1951,22 @@ var __publicField = (obj, key, value) => {
       });
     }
   );
-  const initialState$j = {
-    organizations: {},
-    activeOrganizationId: null
+  const initialState$k = {
+    organizations: {}
   };
   const organizationSlice = toolkit.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);
   };
@@ -2147,43 +1977,21 @@ var __publicField = (obj, key, value) => {
     [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 = toolkit.createSelector(
     [selectOrganizationAccesses],
     (organizationAccesses) => Object.values(organizationAccesses).map((organizationAccess) => organizationAccess.user)
   );
-  const selectActiveOrganizationProjects = toolkit.createSelector(
-    [selectProjects, selectActiveOrganizationId],
-    (projects, activeOrganizationId) => activeOrganizationId ? Object.values(projects).filter((project) => project.owner_organization === activeOrganizationId) : []
-  );
-  const selectActiveOrganizationLicenses = toolkit.createSelector(
-    [selectActiveOrganizationId, selectLicenses],
-    (activeOrganizationId, licenses) => !activeOrganizationId ? [] : Object.values(licenses).filter((license) => license.organization_owner === activeOrganizationId)
+  const selectProjectsOfOrganization = restructureCreateSelectorWithArgs(
+    toolkit.createSelector([selectProjects, (_, organizationId) => organizationId], (projects, organizationId) => {
+      return Object.values(projects).filter((project) => project.owner_organization === organizationId);
+    })
   );
-  const selectSortedOrganizationLicenses = toolkit.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(
+    toolkit.createSelector([selectLicenses, (_, organizationId) => organizationId], (licenses, organizationId) => {
+      return Object.values(licenses).filter((license) => license.organization_owner === organizationId);
     })
   );
   const selectOrganizationUsersAsMapping = toolkit.createSelector(
@@ -2232,14 +2040,14 @@ var __publicField = (obj, key, value) => {
       }
     };
   };
-  const initialState$i = {
+  const initialState$j = {
     deletedRequests: [],
     latestRetryTime: 0
   };
   const outboxSlice = toolkit.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
@@ -2271,16 +2079,15 @@ var __publicField = (obj, key, value) => {
   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 = toolkit.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) {
@@ -2305,9 +2112,6 @@ var __publicField = (obj, key, value) => {
         }
         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;
       },
@@ -2327,19 +2131,14 @@ var __publicField = (obj, key, value) => {
       // 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) => {
@@ -2352,7 +2151,6 @@ var __publicField = (obj, key, value) => {
   const {
     addOrReplaceProjectFiles,
     addOrReplaceProjectFile,
-    setProjectFileVisible,
     setIsImportingProjectFile,
     setActiveProjectFileId,
     saveActiveProjectFileBounds,
@@ -2360,33 +2158,25 @@ var __publicField = (obj, key, value) => {
     removeProjectFilesOfProject,
     resetProjectFileObjectUrls
   } = projectFileSlice.actions;
-  const selectEnabledProjectFiles = (state) => state.projectFileReducer.enabledProjectFiles;
-  const selectProjectFileVisibility = toolkit.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 = toolkit.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 = toolkit.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,
@@ -2444,12 +2234,12 @@ var __publicField = (obj, key, value) => {
     )
   );
   const projectAttachmentReducer = projectAttachmentSlice.reducer;
-  const initialState$f = {
+  const initialState$g = {
     isRehydrated: false
   };
   const rehydratedSlice = toolkit.createSlice({
     name: "rehydrated",
-    initialState: initialState$f,
+    initialState: initialState$g,
     // The `reducers` field lets us define reducers and generate associated actions
     reducers: {
       setRehydrated: (state, action) => {
@@ -2460,13 +2250,13 @@ var __publicField = (obj, key, value) => {
   const { setRehydrated } = rehydratedSlice.actions;
   const selectRehydrated = (state) => state.rehydratedReducer.isRehydrated;
   const rehydratedReducer = rehydratedSlice.reducer;
-  const initialState$e = {
+  const initialState$f = {
     isFetchingInitialData: false
   };
   const settingSlice = toolkit.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;
@@ -2490,11 +2280,11 @@ var __publicField = (obj, key, value) => {
     }
   };
   const formRevisionAdapter = createModelAdapter((revision) => revision.offline_id);
-  const initialState$d = formRevisionAdapter.getInitialState({});
+  const initialState$e = formRevisionAdapter.getInitialState({});
   const formRevisionsSlice = toolkit.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,
@@ -2555,11 +2345,11 @@ var __publicField = (obj, key, value) => {
         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;
           }
@@ -2587,11 +2377,11 @@ var __publicField = (obj, key, value) => {
   });
   const formRevisionReducer = formRevisionsSlice.reducer;
   const formAdapter = createModelAdapter((form) => form.offline_id);
-  const initialState$c = formAdapter.getInitialState({});
+  const initialState$d = formAdapter.getInitialState({});
   const formSlice = toolkit.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,
@@ -2612,22 +2402,22 @@ var __publicField = (obj, key, value) => {
         (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) {
@@ -2641,43 +2431,41 @@ var __publicField = (obj, key, value) => {
       { memoizeOptions: { equalityCheck: shallowEqual } }
     )
   );
-  const selectForm = restructureCreateSelectorWithArgs(
-    toolkit.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(
     toolkit.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(
     toolkit.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 = toolkit.createSelector([selectFormMapping], (userForms) => {
-    return Object.keys(userForms).length;
+  const selectFormsCount = toolkit.createSelector([selectFormMapping], (formsMapping) => {
+    return Object.keys(formsMapping).length;
   });
-  const selectGeneralFormCount = toolkit.createSelector([selectFormMapping], (userForms) => {
-    return Object.values(userForms).filter((form) => !form.asset_type).length;
+  const selectGeneralFormCount = toolkit.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 = toolkit.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,
@@ -2797,29 +2585,32 @@ var __publicField = (obj, key, value) => {
       }
     )
   );
-  const selectFormSubmissionsByAssets = toolkit.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 = toolkit.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 = toolkit.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,
@@ -2858,11 +2649,11 @@ var __publicField = (obj, key, value) => {
   const formRevisionAttachmentAdapter = createModelAdapter(
     (attachment) => attachment.offline_id
   );
-  const initialState$9 = formRevisionAttachmentAdapter.getInitialState({});
+  const initialState$a = formRevisionAttachmentAdapter.getInitialState({});
   const formRevisionAttachmentSlice = toolkit.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,
@@ -2886,12 +2677,12 @@ var __publicField = (obj, key, value) => {
     deleteFormRevisionAttachment,
     deleteFormRevisionAttachments
   } = formRevisionAttachmentSlice.actions;
-  const selectUserFormRevisionAttachmentsMapping = (state) => {
+  const selectFormRevisionAttachmentsMapping = (state) => {
     return state.formRevisionAttachmentReducer.instances;
   };
   const selectAttachmentsOfFormRevision = restructureCreateSelectorWithArgs(
     toolkit.createSelector(
-      [selectUserFormRevisionAttachmentsMapping, (_state, revisionId) => revisionId],
+      [selectFormRevisionAttachmentsMapping, (_state, revisionId) => revisionId],
       (attachments, revisionId) => {
         return Object.values(attachments).filter((attachment) => attachment.revision === revisionId);
       }
@@ -2899,10 +2690,10 @@ var __publicField = (obj, key, value) => {
   );
   const formRevisionAttachmentReducer = formRevisionAttachmentSlice.reducer;
   const emailDomainAdapter = createModelAdapter((emailDomain) => emailDomain.offline_id);
-  const initialState$8 = emailDomainAdapter.getInitialState({});
+  const initialState$9 = emailDomainAdapter.getInitialState({});
   const emailDomainsSlice = toolkit.createSlice({
     name: "emailDomains",
-    initialState: initialState$8,
+    initialState: initialState$9,
     reducers: {
       initializeEmailDomains: emailDomainAdapter.initialize,
       addEmailDomain: emailDomainAdapter.addOne,
@@ -2921,14 +2712,14 @@ var __publicField = (obj, key, value) => {
     )
   );
   const emailDomainsReducer = emailDomainsSlice.reducer;
-  const initialState$7 = {
+  const initialState$8 = {
     documents: {}
   };
   const documentSlice = toolkit.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) => {
@@ -3103,11 +2894,11 @@ var __publicField = (obj, key, value) => {
   );
   const documentsReducer = documentSlice.reducer;
   const documentAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
-  const initialState$6 = documentAttachmentAdapter.getInitialState({});
+  const initialState$7 = documentAttachmentAdapter.getInitialState({});
   const documentAttachmentSlice = toolkit.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,
@@ -3166,11 +2957,11 @@ var __publicField = (obj, key, value) => {
   );
   const documentAttachmentReducer = documentAttachmentSlice.reducer;
   const teamAdapter = createModelAdapter((team) => team.offline_id);
-  const initialState$5 = teamAdapter.getInitialState({});
+  const initialState$6 = teamAdapter.getInitialState({});
   const teamSlice = toolkit.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,
@@ -3204,11 +2995,11 @@ var __publicField = (obj, key, value) => {
   const agentUserConversationAdapter = createModelAdapter(
     (conversation) => conversation.offline_id
   );
-  const initialState$4 = agentUserConversationAdapter.getInitialState({});
+  const initialState$5 = agentUserConversationAdapter.getInitialState({});
   const agentsSlice = toolkit.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,
@@ -3230,11 +3021,11 @@ var __publicField = (obj, key, value) => {
   );
   const agentsReducer = agentsSlice.reducer;
   const issueCommentAdapter = createModelAdapter((comment) => comment.offline_id);
-  const initialState$3 = issueCommentAdapter.getInitialState({});
+  const initialState$4 = issueCommentAdapter.getInitialState({});
   const issueCommentSlice = toolkit.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,
@@ -3263,11 +3054,11 @@ var __publicField = (obj, key, value) => {
   );
   const issueCommentReducer = issueCommentSlice.reducer;
   const issueUpdateAdapter = createModelAdapter((issueUpdate) => issueUpdate.offline_id);
-  const initialState$2 = issueUpdateAdapter.getInitialState({});
+  const initialState$3 = issueUpdateAdapter.getInitialState({});
   const issueUpdateSlice = toolkit.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,
@@ -3296,11 +3087,11 @@ var __publicField = (obj, key, value) => {
   );
   const issueUpdateReducer = issueUpdateSlice.reducer;
   const issueAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
-  const initialState$1 = issueAttachmentAdapter.getInitialState({});
+  const initialState$2 = issueAttachmentAdapter.getInitialState({});
   const issueAttachmentSlice = toolkit.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,
@@ -3358,15 +3149,59 @@ var __publicField = (obj, key, value) => {
     )
   );
   const issueAttachmentReducer = issueAttachmentSlice.reducer;
-  const initialState = {
+  const initialState$1 = {
     version: 0
   };
   const versioningSlice = toolkit.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 = toolkit.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(
+    toolkit.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;
@@ -3438,7 +3273,8 @@ var __publicField = (obj, key, value) => {
     teamReducer,
     agentsReducer,
     issueCommentReducer,
-    issueUpdateReducer
+    issueUpdateReducer,
+    geoImageReducer
   };
   const overmapReducer = toolkit.combineReducers(overmapReducers);
   const resetStore = "RESET";
@@ -3994,8 +3830,6 @@ var __publicField = (obj, key, value) => {
       console.debug(this.constructor.name, "clearing auth;");
       this.dispatch(setLoggedIn(false));
       this.clearTokens();
-      this.dispatch(setActiveProjectId(null));
-      this.dispatch(setActiveWorkspaceId(null));
       this.dispatch({ type: constants.RESET_STATE });
       this.dispatch({ type: resetStore });
     }
@@ -4492,13 +4326,13 @@ var __publicField = (obj, key, value) => {
       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]
         });
@@ -4513,7 +4347,7 @@ var __publicField = (obj, key, value) => {
       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",
@@ -4538,39 +4372,7 @@ var __publicField = (obj, key, value) => {
       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,
@@ -4578,8 +4380,9 @@ var __publicField = (obj, key, value) => {
         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),
@@ -4588,7 +4391,8 @@ var __publicField = (obj, key, value) => {
         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;
     }
@@ -4608,6 +4412,40 @@ var __publicField = (obj, key, value) => {
         });
       }
     }
+  }
+  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;
@@ -4963,11 +4801,10 @@ var __publicField = (obj, key, value) => {
     // 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) {
@@ -5478,10 +5315,6 @@ var __publicField = (obj, key, value) => {
       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);
@@ -5508,7 +5341,6 @@ var __publicField = (obj, key, value) => {
         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 }));
@@ -5579,7 +5411,7 @@ var __publicField = (obj, key, value) => {
     }
     return { fields: newFields, images };
   };
-  class UserFormService extends BaseApiService {
+  class FormService extends BaseApiService {
     constructor() {
       super(...arguments);
       // Attach images to revision, after uploading them to S3
@@ -5785,17 +5617,17 @@ var __publicField = (obj, key, value) => {
     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 {
@@ -5807,12 +5639,12 @@ var __publicField = (obj, key, value) => {
           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;
       }
@@ -5898,7 +5730,7 @@ var __publicField = (obj, key, value) => {
     }
     return { values: newValues, files };
   };
-  class UserFormSubmissionService extends BaseApiService {
+  class FormSubmissionService extends BaseUploadService {
     constructor() {
       super(...arguments);
       // Attach files to submission, after uploading them to S3
@@ -5979,7 +5811,6 @@ var __publicField = (obj, key, value) => {
     // 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 = uuid.v4();
@@ -6021,7 +5852,6 @@ var __publicField = (obj, key, value) => {
               file_type: file.type,
               size: file.size
             };
-            allFilesRecord[sha1] = filePayload;
             filePaylods.push(filePayload);
           }
           return {
@@ -6057,22 +5887,7 @@ var __publicField = (obj, key, value) => {
           blocks: blocks2
         });
         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);
@@ -6543,7 +6358,7 @@ var __publicField = (obj, key, value) => {
       });
     }
     async update(organization) {
-      const promise = this.enqueueRequest({
+      return this.enqueueRequest({
         description: "Edit organization",
         method: HttpMethod.PATCH,
         url: `/organizations/${organization.id}/`,
@@ -6551,10 +6366,6 @@ var __publicField = (obj, key, value) => {
         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({
@@ -7132,6 +6943,179 @@ var __publicField = (obj, key, value) => {
       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));
+    }
+  }
   exports2.APIError = APIError;
   exports2.AgentService = AgentService;
   exports2.AssetAttachmentService = AssetAttachmentService;
@@ -7154,7 +7138,10 @@ var __publicField = (obj, key, value) => {
   exports2.EmailDomainsService = EmailDomainsService;
   exports2.EmailVerificationService = EmailVerificationService;
   exports2.FileService = FileService;
+  exports2.FormService = FormService;
+  exports2.FormSubmissionService = FormSubmissionService;
   exports2.GREEN = GREEN;
+  exports2.GeoImageService = GeoImageService;
   exports2.HttpMethod = HttpMethod;
   exports2.IssueAttachmentService = IssueAttachmentService;
   exports2.IssueCommentService = IssueCommentService;
@@ -7180,8 +7167,6 @@ var __publicField = (obj, key, value) => {
   exports2.ProjectFileService = ProjectFileService;
   exports2.ProjectService = ProjectService;
   exports2.TeamService = TeamService;
-  exports2.UserFormService = UserFormService;
-  exports2.UserFormSubmissionService = UserFormSubmissionService;
   exports2.UserService = UserService;
   exports2.VERSION_REDUCER_KEY = VERSION_REDUCER_KEY;
   exports2.VerificationCodeType = VerificationCodeType;
@@ -7216,6 +7201,8 @@ var __publicField = (obj, key, value) => {
   exports2.addFormSubmissionAttachments = addFormSubmissionAttachments;
   exports2.addFormSubmissions = addFormSubmissions;
   exports2.addForms = addForms;
+  exports2.addGeoImage = addGeoImage;
+  exports2.addGeoImages = addGeoImages;
   exports2.addIssue = addIssue;
   exports2.addIssueAttachment = addIssueAttachment;
   exports2.addIssueAttachments = addIssueAttachments;
@@ -7291,6 +7278,8 @@ var __publicField = (obj, key, value) => {
   exports2.deleteFormSubmissionAttachment = deleteFormSubmissionAttachment;
   exports2.deleteFormSubmissionAttachments = deleteFormSubmissionAttachments;
   exports2.deleteFormSubmissions = deleteFormSubmissions;
+  exports2.deleteGeoImage = deleteGeoImage;
+  exports2.deleteGeoImages = deleteGeoImages;
   exports2.deleteIssue = deleteIssue;
   exports2.deleteIssueAttachment = deleteIssueAttachment;
   exports2.deleteIssueAttachments = deleteIssueAttachments;
@@ -7324,6 +7313,7 @@ var __publicField = (obj, key, value) => {
   exports2.fileReducer = fileReducer;
   exports2.fileSlice = fileSlice;
   exports2.fileToBlob = fileToBlob;
+  exports2.flipBounds = flipBounds;
   exports2.flipCoordinates = flipCoordinates;
   exports2.formReducer = formReducer;
   exports2.formRevisionAttachmentReducer = formRevisionAttachmentReducer;
@@ -7338,6 +7328,8 @@ var __publicField = (obj, key, value) => {
   exports2.fullAssetMarkerSize = fullAssetMarkerSize;
   exports2.generateBadgeColors = generateBadgeColors;
   exports2.genericMemo = genericMemo;
+  exports2.geoImageReducer = geoImageReducer;
+  exports2.geoImageSlice = geoImageSlice;
   exports2.getFileIdentifier = getFileIdentifier;
   exports2.getFileS3Key = getFileS3Key;
   exports2.getLocalDateString = getLocalDateString;
@@ -7346,8 +7338,6 @@ var __publicField = (obj, key, value) => {
   exports2.getRenamedFile = getRenamedFile;
   exports2.getStageColor = getStageColor;
   exports2.hashFile = hashFile;
-  exports2.hideAllCategories = hideAllCategories;
-  exports2.hideCategory = hideCategory;
   exports2.initSDK = initSDK;
   exports2.initializeAssetAttachments = initializeAssetAttachments;
   exports2.initializeAssetTypeAttachments = initializeAssetTypeAttachments;
@@ -7360,6 +7350,7 @@ var __publicField = (obj, key, value) => {
   exports2.initializeFormRevisionAttachments = initializeFormRevisionAttachments;
   exports2.initializeFormRevisions = initializeFormRevisions;
   exports2.initializeFormSubmissionAttachments = initializeFormSubmissionAttachments;
+  exports2.initializeGeoImages = initializeGeoImages;
   exports2.initializeIssueAttachments = initializeIssueAttachments;
   exports2.initializeIssueTypes = initializeIssueTypes;
   exports2.initializeIssueUpdates = initializeIssueUpdates;
@@ -7432,18 +7423,12 @@ var __publicField = (obj, key, value) => {
   exports2.searchIssues = searchIssues;
   exports2.selectAccessToken = selectAccessToken;
   exports2.selectActiveLicense = selectActiveLicense;
-  exports2.selectActiveOrganization = selectActiveOrganization;
   exports2.selectActiveOrganizationAccess = selectActiveOrganizationAccess;
-  exports2.selectActiveOrganizationId = selectActiveOrganizationId;
-  exports2.selectActiveOrganizationLicenses = selectActiveOrganizationLicenses;
-  exports2.selectActiveOrganizationProjects = selectActiveOrganizationProjects;
   exports2.selectActiveProject = selectActiveProject;
   exports2.selectActiveProjectAccess = selectActiveProjectAccess;
   exports2.selectActiveProjectFileId = selectActiveProjectFileId;
   exports2.selectActiveProjectId = selectActiveProjectId;
   exports2.selectActiveStatusLicenses = selectActiveStatusLicenses;
-  exports2.selectActiveWorkspace = selectActiveWorkspace;
-  exports2.selectActiveWorkspaceId = selectActiveWorkspaceId;
   exports2.selectAllDocumentAttachments = selectAllDocumentAttachments;
   exports2.selectAllProjectAttachments = selectAllProjectAttachments;
   exports2.selectAncestorIdsOfDocument = selectAncestorIdsOfDocument;
@@ -7480,7 +7465,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectCategoriesOfWorkspace = selectCategoriesOfWorkspace;
   exports2.selectCategoryById = selectCategoryById;
   exports2.selectCategoryMapping = selectCategoryMapping;
-  exports2.selectCategoryVisibility = selectCategoryVisibility;
   exports2.selectCommentsOfIssue = selectCommentsOfIssue;
   exports2.selectCompletedStageIdsForAsset = selectCompletedStageIdsForAsset;
   exports2.selectCompletedStages = selectCompletedStages;
@@ -7497,8 +7481,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectEmailDomains = selectEmailDomains;
   exports2.selectEmailDomainsAsMapping = selectEmailDomainsAsMapping;
   exports2.selectEmailDomainsOfOrganization = selectEmailDomainsOfOrganization;
-  exports2.selectEnabledProjectFileMapping = selectEnabledProjectFileMapping;
-  exports2.selectEnabledProjectFiles = selectEnabledProjectFiles;
   exports2.selectFavouriteProjects = selectFavouriteProjects;
   exports2.selectFilteredForms = selectFilteredForms;
   exports2.selectForm = selectForm;
@@ -7506,6 +7488,7 @@ var __publicField = (obj, key, value) => {
   exports2.selectFormOfAssetType = selectFormOfAssetType;
   exports2.selectFormOfIssueType = selectFormOfIssueType;
   exports2.selectFormRevision = selectFormRevision;
+  exports2.selectFormRevisionAttachmentsMapping = selectFormRevisionAttachmentsMapping;
   exports2.selectFormRevisionMapping = selectFormRevisionMapping;
   exports2.selectFormRevisions = selectFormRevisions;
   exports2.selectFormRevisionsOfForm = selectFormRevisionsOfForm;
@@ -7522,8 +7505,10 @@ var __publicField = (obj, key, value) => {
   exports2.selectFormsCount = selectFormsCount;
   exports2.selectFormsMapping = selectFormsMapping;
   exports2.selectGeneralFormCount = selectGeneralFormCount;
-  exports2.selectHiddenAssetTypeIds = selectHiddenAssetTypeIds;
-  exports2.selectHiddenCategoryCount = selectHiddenCategoryCount;
+  exports2.selectGeoImageById = selectGeoImageById;
+  exports2.selectGeoImageMapping = selectGeoImageMapping;
+  exports2.selectGeoImages = selectGeoImages;
+  exports2.selectGeoImagesOfProject = selectGeoImagesOfProject;
   exports2.selectIsFetchingInitialData = selectIsFetchingInitialData;
   exports2.selectIsImportingProjectFile = selectIsImportingProjectFile;
   exports2.selectIsLoggedIn = selectIsLoggedIn;
@@ -7540,7 +7525,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectIssueTypesOfOrganization = selectIssueTypesOfOrganization;
   exports2.selectIssueUpdateMapping = selectIssueUpdateMapping;
   exports2.selectIssueUpdatesOfIssue = selectIssueUpdatesOfIssue;
-  exports2.selectIssues = selectIssues;
   exports2.selectIssuesOfIssueType = selectIssuesOfIssueType;
   exports2.selectIssuesOfIssueTypeCount = selectIssuesOfIssueTypeCount;
   exports2.selectLatestFormRevisionByForm = selectLatestFormRevisionByForm;
@@ -7551,6 +7535,7 @@ var __publicField = (obj, key, value) => {
   exports2.selectLicenseForProject = selectLicenseForProject;
   exports2.selectLicenses = selectLicenses;
   exports2.selectLicensesForProjectsMapping = selectLicensesForProjectsMapping;
+  exports2.selectLicensesOfOrganization = selectLicensesOfOrganization;
   exports2.selectMainWorkspace = selectMainWorkspace;
   exports2.selectNumberOfAssetTypesMatchingCaseInsensitiveName = selectNumberOfAssetTypesMatchingCaseInsensitiveName;
   exports2.selectNumberOfAssetsOfAssetType = selectNumberOfAssetsOfAssetType;
@@ -7559,6 +7544,7 @@ var __publicField = (obj, key, value) => {
   exports2.selectOrganizationAccessForUser = selectOrganizationAccessForUser;
   exports2.selectOrganizationAccessUserMapping = selectOrganizationAccessUserMapping;
   exports2.selectOrganizationAccesses = selectOrganizationAccesses;
+  exports2.selectOrganizationById = selectOrganizationById;
   exports2.selectOrganizationUsersAsMapping = selectOrganizationUsersAsMapping;
   exports2.selectOrganizationUsersIds = selectOrganizationUsersIds;
   exports2.selectOrganizations = selectOrganizations;
@@ -7573,21 +7559,21 @@ var __publicField = (obj, key, value) => {
   exports2.selectProjectAccesses = selectProjectAccesses;
   exports2.selectProjectAttachment = selectProjectAttachment;
   exports2.selectProjectAttachmentMapping = selectProjectAttachmentMapping;
-  exports2.selectProjectFileVisibility = selectProjectFileVisibility;
+  exports2.selectProjectFileById = selectProjectFileById;
+  exports2.selectProjectFileMapping = selectProjectFileMapping;
   exports2.selectProjectFiles = selectProjectFiles;
   exports2.selectProjectUsersAsMapping = selectProjectUsersAsMapping;
   exports2.selectProjectUsersIds = selectProjectUsersIds;
   exports2.selectProjects = selectProjects;
+  exports2.selectProjectsOfOrganization = selectProjectsOfOrganization;
   exports2.selectProjectsWithAccess = selectProjectsWithAccess;
   exports2.selectRecentIssueIds = selectRecentIssueIds;
   exports2.selectRecentIssuesAsSearchResults = selectRecentIssuesAsSearchResults;
   exports2.selectRehydrated = selectRehydrated;
   exports2.selectRootDocuments = selectRootDocuments;
   exports2.selectSortedFormSubmissionsOfForm = selectSortedFormSubmissionsOfForm;
-  exports2.selectSortedOrganizationLicenses = selectSortedOrganizationLicenses;
   exports2.selectSortedOrganizationUsers = selectSortedOrganizationUsers;
   exports2.selectSortedProjectUsers = selectSortedProjectUsers;
-  exports2.selectSortedProjects = selectSortedProjects;
   exports2.selectStage = selectStage;
   exports2.selectStageFormIdsFromStageIds = selectStageFormIdsFromStageIds;
   exports2.selectStageMapping = selectStageMapping;
@@ -7602,17 +7588,12 @@ var __publicField = (obj, key, value) => {
   exports2.selectTeamsOfUser = selectTeamsOfUser;
   exports2.selectUploadUrl = selectUploadUrl;
   exports2.selectUser = selectUser;
-  exports2.selectUserFormRevisionAttachmentsMapping = selectUserFormRevisionAttachmentsMapping;
   exports2.selectUsersAsMapping = selectUsersAsMapping;
-  exports2.selectVisibleStatuses = selectVisibleStatuses;
-  exports2.selectVisibleUserIds = selectVisibleUserIds;
-  exports2.selectWorkspace = selectWorkspace;
+  exports2.selectWorkspaceById = selectWorkspaceById;
   exports2.selectWorkspaceMapping = selectWorkspaceMapping;
   exports2.selectWorkspaces = selectWorkspaces;
-  exports2.setActiveOrganizationId = setActiveOrganizationId;
   exports2.setActiveProjectFileId = setActiveProjectFileId;
   exports2.setActiveProjectId = setActiveProjectId;
-  exports2.setActiveWorkspaceId = setActiveWorkspaceId;
   exports2.setAsset = setAsset;
   exports2.setAssetAttachment = setAssetAttachment;
   exports2.setAssetAttachments = setAssetAttachments;
@@ -7633,6 +7614,8 @@ var __publicField = (obj, key, value) => {
   exports2.setFormSubmissionAttachments = setFormSubmissionAttachments;
   exports2.setFormSubmissions = setFormSubmissions;
   exports2.setForms = setForms;
+  exports2.setGeoImage = setGeoImage;
+  exports2.setGeoImages = setGeoImages;
   exports2.setIsFetchingInitialData = setIsFetchingInitialData;
   exports2.setIsImportingProjectFile = setIsImportingProjectFile;
   exports2.setIssueAttachment = setIssueAttachment;
@@ -7648,7 +7631,6 @@ var __publicField = (obj, key, value) => {
   exports2.setProjectAccesses = setProjectAccesses;
   exports2.setProjectAttachment = setProjectAttachment;
   exports2.setProjectAttachments = setProjectAttachments;
-  exports2.setProjectFileVisible = setProjectFileVisible;
   exports2.setProjects = setProjects;
   exports2.setRehydrated = setRehydrated;
   exports2.setStage = setStage;
@@ -7659,8 +7641,6 @@ var __publicField = (obj, key, value) => {
   exports2.setTourStep = setTourStep;
   exports2.setUploadUrl = setUploadUrl;
   exports2.setUsers = setUsers;
-  exports2.setVisibleStatuses = setVisibleStatuses;
-  exports2.setVisibleUserIds = setVisibleUserIds;
   exports2.setWorkspaces = setWorkspaces;
   exports2.settingReducer = settingReducer;
   exports2.settingSlice = settingSlice;
@@ -7672,11 +7652,7 @@ var __publicField = (obj, key, value) => {
   exports2.teamSlice = teamSlice;
   exports2.toFileNameSafeString = toFileNameSafeString;
   exports2.toOfflineIdRecord = toOfflineIdRecord;
-  exports2.toggleAssetTypeVisibility = toggleAssetTypeVisibility;
   exports2.truncate = truncate;
-  exports2.unhideAllCategories = unhideAllCategories;
-  exports2.unhideCategory = unhideCategory;
-  exports2.updateActiveOrganization = updateActiveOrganization;
   exports2.updateAsset = updateAsset;
   exports2.updateAssetAttachment = updateAssetAttachment;
   exports2.updateAssetAttachments = updateAssetAttachments;
@@ -7695,6 +7671,8 @@ var __publicField = (obj, key, value) => {
   exports2.updateFormSubmissionAttachment = updateFormSubmissionAttachment;
   exports2.updateFormSubmissionAttachments = updateFormSubmissionAttachments;
   exports2.updateFormSubmissions = updateFormSubmissions;
+  exports2.updateGeoImage = updateGeoImage;
+  exports2.updateGeoImages = updateGeoImages;
   exports2.updateIssue = updateIssue;
   exports2.updateIssueAttachment = updateIssueAttachment;
   exports2.updateIssueAttachments = updateIssueAttachments;