@overmap-ai/core 1.0.58-export-overmap-reducer.14 → 1.0.58-export-overmap-reducer.16

package/dist/overmap-core.js

@@ -436,13 +436,6 @@ var IssueStatus = /* @__PURE__ */ ((IssueStatus2) => {
   IssueStatus2[IssueStatus2["DONE"] = 4] = "DONE";
   return IssueStatus2;
 })(IssueStatus || {});
-var MapStyle = /* @__PURE__ */ ((MapStyle2) => {
-  MapStyle2["LIGHT"] = "LIGHT";
-  MapStyle2["DARK"] = "DARK";
-  MapStyle2["SATELLITE"] = "SATELLITE";
-  MapStyle2["NONE"] = "NONE";
-  return MapStyle2;
-})(MapStyle || {});
 const VERSION_REDUCER_KEY$1 = "versioning";
 const latestVersion = () => migrations.length - 1;
 const initialVersioning = (state) => {
@@ -469,15 +462,15 @@ const wrapMigration = (migrator) => (state) => {
 };
 const migrations = [initialVersioning, signOut, signOut, createOutboxState];
 const manifest = Object.fromEntries(migrations.map((migration2, i) => [i, wrapMigration(migration2)]));
-const initialState$s = {
+const initialState$r = {
   accessToken: "",
   refreshToken: "",
   isLoggedIn: false
 };
 const authSlice = createSlice({
   name: "auth",
-  initialState: initialState$s,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$s)),
+  initialState: initialState$r,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$r)),
   reducers: {
     setTokens: (state, action) => {
       state.accessToken = action.payload.accessToken;
@@ -1121,7 +1114,7 @@ const getLocalRelativeDateString = memoize((date, min2, max2) => {
     return getLocalDateString(date);
   return relative.format(days, "days");
 });
-const initialState$r = {
+const initialState$q = {
   categories: {},
   usedCategoryColors: [],
   categoryVisibility: {
@@ -1131,8 +1124,8 @@ const initialState$r = {
 };
 const categorySlice = createSlice({
   name: "categories",
-  initialState: initialState$r,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$r)),
+  initialState: initialState$q,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$q)),
   reducers: {
     setCategories: (state, action) => {
       if (!Array.isArray(action.payload))
@@ -1316,15 +1309,15 @@ function removeAttachments(state, action) {
     delete state.attachments[attachmentId];
   }
 }
-const initialState$q = {
+const initialState$p = {
   assetTypes: {},
   hiddenAssetTypeIds: {},
   attachments: {}
 };
 const assetTypeSlice = createSlice({
   name: "assetTypes",
-  initialState: initialState$q,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$q)),
+  initialState: initialState$p,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$p)),
   reducers: {
     addAssetType: (state, action) => {
       state.assetTypes[action.payload.offline_id] = action.payload;
@@ -1434,14 +1427,14 @@ const selectAttachmentsOfAssetTypeByType = restructureCreateSelectorWithArgs(
   )
 );
 const assetTypeReducer = assetTypeSlice.reducer;
-const initialState$p = {
+const initialState$o = {
   assets: {},
   attachments: {}
 };
 const assetSlice = createSlice({
   name: "assets",
-  initialState: initialState$p,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$p)),
+  initialState: initialState$o,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$o)),
   reducers: {
     addAsset: (state, action) => {
       state.assets[action.payload.offline_id] = action.payload;
@@ -1614,13 +1607,13 @@ const selectAttachmentsOfAssetByType = restructureCreateSelectorWithArgs(
   )
 );
 const assetReducer = assetSlice.reducer;
-const initialState$o = {
+const initialState$n = {
   completionsByAssetId: {}
 };
 const assetStageCompletionSlice = createSlice({
   name: "assetStageCompletions",
-  initialState: initialState$o,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$o)),
+  initialState: initialState$n,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$n)),
   reducers: {
     addStageCompletion: (state, action) => {
       let stageToCompletionDateMapping = state.completionsByAssetId[action.payload.asset];
@@ -1669,13 +1662,13 @@ const selectCompletedStageIdsForAsset = (asset) => (state) => {
   return Object.keys(state.assetStageCompletionReducer.completionsByAssetId[asset.offline_id] ?? {});
 };
 const assetStageCompletionReducer = assetStageCompletionSlice.reducer;
-const initialState$n = {
+const initialState$m = {
   stages: {}
 };
 const assetStageSlice = createSlice({
   name: "assetStages",
-  initialState: initialState$n,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$n)),
+  initialState: initialState$m,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$m)),
   reducers: {
     addStages: (state, action) => {
       Object.assign(state.stages, toOfflineIdRecord(action.payload));
@@ -1776,13 +1769,13 @@ const selectStageFormIdsFromStageIds = restructureCreateSelectorWithArgs(
 );
 const { addStages, updateStages, removeStages, linkStageToForm, unlinkStageToForm } = assetStageSlice.actions;
 const assetStageReducer = assetStageSlice.reducer;
-const initialState$m = {
+const initialState$l = {
   workspaces: {},
   activeWorkspaceId: null
 };
 const workspaceSlice = createSlice({
   name: "workspace",
-  initialState: initialState$m,
+  initialState: initialState$l,
   // The `reducers` field lets us define reducers and generate associated actions
   reducers: {
     setWorkspaces: (state, action) => {
@@ -1839,7 +1832,7 @@ const selectPermittedWorkspaceIds = createSelector(
 );
 const workspaceReducer = workspaceSlice.reducer;
 const maxRecentIssues = 10;
-const initialState$l = {
+const initialState$k = {
   issues: {},
   attachments: {},
   comments: {},
@@ -1851,9 +1844,9 @@ const initialState$l = {
 };
 const issueSlice = createSlice({
   name: "issues",
-  initialState: initialState$l,
+  initialState: initialState$k,
   extraReducers: (builder) => builder.addCase("RESET", (state) => {
-    Object.assign(state, initialState$l);
+    Object.assign(state, initialState$k);
   }),
   reducers: {
     setIssues: (state, action) => {
@@ -2289,14 +2282,14 @@ const selectRecentIssuesAsSearchResults = createSelector(
   }
 );
 const issueReducer = issueSlice.reducer;
-const initialState$k = {
+const initialState$j = {
   issueTypes: {}
 };
 const issueTypeSlice = createSlice({
   name: "issueTypes",
-  initialState: initialState$k,
+  initialState: initialState$j,
   extraReducers: (builder) => builder.addCase("RESET", (state) => {
-    Object.assign(state, initialState$k);
+    Object.assign(state, initialState$j);
   }),
   reducers: {
     setIssueTypes: (state, action) => {
@@ -2363,15 +2356,15 @@ const selectIssuesOfIssueTypeCount = (issueTypeId) => (state) => {
   return ((_a2 = selectIssuesOfIssueType(issueTypeId)(state)) == null ? void 0 : _a2.length) ?? 0;
 };
 const issueTypeReducer = issueTypeSlice.reducer;
-const initialState$j = {
+const initialState$i = {
   s3Urls: {}
 };
 const msPerHour = 1e3 * 60 * 60;
 const msPerWeek = msPerHour * 24 * 7;
 const fileSlice = createSlice({
   name: "file",
-  initialState: initialState$j,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$j)),
+  initialState: initialState$i,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$i)),
   reducers: {
     setUploadUrl: (state, action) => {
       const { url, fields, sha1 } = action.payload;
@@ -2398,33 +2391,6 @@ const selectUploadUrl = (sha1) => (state) => {
   return url;
 };
 const fileReducer = fileSlice.reducer;
-const initialState$i = {
-  // TODO: Change first MapStyle.SATELLITE to MaptStyle.None when project creation map is fixed
-  mapStyle: MapStyle.SATELLITE,
-  showTooltips: false,
-  centerMapToProject: false
-};
-const mapSlice = createSlice({
-  name: "map",
-  initialState: initialState$i,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$i)),
-  reducers: {
-    setMapStyle: (state, action) => {
-      state.mapStyle = action.payload;
-    },
-    setShowTooltips: (state, action) => {
-      state.showTooltips = action.payload;
-    },
-    setCenterMapToProject: (state, action) => {
-      state.centerMapToProject = action.payload;
-    }
-  }
-});
-const { setMapStyle, setShowTooltips, setCenterMapToProject } = mapSlice.actions;
-const selectMapStyle = (state) => state.mapReducer.mapStyle;
-const selectShowTooltips = (state) => state.mapReducer.showTooltips;
-const selectCenterMapToProject = (state) => state.mapReducer.centerMapToProject;
-const mapReducer = mapSlice.reducer;
 var ProjectAccessLevel = /* @__PURE__ */ ((ProjectAccessLevel2) => {
   ProjectAccessLevel2[ProjectAccessLevel2["BASIC"] = 0] = "BASIC";
   ProjectAccessLevel2[ProjectAccessLevel2["ADMIN"] = 2] = "ADMIN";
@@ -2453,11 +2419,6 @@ var IssueUpdateChange = /* @__PURE__ */ ((IssueUpdateChange2) => {
   IssueUpdateChange2["DUE_DATE"] = "due_date";
   return IssueUpdateChange2;
 })(IssueUpdateChange || {});
-var ProjectType = /* @__PURE__ */ ((ProjectType2) => {
-  ProjectType2[ProjectType2["PERSONAL"] = 0] = "PERSONAL";
-  ProjectType2[ProjectType2["ORGANIZATION"] = 2] = "ORGANIZATION";
-  return ProjectType2;
-})(ProjectType || {});
 var VerificationCodeType = /* @__PURE__ */ ((VerificationCodeType2) => {
   VerificationCodeType2[VerificationCodeType2["USER_REGISTRATION"] = 0] = "USER_REGISTRATION";
   VerificationCodeType2[VerificationCodeType2["APPLICATION_INVITE"] = 2] = "APPLICATION_INVITE";
@@ -2755,9 +2716,6 @@ const projectAccessReducer = projectAccessSlice.reducer;
 const initialState$d = {
   projects: {},
   activeProjectId: null,
-  recentProjectIds: [],
-  recentSearchableQueries: [],
-  createProjectType: ProjectType.PERSONAL,
   attachments: {}
 };
 const projectSlice = createSlice({
@@ -2770,20 +2728,9 @@ const projectSlice = createSlice({
         projectsMap[project.id] = project;
       });
       state.projects = projectsMap;
-      if (state.recentProjectIds.length === 0) {
-        state.recentProjectIds = action.payload.map((project) => project.id);
-      } else {
-        state.recentProjectIds.unshift(
-          ...action.payload.map((project) => project.id).filter((id) => !state.recentProjectIds.includes(id))
-        );
-      }
     },
     setActiveProjectId: (state, action) => {
       state.activeProjectId = action.payload;
-      if (action.payload !== null) {
-        state.recentProjectIds = state.recentProjectIds.filter((id) => id !== action.payload);
-        state.recentProjectIds.push(action.payload);
-      }
     },
     updateOrCreateProject: (state, action) => {
       state.projects[action.payload.id] = action.payload;
@@ -2795,12 +2742,8 @@ const projectSlice = createSlice({
         state.projects[project.id] = project;
       });
     },
-    setCreateProjectType: (state, action) => {
-      state.createProjectType = action.payload;
-    },
     deleteProject: (state, action) => {
       delete state.projects[action.payload.id];
-      state.recentProjectIds = state.recentProjectIds.filter((id) => id !== action.payload.id);
     },
     acceptProjectInvite: (state, action) => {
       if (action.payload in state.projects) {
@@ -2846,7 +2789,6 @@ const {
   updateOrCreateProject,
   updateOrCreateProjects: addOrReplaceProjects,
   setActiveProjectId,
-  setCreateProjectType,
   deleteProject,
   acceptProjectInvite,
   addActiveProjectIssuesCount,
@@ -2870,9 +2812,6 @@ const selectActiveProject = (state) => {
   }
   return state.projectReducer.projects[activeProjectId] ?? null;
 };
-const selectRecentProjects = (state) => {
-  return state.projectReducer.recentProjectIds;
-};
 const selectProject = restructureCreateSelectorWithArgs(
   createSelector(
     [selectProjects, (_state, projectId) => projectId],
@@ -2894,7 +2833,6 @@ const selectSortedProjects = createSelector(
     });
   }
 );
-const selectCreateProjectType = (state) => state.projectReducer.createProjectType;
 const projectReducer = projectSlice.reducer;
 const selectProjectUsersIds = createSelector(
   [selectProjectAccesses],
@@ -3254,18 +3192,9 @@ const { setRehydrated } = rehydratedSlice.actions;
 const selectRehydrated = (state) => state.rehydratedReducer.isRehydrated;
 const rehydratedReducer = rehydratedSlice.reducer;
 const initialState$8 = {
-  useIssueTemplate: false,
-  // TODO: marked for deletion
   placementMode: false,
   enableClustering: false,
   svgLayout: false,
-  expandedSections: {
-    // TODO: marked for deletion
-    Issues: true,
-    "Map Layers": false,
-    Components: false,
-    Experimental: false
-  },
   appearance: "dark",
   isFetchingInitialData: false,
   // TODO: this is being used only in the custom hook in /web called useRetrySDK, which has something to do with licences
@@ -3277,18 +3206,12 @@ const settingSlice = createSlice({
   initialState: initialState$8,
   extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$8)),
   reducers: {
-    setEnableDuplicateIssues: (state, action) => {
-      state.useIssueTemplate = action.payload;
-    },
     setEnablePlacementMode: (state, action) => {
       state.placementMode = action.payload;
     },
     setEnableSvgLayout: (state, action) => {
       state.svgLayout = action.payload;
     },
-    setSectionExpanded: (state, action) => {
-      Object.assign(state.expandedSections, action.payload);
-    },
     setEnableClustering: (state, action) => {
       state.enableClustering = action.payload;
     },
@@ -3304,20 +3227,16 @@ const settingSlice = createSlice({
   }
 });
 const {
-  setEnableDuplicateIssues,
   setEnablePlacementMode,
   setEnableSvgLayout,
   // TODO: needs to actually be used in /web
-  setSectionExpanded,
   setEnableClustering,
   setAppearance,
   setIsFetchingInitialData,
   setIsLoading
 } = settingSlice.actions;
 const selectEnablePlacementMode = (state) => state.settingReducer.placementMode;
-const selectEnableDuplicateIssues = (state) => state.settingReducer.useIssueTemplate;
 const selectEnableSvgLayout = (state) => state.settingReducer.svgLayout;
-const selectExpandedSections = (state) => state.settingReducer.expandedSections;
 const selectEnableClustering = (state) => state.settingReducer.enableClustering;
 const selectAppearance = (state) => state.settingReducer.appearance;
 const settingReducer = settingSlice.reducer;
@@ -3578,17 +3497,15 @@ const selectFilteredForms = restructureCreateSelectorWithArgs(
       (_state, search) => search
     ],
     (userForms, revisions, search) => {
-      const { searchTerm, maxResults, favorites, owner_organization, owner_user } = 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)
           continue;
-        if (Number.isInteger(owner_organization) && owner_organization !== userForm.owner_organization) {
+        if (Number.isInteger(organization) && organization !== userForm.organization) {
           continue;
         }
-        if (Number.isInteger(owner_user) && owner_user !== userForm.owner_user)
-          continue;
         const latestRevision = _selectLatestFormRevision(revisions, userFormId);
         if (latestRevision.title.toLowerCase().includes(searchTerm.toLowerCase())) {
           if (userForm.favorite) {
@@ -4307,7 +4224,6 @@ const overmapReducers = {
   assetTypeReducer,
   issueReducer,
   issueTypeReducer,
-  mapReducer,
   organizationReducer,
   outboxReducer,
   projectReducer,
@@ -4373,10 +4289,6 @@ function handleWorkspaceRemoval(draft, action) {
       throw new Error(`Failed to update index_workspace of issue ${issue.offline_id} to main workspace`);
     }
   }
-  const indexedForms = Object.values(draft.formReducer.forms).filter((form) => form.index_workspace === workspaceId);
-  for (const form of indexedForms) {
-    form.index_workspace = mainWorkspace.offline_id;
-  }
 }
 const overmapRootReducer = (state, action) => {
   if (action.type === "auth/setLoggedIn" && !action.payload) {
@@ -6758,8 +6670,7 @@ class ProjectService extends BaseApiService {
     });
   }
 }
-const separateImageFromFields = async (payload) => {
-  const { fields } = payload;
+const separateImageFromFields = async (fields) => {
   const images = {};
   const newFields = [];
   for (const section of fields) {
@@ -6785,11 +6696,7 @@ const separateImageFromFields = async (payload) => {
     }
     newFields.push({ ...section, fields: newSectionFields });
   }
-  const payloadWithoutImage = {
-    ...payload,
-    fields: newFields
-  };
-  return { payloadWithoutImage, images };
+  return { fields: newFields, images };
 };
 class UserFormService extends BaseApiService {
   constructor() {
@@ -6823,93 +6730,90 @@ class UserFormService extends BaseApiService {
       });
     });
   }
-  async add(state, initialRevision, url, ownerUser, ownerOrganization, assetTypeId, issueTypeId) {
-    if (!!ownerUser === !!ownerOrganization) {
-      throw new Error("Exactly one of ownerUser and ownerOrganization must be defined.");
-    }
-    const ownerAttrs = {
-      owner_user: ownerUser,
-      owner_organization: ownerOrganization
-    };
-    const currentUser = state.userReducer.currentUser;
-    const activeWorkspaceId = state.workspaceReducer.activeWorkspaceId;
-    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const offlineFormPayload = offline({ ...ownerAttrs });
-    const offlineRevisionPayload = offline({ ...initialRevision, submitted_at: submittedAt });
-    const retForm = {
-      ...offlineFormPayload,
-      index_workspace: activeWorkspaceId,
-      favorite: true,
-      submitted_at: submittedAt,
-      created_by: currentUser.id,
-      ...assetTypeId && { asset_type: assetTypeId },
-      ...issueTypeId && { issue_type: issueTypeId },
-      ...ownerAttrs
-    };
-    const { payloadWithoutImage, images } = await separateImageFromFields(offlineRevisionPayload);
-    const retRevision = {
-      ...payloadWithoutImage,
-      created_by: currentUser.id,
-      form: retForm.offline_id,
-      revision: 0,
-      submitted_at: submittedAt
-    };
+  async add(ownerId, form, initialRevision, urlPrefix) {
     const { store } = this.client;
-    store.dispatch(addForm(retForm));
-    store.dispatch(addFormRevision(retRevision));
+    const { fields, images } = await separateImageFromFields(initialRevision.fields);
+    const offlineFormRevision = offline({
+      ...initialRevision,
+      fields,
+      created_by: form.created_by,
+      form: form.offline_id,
+      submitted_at: form.submitted_at,
+      revision: "Pending"
+    });
+    store.dispatch(addForm(form));
+    store.dispatch(addFormRevision(offlineFormRevision));
     const formPromise = this.client.enqueueRequest({
       description: "Create form",
       method: HttpMethod.POST,
-      url,
-      queryParams: activeWorkspaceId ? {
-        workspace_id: activeWorkspaceId
-      } : void 0,
+      url: urlPrefix,
       payload: {
-        ...offlineFormPayload,
-        ...assetTypeId && { asset_type: assetTypeId },
-        ...issueTypeId && { issue_type: issueTypeId },
-        initial_revision: payloadWithoutImage
+        // Sending exactly what is currently needed for the endpoint
+        offline_id: form.offline_id,
+        initial_revision: {
+          offline_id: offlineFormRevision.offline_id,
+          submitted_at: offlineFormRevision.submitted_at,
+          title: offlineFormRevision.title,
+          description: offlineFormRevision.description,
+          fields: offlineFormRevision.fields
+        }
       },
-      blockers: assetTypeId ? [assetTypeId] : issueTypeId ? [issueTypeId] : [],
-      blocks: [offlineFormPayload.offline_id, payloadWithoutImage.offline_id]
+      blockers: [ownerId],
+      blocks: [form.offline_id, offlineFormRevision.offline_id]
     });
-    const attachImagesPromises = this.getAttachImagePromises(images, offlineRevisionPayload.offline_id);
+    const attachImagesPromises = this.getAttachImagePromises(images, offlineFormRevision.offline_id);
     void formPromise.catch((e) => {
-      store.dispatch(deleteForm(retForm.offline_id));
-      store.dispatch(deleteFormRevision(retRevision.offline_id));
+      store.dispatch(deleteForm(form.offline_id));
+      store.dispatch(deleteFormRevision(offlineFormRevision.offline_id));
       throw e;
     });
     const settledPromise = Promise.all([formPromise, ...attachImagesPromises]).then(() => formPromise);
-    return [retForm, retRevision, formPromise, settledPromise];
+    return [form, offlineFormRevision, formPromise, settledPromise];
   }
-  async addForOrganization(initialRevision, attachedTo) {
+  addForOrganization(organizationId, initialRevision) {
     const state = this.client.store.getState();
-    const activeOrganizationId = state.organizationReducer.activeOrganizationId;
-    if (!activeOrganizationId) {
-      throw new Error("Cannot add forms for organization when there is no active organization.");
-    }
-    return await this.add(
-      state,
+    const offlineForm = offline({
+      favorite: false,
+      created_by: state.userReducer.currentUser.id,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+      organization: organizationId
+    });
+    return this.add(
+      organizationId.toString(),
+      offlineForm,
       initialRevision,
-      `/forms/in-organization/${activeOrganizationId}/`,
-      void 0,
-      activeOrganizationId,
-      attachedTo && "assetTypeId" in attachedTo ? attachedTo.assetTypeId : void 0,
-      attachedTo && "issueTypeId" in attachedTo ? attachedTo.issueTypeId : void 0
+      `/organizations/${organizationId}/create-form/`
     );
   }
-  async addForCurrentUser(initialRevision, attachedTo) {
+  addForProject(projectId, initialRevision) {
     const state = this.client.store.getState();
-    const currentUser = state.userReducer.currentUser;
-    return await this.add(
-      state,
-      initialRevision,
-      "/forms/my-forms/",
-      currentUser.id,
-      void 0,
-      attachedTo && "assetTypeId" in attachedTo ? attachedTo.assetTypeId : void 0,
-      attachedTo && "issueTypeId" in attachedTo ? attachedTo.issueTypeId : void 0
-    );
+    const offlineForm = offline({
+      favorite: false,
+      created_by: state.userReducer.currentUser.id,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+      project: projectId
+    });
+    return this.add(projectId.toString(), offlineForm, initialRevision, `/projects/${projectId}/create-form/`);
+  }
+  addForIssueType(issueTypeId, initialRevision) {
+    const state = this.client.store.getState();
+    const offlineForm = offline({
+      favorite: false,
+      created_by: state.userReducer.currentUser.id,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+      issue_type: issueTypeId
+    });
+    return this.add(issueTypeId, offlineForm, initialRevision, `/issues/types/${issueTypeId}/create-form/`);
+  }
+  addForAssetType(assetTypeId, initialRevision) {
+    const state = this.client.store.getState();
+    const offlineForm = offline({
+      favorite: false,
+      created_by: state.userReducer.currentUser.id,
+      submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
+      asset_type: assetTypeId
+    });
+    return this.add(assetTypeId, offlineForm, initialRevision, `/assets/types/${assetTypeId}/create-form/`);
   }
   async createRevision(formId2, revision) {
     const offlineRevision = offline(revision);
@@ -6920,9 +6824,10 @@ class UserFormService extends BaseApiService {
       throw new Error("Cannot create form revision when there is no active project.");
     }
     const currentUserId = state.userReducer.currentUser.id;
-    const { payloadWithoutImage, images } = await separateImageFromFields(offlineRevision);
+    const { fields, images } = await separateImageFromFields(offlineRevision.fields);
     const fullRevision = {
-      ...payloadWithoutImage,
+      ...offlineRevision,
+      fields,
       created_by: currentUserId,
       revision: "Pending",
       form: formId2,
@@ -6933,9 +6838,14 @@ class UserFormService extends BaseApiService {
       description: "Create form revision",
       method: HttpMethod.PATCH,
       url: `/forms/${formId2}/`,
-      payload: { initial_revision: payloadWithoutImage },
-      queryParams: {
-        project_id: activeProjectId.toString()
+      payload: {
+        initial_revision: {
+          offline_id: fullRevision.offline_id,
+          submitted_at: fullRevision.submitted_at,
+          title: fullRevision.title,
+          description: fullRevision.description,
+          fields: fullRevision.fields
+        }
       },
       blockers: [formId2],
       blocks: [offlineRevision.offline_id]
@@ -7020,16 +6930,68 @@ class UserFormService extends BaseApiService {
   }
   async refreshStore() {
     const { store } = this.client;
-    const result = await this.client.enqueueRequest({
-      description: "Fetch user forms",
+    const activeProjectId = store.getState().projectReducer.activeProjectId;
+    if (!activeProjectId) {
+      throw new Error("No active project");
+    }
+    const forms = [];
+    const revisions = [];
+    const attachments = [];
+    const projectFormsResult = await this.client.enqueueRequest({
+      description: "Fetch project forms",
       method: HttpMethod.GET,
-      url: `/forms/in-project/${store.getState().projectReducer.activeProjectId}/forms/`,
-      blockers: [],
+      url: `/projects/${activeProjectId}/forms/`,
+      blockers: [activeProjectId.toString()],
+      blocks: []
+    });
+    for (const form of projectFormsResult.forms)
+      forms.push(form);
+    for (const revision of projectFormsResult.revisions)
+      revisions.push(revision);
+    for (const attachment of projectFormsResult.attachments)
+      attachments.push(attachment);
+    const organizationFormsResult = await this.client.enqueueRequest({
+      description: "Fetch organization forms",
+      method: HttpMethod.GET,
+      url: `/projects/${activeProjectId}/organizations/forms/`,
+      blockers: [activeProjectId.toString()],
       blocks: []
     });
-    store.dispatch(setForms(Object.values(result.forms)));
-    store.dispatch(setFormRevisions(Object.values(result.revisions)));
-    store.dispatch(setFormRevisionAttachments(Object.values(result.attachments)));
+    for (const form of organizationFormsResult.forms)
+      forms.push(form);
+    for (const revision of organizationFormsResult.revisions)
+      revisions.push(revision);
+    for (const attachment of organizationFormsResult.attachments)
+      attachments.push(attachment);
+    const assetTypeFormsResult = await this.client.enqueueRequest({
+      description: "Fetch asset type forms",
+      method: HttpMethod.GET,
+      url: `/projects/${activeProjectId}/asset-types/forms/`,
+      blockers: [activeProjectId.toString()],
+      blocks: []
+    });
+    for (const form of assetTypeFormsResult.forms)
+      forms.push(form);
+    for (const revision of assetTypeFormsResult.latest_revisions)
+      revisions.push(revision);
+    for (const attachment of assetTypeFormsResult.attachments)
+      attachments.push(attachment);
+    const issueTypeFormsResult = await this.client.enqueueRequest({
+      description: "Fetch issue type forms",
+      method: HttpMethod.GET,
+      url: `/projects/${activeProjectId}/issue-types/forms/`,
+      blockers: [activeProjectId.toString()],
+      blocks: []
+    });
+    for (const form of issueTypeFormsResult.forms)
+      forms.push(form);
+    for (const revision of issueTypeFormsResult.latest_revisions)
+      revisions.push(revision);
+    for (const attachment of issueTypeFormsResult.attachments)
+      attachments.push(attachment);
+    store.dispatch(setForms(forms));
+    store.dispatch(setFormRevisions(revisions));
+    store.dispatch(setFormRevisionAttachments(attachments));
   }
 }
 const isArrayOfFiles = (value) => {
@@ -18485,7 +18447,6 @@ const styles$2 = {
   regularIcon
 };
 const orgOptionPrefix = "organization:";
-const userOptionPrefix = "user:";
 const FormBrowser = memo(
   forwardRef((props, ref) => {
     const { maxResults = 20, ...entryProps } = props;
@@ -18496,9 +18457,7 @@ const FormBrowser = memo(
       const ret = { maxResults, searchTerm: filter };
       if (ownerFilter) {
         if (ownerFilter.startsWith(orgOptionPrefix)) {
-          ret.owner_organization = parseInt(ownerFilter.slice(orgOptionPrefix.length));
-        } else if (ownerFilter.startsWith(userOptionPrefix)) {
-          ret.owner_user = parseInt(ownerFilter.slice(userOptionPrefix.length));
+          ret.organization = parseInt(ownerFilter.slice(orgOptionPrefix.length));
         }
       }
       return ret;
@@ -18523,14 +18482,10 @@ const FormBrowser = memo(
       const state = sdk.store.getState();
       const accumulator = {};
       for (const form of attachableUserFormMapping) {
-        const organization = selectOrganization(form.owner_organization || -1)(state);
+        const organization = selectOrganization(form.organization || -1)(state);
         if (organization) {
           accumulator[`${orgOptionPrefix}${organization.id}`] = organization.name;
         }
-        const user = selectUser(form.owner_user || -1)(state);
-        if (user) {
-          accumulator[`${userOptionPrefix}${user.id}`] = user.username;
-        }
       }
       return Object.entries(accumulator).map(([value, label]) => ({ itemContent: label, value }));
     }, [sdk.store, attachableUserFormMapping]);
@@ -18572,11 +18527,7 @@ const FormBrowser = memo(
 const FormBrowserEntry = (props) => {
   var _a2;
   const { form, onSelectForm, isFavoriteEditable, handleToggleFavorite } = props;
-  const ownerOrganization = (_a2 = useSelector(selectOrganization(form.owner_organization || -1))) == null ? void 0 : _a2.name;
-  const ownerUser = useSelector(selectUser(form.owner_user || -1));
-  const currentUserId = useSelector(selectCurrentUser).id;
-  const ownedByCurrentUser = !!ownerUser && ownerUser.id === currentUserId;
-  const owner = ownerOrganization ?? (ownedByCurrentUser ? "You" : ownerUser == null ? void 0 : ownerUser.username) ?? "Unknown";
+  const ownerOrganization = (_a2 = useSelector(selectOrganization(form.organization || -1))) == null ? void 0 : _a2.name;
   const handleFavoriteClick = useCallback(
     (e) => {
       e.stopPropagation();
@@ -18607,10 +18558,10 @@ const FormBrowserEntry = (props) => {
           /* @__PURE__ */ jsx(Text, { children: form.latestRevision.title }),
           form.latestRevision.description && /* @__PURE__ */ jsx(RiIcon, { icon: "RiQuestionLine" })
         ] }),
-        owner && /* @__PURE__ */ jsxs(Flex, { align: "center", gap: "2", children: [
+        ownerOrganization && /* @__PURE__ */ jsxs(Flex, { align: "center", gap: "2", children: [
           /* @__PURE__ */ jsx(RiIcon, { icon: "RiUserLine" }),
           " ",
-          owner
+          ownerOrganization
         ] })
       ] })
     }
@@ -19880,7 +19831,6 @@ export {
   LicenseService,
   LicenseStatus,
   MainService,
-  MapStyle,
   MultiSelectField,
   MultiSelectInput,
   MultiStringField,
@@ -19905,7 +19855,6 @@ export {
   ProjectAttachmentService,
   ProjectFileService,
   ProjectService,
-  ProjectType,
   QrField,
   QrInput,
   QrScanner,
@@ -20091,8 +20040,6 @@ export {
   literalToCoordinates,
   logOnlyOnce,
   makeClient,
-  mapReducer,
-  mapSlice,
   markAsDeleted,
   markForDeletion,
   markerCoordinatesToText,
@@ -20222,7 +20169,6 @@ export {
   selectCategory,
   selectCategoryMapping,
   selectCategoryVisibility,
-  selectCenterMapToProject,
   selectCommentMapping,
   selectCommentsOfIssue,
   selectCompletedStageIdsForAsset,
@@ -20230,7 +20176,6 @@ export {
   selectConversation,
   selectConversationMapping,
   selectConversations,
-  selectCreateProjectType,
   selectCurrentUser,
   selectDeletedRequests,
   selectDocument,
@@ -20240,12 +20185,10 @@ export {
   selectDocumentsMapping,
   selectEmailDomainsAsMapping,
   selectEnableClustering,
-  selectEnableDuplicateIssues,
   selectEnablePlacementMode,
   selectEnableSvgLayout,
   selectEnabledProjectFileMapping,
   selectEnabledProjectFiles,
-  selectExpandedSections,
   selectFavouriteProjects,
   selectFileAttachmentsOfIssue,
   selectFilteredForms,
@@ -20299,7 +20242,6 @@ export {
   selectLicenses,
   selectLicensesForProjectsMapping,
   selectMainWorkspace,
-  selectMapStyle,
   selectNumberOfAssetTypesMatchingCaseInsensitiveName,
   selectNumberOfAssetsOfAssetType,
   selectOrganization,
@@ -20329,10 +20271,8 @@ export {
   selectProjectsWithAccess,
   selectRecentIssueIds,
   selectRecentIssuesAsSearchResults,
-  selectRecentProjects,
   selectRehydrated,
   selectRootDocuments,
-  selectShowTooltips,
   selectSortedEmailDomains,
   selectSortedFormSubmissionsOfForm,
   selectSortedOrganizationLicenses,
@@ -20374,17 +20314,14 @@ export {
   setAssetTypes,
   setAssets,
   setCategories,
-  setCenterMapToProject,
   setConversation,
   setConversations,
-  setCreateProjectType,
   setCurrentUser,
   setDocumentAttachment,
   setDocumentAttachments,
   setDocuments,
   setEmailDomains,
   setEnableClustering,
-  setEnableDuplicateIssues,
   setEnablePlacementMode,
   setEnableSvgLayout,
   setFormRevision,
@@ -20407,7 +20344,6 @@ export {
   setIssues,
   setLicenses,
   setLoggedIn,
-  setMapStyle,
   setOrganizationAccesses,
   setOrganizations,
   setProfilePicture,
@@ -20417,8 +20353,6 @@ export {
   setProjectFileVisible,
   setProjects,
   setRehydrated,
-  setSectionExpanded,
-  setShowTooltips,
   setStageCompletions,
   setTeam,
   setTeams,