@overmap-ai/core 1.0.63-org-projs-only.1 → 1.0.63-org-doc-improvements.1

package/dist/overmap-core.js

@@ -379,15 +379,15 @@ const wrapMigration = (migrator) => (state) => {
 };
 const migrations = [initialVersioning, signOut, signOut, createOutboxState];
 const manifest = Object.fromEntries(migrations.map((migration2, i) => [i, wrapMigration(migration2)]));
-const initialState$B = {
+const initialState$C = {
   accessToken: "",
   refreshToken: "",
   isLoggedIn: false
 };
 const authSlice = createSlice({
   name: "auth",
-  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: {
     setTokens: (state, action) => {
       state.accessToken = action.payload.accessToken;
@@ -857,11 +857,11 @@ function createModelAdapter(computeModelId) {
   };
 }
 const categoryAdapter = createModelAdapter((category) => category.offline_id);
-const initialState$A = categoryAdapter.getInitialState({});
+const initialState$B = categoryAdapter.getInitialState({});
 const categorySlice = createSlice({
   name: "categories",
-  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: {
     initializeCategories: categoryAdapter.initialize,
     addCategory: categoryAdapter.addOne,
@@ -891,11 +891,11 @@ const selectIssueCountOfCategory = (categoryId) => (state) => {
 };
 const categoryReducer = categorySlice.reducer;
 const assetTypeAdapter = createModelAdapter((assetType) => assetType.offline_id);
-const initialState$z = assetTypeAdapter.getInitialState({});
+const initialState$A = assetTypeAdapter.getInitialState({});
 const assetTypeSlice = createSlice({
   name: "assetTypes",
-  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: {
     initializeAssetTypes: assetTypeAdapter.initialize,
     addAssetType: assetTypeAdapter.addOne,
@@ -940,11 +940,11 @@ const selectAssetTypesByName = restructureCreateSelectorWithArgs(
 );
 const assetTypeReducer = assetTypeSlice.reducer;
 const assetAdapter = createModelAdapter((asset) => asset.offline_id);
-const initialState$y = assetAdapter.getInitialState({});
+const initialState$z = assetAdapter.getInitialState({});
 const assetSlice = createSlice({
   name: "assets",
-  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: {
     initializeAssets: (state, action) => {
       assetAdapter.initialize(state, action);
@@ -1047,11 +1047,11 @@ const selectAssetTypesFromIds = (assetTypeIds) => (state) => {
 };
 const assetReducer = assetSlice.reducer;
 const assetAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
-const initialState$x = assetAttachmentAdapter.getInitialState({});
+const initialState$y = assetAttachmentAdapter.getInitialState({});
 const assetAttachmentSlice = createSlice({
   name: "assetAttachments",
-  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: {
     initializeAssetAttachments: assetAttachmentAdapter.initialize,
     addAssetAttachment: assetAttachmentAdapter.addOne,
@@ -1109,13 +1109,13 @@ const selectAttachmentsOfAssetByType = restructureCreateSelectorWithArgs(
   )
 );
 const assetAttachmentReducer = assetAttachmentSlice.reducer;
-const initialState$w = {
+const initialState$x = {
   completionsByAssetId: {}
 };
 const assetStageCompletionSlice = createSlice({
   name: "assetStageCompletions",
-  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: {
     addStageCompletion: (state, action) => {
       let stageToCompletionDateMapping = state.completionsByAssetId[action.payload.asset];
@@ -1167,11 +1167,11 @@ const selectCompletedStageIdsForAsset = restructureCreateSelectorWithArgs(
 );
 const assetStageCompletionReducer = assetStageCompletionSlice.reducer;
 const assetStageAdapter = createModelAdapter((assetStage) => assetStage.offline_id);
-const initialState$v = assetStageAdapter.getInitialState({});
+const initialState$w = assetStageAdapter.getInitialState({});
 const assetStageSlice = createSlice({
   name: "assetStages",
-  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: {
     initializeStages: assetStageAdapter.initialize,
     setStage: assetStageAdapter.setOne,
@@ -1252,11 +1252,11 @@ const assetStageReducer = assetStageSlice.reducer;
 const assetTypeAttachmentAdapter = createModelAdapter(
   (attachment) => attachment.offline_id
 );
-const initialState$u = assetTypeAttachmentAdapter.getInitialState({});
+const initialState$v = assetTypeAttachmentAdapter.getInitialState({});
 const assetTypeAttachmentSlice = createSlice({
   name: "assetTypeAttachments",
-  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: {
     initializeAssetTypeAttachments: assetTypeAttachmentAdapter.initialize,
     addAssetTypeAttachment: assetTypeAttachmentAdapter.addOne,
@@ -1315,10 +1315,10 @@ const selectAttachmentsOfAssetTypeByType = restructureCreateSelectorWithArgs(
 );
 const assetTypeAttachmentReducer = assetTypeAttachmentSlice.reducer;
 const workspaceAdapter = createModelAdapter((workspace) => workspace.offline_id);
-const initialState$t = workspaceAdapter.getInitialState({});
+const initialState$u = workspaceAdapter.getInitialState({});
 const workspaceSlice = createSlice({
   name: "workspace",
-  initialState: initialState$t,
+  initialState: initialState$u,
   reducers: {
     initializeWorkspaces: workspaceAdapter.initialize,
     setWorkspaces: workspaceAdapter.setMany,
@@ -1350,14 +1350,14 @@ const selectPermittedWorkspaceIds = createSelector(
 const workspaceReducer = workspaceSlice.reducer;
 const maxRecentIssues = 10;
 const issueAdapter = createModelAdapter((issue) => issue.offline_id);
-const initialState$s = issueAdapter.getInitialState({
+const initialState$t = issueAdapter.getInitialState({
   recentIssueIds: []
 });
 const issueSlice = createSlice({
   name: "issues",
-  initialState: initialState$s,
+  initialState: initialState$t,
   extraReducers: (builder) => builder.addCase("RESET", (state) => {
-    Object.assign(state, initialState$s);
+    Object.assign(state, initialState$t);
   }),
   reducers: {
     initializeIssues: issueAdapter.initialize,
@@ -1501,12 +1501,12 @@ const selectRecentIssuesAsSearchResults = createSelector(
 );
 const issueReducer = issueSlice.reducer;
 const issueTypeAdapter = createModelAdapter((issueType) => issueType.offline_id);
-const initialState$r = issueTypeAdapter.getInitialState({});
+const initialState$s = issueTypeAdapter.getInitialState({});
 const issueTypeSlice = createSlice({
   name: "issueTypes",
-  initialState: initialState$r,
+  initialState: initialState$s,
   extraReducers: (builder) => builder.addCase("RESET", (state) => {
-    Object.assign(state, initialState$r);
+    Object.assign(state, initialState$s);
   }),
   reducers: {
     initializeIssueTypes: issueTypeAdapter.initialize,
@@ -1555,15 +1555,15 @@ const selectIssuesOfIssueTypeCount = (issueTypeId) => (state) => {
   return ((_a2 = selectIssuesOfIssueType(issueTypeId)(state)) == null ? void 0 : _a2.length) ?? 0;
 };
 const issueTypeReducer = issueTypeSlice.reducer;
-const initialState$q = {
+const initialState$r = {
   s3Urls: {}
 };
 const msPerHour = 1e3 * 60 * 60;
 const msPerWeek = msPerHour * 24 * 7;
 const fileSlice = createSlice({
   name: "file",
-  initialState: initialState$q,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$q)),
+  initialState: initialState$r,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$r)),
   reducers: {
     setUploadUrl: (state, action) => {
       const { url, fields, sha1 } = action.payload;
@@ -1644,7 +1644,7 @@ var LicenseStatus = /* @__PURE__ */ ((LicenseStatus2) => {
   LicenseStatus2[LicenseStatus2["PAST_DUE"] = 8] = "PAST_DUE";
   return LicenseStatus2;
 })(LicenseStatus || {});
-const initialState$p = {
+const initialState$q = {
   users: {},
   currentUser: {
     id: 0,
@@ -1655,8 +1655,8 @@ const initialState$p = {
 };
 const userSlice = createSlice({
   name: "users",
-  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: {
     setUsers: (state, action) => {
       const usersMapping = {};
@@ -1721,11 +1721,11 @@ const userReducer = userSlice.reducer;
 const organizationAccessAdapter = createModelAdapter(
   (organizationAccess) => organizationAccess.offline_id
 );
-const initialState$o = organizationAccessAdapter.getInitialState({});
+const initialState$p = organizationAccessAdapter.getInitialState({});
 const organizationAccessSlice = createSlice({
   name: "organizationAccess",
-  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: {
     initializeOrganizationAccesses: organizationAccessAdapter.initialize,
     updateOrganizationAccess: organizationAccessAdapter.updateOne,
@@ -1762,11 +1762,11 @@ const selectOrganizationAccessUserMapping = (state) => {
 };
 const organizationAccessReducer = organizationAccessSlice.reducer;
 const licenseAdapter = createModelAdapter((license) => license.offline_id);
-const initialState$n = licenseAdapter.getInitialState({});
+const initialState$o = licenseAdapter.getInitialState({});
 const licenseSlice = createSlice({
   name: "license",
-  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: {
     initializeLicences: licenseAdapter.initialize,
     addLicenses: licenseAdapter.addMany,
@@ -1792,11 +1792,11 @@ const selectLicensesForProjectsMapping = createSelector(
 );
 const licenseReducer = licenseSlice.reducer;
 const projectAccessAdapter = createModelAdapter((projectAccess) => projectAccess.offline_id);
-const initialState$m = projectAccessAdapter.getInitialState({});
+const initialState$n = projectAccessAdapter.getInitialState({});
 const projectAccessSlice = createSlice({
   name: "projectAccess",
-  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: {
     initializeProjectAccesses: projectAccessAdapter.initialize,
     updateProjectAccess: projectAccessAdapter.updateOne,
@@ -1842,14 +1842,14 @@ const selectProjectAccessUserMapping = (state) => {
   return projectAccesses;
 };
 const projectAccessReducer = projectAccessSlice.reducer;
-const initialState$l = {
+const initialState$m = {
   projects: {},
   activeProjectId: null
 };
 const projectSlice = createSlice({
   name: "projects",
-  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: {
     setProjects: (state, action) => {
       const projectsMap = {};
@@ -1963,13 +1963,13 @@ const selectSortedProjectUsers = createSelector(
     });
   }
 );
-const initialState$k = {
+const initialState$l = {
   organizations: {}
 };
 const organizationSlice = createSlice({
   name: "organizations",
-  initialState: initialState$k,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
+  initialState: initialState$l,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
   reducers: {
     setOrganizations: (state, action) => {
       for (const org of action.payload) {
@@ -2052,14 +2052,14 @@ const createOfflineAction = (request2, baseUrl, serviceName) => {
     }
   };
 };
-const initialState$j = {
+const initialState$k = {
   deletedRequests: [],
   latestRetryTime: 0
 };
 const outboxSlice = createSlice({
   name: "outbox",
-  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: {
     // 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
@@ -2091,15 +2091,15 @@ const selectDeletedRequests = (state) => state.outboxReducer.deletedRequests;
 const selectLatestRetryTime = (state) => state.outboxReducer.latestRetryTime;
 const { enqueueRequest, markForDeletion, markAsDeleted, _setLatestRetryTime } = outboxSlice.actions;
 const outboxReducer = outboxSlice.reducer;
-const initialState$i = {
+const initialState$j = {
   projectFiles: {},
   activeProjectFileId: null,
   isImportingProjectFile: false
 };
 const projectFileSlice = createSlice({
   name: "projectFiles",
-  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: {
     addOrReplaceProjectFiles: (state, action) => {
       for (let fileObj of action.payload) {
@@ -2184,11 +2184,11 @@ const selectProjectFileById = (id) => (state) => {
 };
 const projectFileReducer = projectFileSlice.reducer;
 const projectAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
-const initialState$h = projectAttachmentAdapter.getInitialState({});
+const initialState$i = projectAttachmentAdapter.getInitialState({});
 const projectAttachmentSlice = createSlice({
   name: "projectAttachments",
-  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: {
     initializeProjectAttachments: projectAttachmentAdapter.initialize,
     addProjectAttachment: projectAttachmentAdapter.addOne,
@@ -2246,12 +2246,12 @@ const selectAttachmentsOfProjectByType = restructureCreateSelectorWithArgs(
   )
 );
 const projectAttachmentReducer = projectAttachmentSlice.reducer;
-const initialState$g = {
+const initialState$h = {
   isRehydrated: false
 };
 const rehydratedSlice = createSlice({
   name: "rehydrated",
-  initialState: initialState$g,
+  initialState: initialState$h,
   // The `reducers` field lets us define reducers and generate associated actions
   reducers: {
     setRehydrated: (state, action) => {
@@ -2262,13 +2262,13 @@ const rehydratedSlice = createSlice({
 const { setRehydrated } = rehydratedSlice.actions;
 const selectRehydrated = (state) => state.rehydratedReducer.isRehydrated;
 const rehydratedReducer = rehydratedSlice.reducer;
-const initialState$f = {
+const initialState$g = {
   isFetchingInitialData: false
 };
 const settingSlice = createSlice({
   name: "settings",
-  initialState: initialState$f,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$f)),
+  initialState: initialState$g,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$g)),
   reducers: {
     setIsFetchingInitialData: (state, action) => {
       state.isFetchingInitialData = action.payload;
@@ -2292,11 +2292,11 @@ const formRevisionSortFn = (formRevisionA, formRevisionB) => {
   }
 };
 const formRevisionAdapter = createModelAdapter((revision) => revision.offline_id);
-const initialState$e = formRevisionAdapter.getInitialState({});
+const initialState$f = formRevisionAdapter.getInitialState({});
 const formRevisionsSlice = createSlice({
   name: "formRevisions",
-  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: {
     initializeFormRevisions: formRevisionAdapter.initialize,
     setFormRevision: formRevisionAdapter.setOne,
@@ -2396,11 +2396,11 @@ const selectLatestFormRevisionByForm = createSelector([selectFormRevisionMapping
 });
 const formRevisionReducer = formRevisionsSlice.reducer;
 const formAdapter = createModelAdapter((form) => form.offline_id);
-const initialState$d = formAdapter.getInitialState({});
+const initialState$e = formAdapter.getInitialState({});
 const formSlice = createSlice({
   name: "forms",
-  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: {
     initializeForms: formAdapter.initialize,
     setForm: formAdapter.setOne,
@@ -2480,11 +2480,11 @@ const selectGeneralFormCount = createSelector([selectFormMapping], (formsMapping
 });
 const formReducer = formSlice.reducer;
 const submissionAdapter = createModelAdapter((submission) => submission.offline_id);
-const initialState$c = submissionAdapter.getInitialState({});
+const initialState$d = submissionAdapter.getInitialState({});
 const formSubmissionSlice = createSlice({
   name: "formSubmissions",
-  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: {
     initializeFormSubmissions: submissionAdapter.initialize,
     setFormSubmission: submissionAdapter.setOne,
@@ -2594,8 +2594,10 @@ const selectAttachedFormSubmissionsOfIssue = restructureCreateSelectorWithArgs(
     ],
     (issues, forms, formRevisions, submissions, issueId) => {
       const issue = issues[issueId];
-      if (!issue || !issue.issue_type) {
+      if (!issue)
         return [];
+      if (!issue.issue_type) {
+        return Object.values(submissions).filter((submission) => submission.issue === issueId);
       }
       const issueTypeForms = new Set(
         Object.keys(forms).filter((formId) => forms[formId].issue_type === issue.issue_type)
@@ -2650,8 +2652,10 @@ const selectAttachedFormSubmissionsOfAsset = restructureCreateSelectorWithArgs(
     ],
     (assets, forms, formRevisions, submissions, assetId) => {
       const asset = assets[assetId];
-      if (!asset || !asset.asset_type) {
+      if (!asset)
         return [];
+      if (!asset.asset_type) {
+        return Object.values(submissions).filter((submission) => submission.asset === assetId);
       }
       const issueTypeForms = new Set(
         Object.keys(forms).filter((formId) => forms[formId].asset_type === asset.asset_type)
@@ -2688,11 +2692,11 @@ const formSubmissionReducer = formSubmissionSlice.reducer;
 const formSubmissionAttachmentAdapter = createModelAdapter(
   (attachment) => attachment.offline_id
 );
-const initialState$b = formSubmissionAttachmentAdapter.getInitialState({});
+const initialState$c = formSubmissionAttachmentAdapter.getInitialState({});
 const formSubmissionAttachmentSlice = createSlice({
   name: "formSubmissionAttachments",
-  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: {
     initializeFormSubmissionAttachments: formSubmissionAttachmentAdapter.initialize,
     addFormSubmissionAttachment: formSubmissionAttachmentAdapter.addOne,
@@ -2731,11 +2735,11 @@ const formSubmissionAttachmentReducer = formSubmissionAttachmentSlice.reducer;
 const formRevisionAttachmentAdapter = createModelAdapter(
   (attachment) => attachment.offline_id
 );
-const initialState$a = formRevisionAttachmentAdapter.getInitialState({});
+const initialState$b = formRevisionAttachmentAdapter.getInitialState({});
 const formRevisionAttachmentSlice = createSlice({
   name: "formRevisionAttachments",
-  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: {
     initializeFormRevisionAttachments: formRevisionAttachmentAdapter.initialize,
     addFormRevisionAttachment: formRevisionAttachmentAdapter.addOne,
@@ -2772,10 +2776,10 @@ const selectAttachmentsOfFormRevision = restructureCreateSelectorWithArgs(
 );
 const formRevisionAttachmentReducer = formRevisionAttachmentSlice.reducer;
 const emailDomainAdapter = createModelAdapter((emailDomain) => emailDomain.offline_id);
-const initialState$9 = emailDomainAdapter.getInitialState({});
+const initialState$a = emailDomainAdapter.getInitialState({});
 const emailDomainsSlice = createSlice({
   name: "emailDomains",
-  initialState: initialState$9,
+  initialState: initialState$a,
   reducers: {
     initializeEmailDomains: emailDomainAdapter.initialize,
     addEmailDomain: emailDomainAdapter.addOne,
@@ -2794,14 +2798,14 @@ const selectEmailDomainsOfOrganization = restructureCreateSelectorWithArgs(
   )
 );
 const emailDomainsReducer = emailDomainsSlice.reducer;
-const initialState$8 = {
+const initialState$9 = {
   documents: {}
 };
 const documentSlice = createSlice({
   name: "documents",
-  initialState: initialState$8,
+  initialState: initialState$9,
   extraReducers: (builder) => builder.addCase("RESET", (state) => {
-    Object.assign(state, initialState$8);
+    Object.assign(state, initialState$9);
   }),
   reducers: {
     setDocuments: (state, action) => {
@@ -2976,11 +2980,11 @@ const selectRootDocuments = createSelector(
 );
 const documentsReducer = documentSlice.reducer;
 const documentAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
-const initialState$7 = documentAttachmentAdapter.getInitialState({});
+const initialState$8 = documentAttachmentAdapter.getInitialState({});
 const documentAttachmentSlice = createSlice({
   name: "documentAttachments",
-  initialState: initialState$7,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$7)),
+  initialState: initialState$8,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$8)),
   reducers: {
     initializeDocumentAttachments: documentAttachmentAdapter.initialize,
     addDocumentAttachment: documentAttachmentAdapter.addOne,
@@ -3039,11 +3043,11 @@ const selectAttachmentsOfDocumentByType = restructureCreateSelectorWithArgs(
 );
 const documentAttachmentReducer = documentAttachmentSlice.reducer;
 const teamAdapter = createModelAdapter((team) => team.offline_id);
-const initialState$6 = teamAdapter.getInitialState({});
+const initialState$7 = teamAdapter.getInitialState({});
 const teamSlice = createSlice({
   name: "teams",
-  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: {
     setTeam: teamAdapter.setOne,
     initializeTeams: teamAdapter.initialize,
@@ -3077,11 +3081,11 @@ const teamReducer = teamSlice.reducer;
 const agentUserConversationAdapter = createModelAdapter(
   (conversation) => conversation.offline_id
 );
-const initialState$5 = agentUserConversationAdapter.getInitialState({});
+const initialState$6 = agentUserConversationAdapter.getInitialState({});
 const agentsSlice = createSlice({
   name: "agents",
-  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: {
     initializeConversations: agentUserConversationAdapter.initialize,
     addConversation: agentUserConversationAdapter.addOne,
@@ -3103,11 +3107,11 @@ const selectConversation = restructureCreateSelectorWithArgs(
 );
 const agentsReducer = agentsSlice.reducer;
 const issueCommentAdapter = createModelAdapter((comment) => comment.offline_id);
-const initialState$4 = issueCommentAdapter.getInitialState({});
+const initialState$5 = issueCommentAdapter.getInitialState({});
 const issueCommentSlice = createSlice({
   name: "issueComments",
-  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: {
     addIssueComment: issueCommentAdapter.addOne,
     addIssueComments: issueCommentAdapter.addMany,
@@ -3136,11 +3140,11 @@ const selectCommentsOfIssue = restructureCreateSelectorWithArgs(
 );
 const issueCommentReducer = issueCommentSlice.reducer;
 const issueUpdateAdapter = createModelAdapter((issueUpdate) => issueUpdate.offline_id);
-const initialState$3 = issueUpdateAdapter.getInitialState({});
+const initialState$4 = issueUpdateAdapter.getInitialState({});
 const issueUpdateSlice = createSlice({
   name: "issueUpdates",
-  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: {
     initializeIssueUpdates: issueUpdateAdapter.setMany,
     setIssueUpdate: issueUpdateAdapter.setOne,
@@ -3169,11 +3173,11 @@ const selectIssueUpdatesOfIssue = restructureCreateSelectorWithArgs(
 );
 const issueUpdateReducer = issueUpdateSlice.reducer;
 const issueAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
-const initialState$2 = issueAttachmentAdapter.getInitialState({});
+const initialState$3 = issueAttachmentAdapter.getInitialState({});
 const issueAttachmentSlice = createSlice({
   name: "issueAttachments",
-  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: {
     initializeIssueAttachments: issueAttachmentAdapter.initialize,
     addIssueAttachment: issueAttachmentAdapter.addOne,
@@ -3231,23 +3235,23 @@ const selectAttachmentsOfIssueByType = restructureCreateSelectorWithArgs(
   )
 );
 const issueAttachmentReducer = issueAttachmentSlice.reducer;
-const initialState$1 = {
+const initialState$2 = {
   version: 0
 };
 const versioningSlice = createSlice({
   name: "versioning",
-  initialState: initialState$1,
+  initialState: initialState$2,
   reducers: {}
 });
 const versioningReducer = versioningSlice.reducer;
 const geoImageAdapter = createModelAdapter((model) => model.offline_id);
-const initialState = geoImageAdapter.getInitialState({});
+const initialState$1 = geoImageAdapter.getInitialState({});
 const geoImageSlice = createSlice({
   name: "geoImages",
-  initialState,
+  initialState: initialState$1,
   extraReducers: (builder) => {
     builder.addCase("RESET", (state) => {
-      Object.assign(state, initialState);
+      Object.assign(state, initialState$1);
     });
   },
   reducers: {
@@ -3284,6 +3288,64 @@ const selectGeoImagesOfProject = restructureCreateSelectorWithArgs(
   })
 );
 const geoImageReducer = geoImageSlice.reducer;
+const issueAssociationAdapter = createModelAdapter((assoc) => assoc.offline_id);
+const initialState = issueAssociationAdapter.getInitialState({});
+const issueAssociationSlice = createSlice({
+  name: "issueAssociations",
+  initialState,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState)),
+  reducers: {
+    initializeIssueAssociations: issueAssociationAdapter.initialize,
+    addIssueAssociation: issueAssociationAdapter.addOne,
+    addIssueAssociations: issueAssociationAdapter.addMany,
+    setIssueAssociation: issueAssociationAdapter.setOne,
+    setIssueAssociations: issueAssociationAdapter.setMany,
+    updateIssueAssociation: issueAssociationAdapter.updateOne,
+    updateIssueAssociations: issueAssociationAdapter.updateMany,
+    deleteIssueAssociation: issueAssociationAdapter.deleteOne,
+    deleteIssueAssociations: issueAssociationAdapter.deleteMany
+  }
+});
+const {
+  initializeIssueAssociations,
+  setIssueAssociations,
+  setIssueAssociation,
+  updateIssueAssociation,
+  updateIssueAssociations,
+  addIssueAssociation,
+  addIssueAssociations,
+  deleteIssueAssociation,
+  deleteIssueAssociations
+} = issueAssociationSlice.actions;
+const selectIssueAssociationMapping = (state) => state.issueAssociationReducer.instances;
+const selectIssueAssociationById = (id) => (state) => {
+  return state.issueAssociationReducer.instances[id];
+};
+const selectIssueAssociationsToIssue = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectIssueAssociationMapping, (_state, issueId) => issueId],
+    (associationMapping, issueId) => {
+      return Object.values(associationMapping).filter((assoc) => assoc.associated_issue === issueId);
+    }
+  )
+);
+const selectIssueAssociationsOfIssue = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectIssueAssociationMapping, (_state, issueId) => issueId],
+    (associationMapping, issueId) => {
+      return Object.values(associationMapping).filter((assoc) => assoc.issue === issueId);
+    }
+  )
+);
+const selectIssueAssociationsOfAsset = restructureCreateSelectorWithArgs(
+  createSelector(
+    [selectIssueAssociationMapping, (_state, assetId) => assetId],
+    (associationMapping, assetId) => {
+      return Object.values(associationMapping).filter((assoc) => assoc.asset === assetId);
+    }
+  )
+);
+const issueAssociationReducer = issueAssociationSlice.reducer;
 const fullAssetMarkerSize = 45;
 const DEFAULT_ISSUE_STATUS = IssueStatus.BACKLOG;
 const DEFAULT_ISSUE_PRIORITY = IssuePriority.MEDIUM;
@@ -3356,7 +3418,8 @@ const overmapReducers = {
   agentsReducer,
   issueCommentReducer,
   issueUpdateReducer,
-  geoImageReducer
+  geoImageReducer,
+  issueAssociationReducer
 };
 const overmapReducer = combineReducers(overmapReducers);
 const resetStore = "RESET";
@@ -4147,11 +4210,13 @@ class AssetService extends BaseApiService {
   }
   async remove(assetId) {
     const { store } = this.client;
-    const assetToBeDeleted = selectAsset(assetId)(store.getState());
+    const state = store.getState();
+    const assetToBeDeleted = selectAsset(assetId)(state);
     if (!assetToBeDeleted)
       throw new Error(`No asset with id ${assetId} found in the store`);
-    const attachmentsOfAssets = selectAttachmentsOfAsset(assetId)(store.getState());
-    const formSubmissionsOfAssets = selectFormSubmissionsOfAsset(assetId)(store.getState());
+    const attachmentsOfAssets = selectAttachmentsOfAsset(assetId)(state);
+    const formSubmissionsOfAssets = selectFormSubmissionsOfAsset(assetId)(state);
+    const issueAssociations = selectIssueAssociationsOfAsset(assetId)(state);
     this.dispatch(deleteAsset(assetId));
     if (attachmentsOfAssets.length > 0) {
       const attachmentsOfAssetIds = attachmentsOfAssets.map(({ offline_id }) => offline_id);
@@ -4161,6 +4226,10 @@ class AssetService extends BaseApiService {
       const formSubmissionsOfAssetIds = formSubmissionsOfAssets.map(({ offline_id }) => offline_id);
       this.dispatch(deleteFormSubmissions(formSubmissionsOfAssetIds));
     }
+    if (issueAssociations.length > 0) {
+      const issueAssociationsIds = issueAssociations.map(({ offline_id }) => offline_id);
+      this.dispatch(deleteIssueAssociations(issueAssociationsIds));
+    }
     return this.enqueueRequest({
       description: "Delete asset",
       method: HttpMethod.DELETE,
@@ -4171,6 +4240,7 @@ class AssetService extends BaseApiService {
       this.dispatch(addAsset(assetToBeDeleted));
       this.dispatch(addAssetAttachments(attachmentsOfAssets));
       this.dispatch(addFormSubmissions(formSubmissionsOfAssets));
+      this.dispatch(addIssueAssociations(issueAssociations));
       throw err;
     });
   }
@@ -5046,6 +5116,12 @@ class IssueService extends BaseApiService {
     const attachmentsOfIssue = selectAttachmentsOfIssue(id)(state);
     const updatesOfIssue = selectIssueUpdatesOfIssue(id)(state);
     const formSubmissionsOfIssue = selectFormSubmissionsOfIssue(id)(state);
+    const issueAssociationsRecord = {};
+    for (const issueAssociation of selectIssueAssociationsToIssue(id)(state))
+      issueAssociationsRecord[issueAssociation.offline_id] = issueAssociation;
+    for (const issueAssociation of selectIssueAssociationsOfIssue(id)(state))
+      issueAssociationsRecord[issueAssociation.offline_id] = issueAssociation;
+    const issueAssociations = Object.values(issueAssociationsRecord);
     this.dispatch(deleteIssue(id));
     this.dispatch(addActiveProjectIssuesCount(-1));
     if (attachmentsOfIssue.length > 0)
@@ -5054,6 +5130,8 @@ class IssueService extends BaseApiService {
       this.dispatch(deleteIssueUpdates(updatesOfIssue.map(({ offline_id }) => offline_id)));
     if (formSubmissionsOfIssue.length > 0)
       this.dispatch(deleteFormSubmissions(formSubmissionsOfIssue.map(({ offline_id }) => offline_id)));
+    if (issueAssociations.length > 0)
+      this.dispatch(deleteIssueAssociations(issueAssociations.map(({ offline_id }) => offline_id)));
     try {
       return await this.enqueueRequest({
         description: "Delete issue",
@@ -5068,6 +5146,7 @@ class IssueService extends BaseApiService {
       this.dispatch(addIssueUpdates(updatesOfIssue));
       this.dispatch(addActiveProjectIssuesCount(1));
       this.dispatch(addFormSubmissions(formSubmissionsOfIssue));
+      this.dispatch(addIssueAssociations(issueAssociations));
       throw e;
     }
   }
@@ -5111,7 +5190,7 @@ class IssueTypeService extends BaseApiService {
         offline_id: offlineIssueType.offline_id,
         submitted_at: offlineIssueType.submitted_at,
         icon: offlineIssueType.icon,
-        icon_color: offlineIssueType.icon_color,
+        icon_color: offlineIssueType.color,
         name: offlineIssueType.name,
         description: offlineIssueType.description
       },
@@ -5360,17 +5439,23 @@ class ProjectService extends BaseApiService {
    * @throws An APIError if the server returns an error, or any other error that may occur.
    */
   async add(project) {
+    if (!project.organization_owner && !project.user_owner) {
+      throw new Error("Project type was not chosen when trying to create a project");
+    }
     if (!project.bounds && !project.canvas_bounds) {
       throw new Error("Project must either have bounds or canvas_bounds set");
     }
+    const isOrganizationProject = !!project.organization_owner;
+    const url = isOrganizationProject ? `/organizations/${project.organization_owner}/projects/` : "/projects/";
+    const projectType = isOrganizationProject ? { organization_owner: project.organization_owner } : { user_owner: project.user_owner };
     return await this.enqueueRequest({
       description: "Create project",
       method: HttpMethod.POST,
-      url: "/projects/",
+      url,
       payload: {
         name: project.name,
         bounds: project.bounds,
-        organization_owner: project.organization_owner
+        ...projectType
       },
       blockers: [],
       blocks: []
@@ -5497,36 +5582,67 @@ const separateImageFromFields = async (fields) => {
   }
   return { fields: newFields, images };
 };
-class FormService extends BaseApiService {
-  constructor() {
-    super(...arguments);
-    // Attach images to revision, after uploading them to S3
-    __publicField(this, "getAttachImagePromises", (images, offlineRevisionId) => {
-      return Object.entries(images).map(async ([key, image]) => {
-        const sha1 = await hashFile(image);
-        await this.client.files.addCache(image, sha1);
-        const [fileProps] = await this.client.files.uploadFileToS3(sha1);
-        const revisionAttachmentPayload = offline({
-          ...fileProps,
-          revision: offlineRevisionId,
-          field_identifier: key
-        });
-        const attach = await this.enqueueRequest({
-          description: "Attach image to form revision field",
-          method: HttpMethod.POST,
-          url: `/forms/revisions/${offlineRevisionId}/attachments/`,
-          payload: revisionAttachmentPayload,
-          blockers: [revisionAttachmentPayload.revision],
-          blocks: [revisionAttachmentPayload.offline_id]
-        });
-        const offlinePayload = {
-          ...revisionAttachmentPayload,
-          file: URL.createObjectURL(image)
+class FormService extends BaseUploadService {
+  async bulkAddRevisionAttachments(revisionId, files) {
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const createdBy = this.client.store.getState().userReducer.currentUser.id;
+    const filePayloads = {};
+    const offlineFormRevisionAttachments = [];
+    const attachmentPayloads = [];
+    for (const [fieldIdentifier, file] of Object.entries(files)) {
+      const sha1 = await hashFile(file);
+      if (!(sha1 in filePayloads)) {
+        filePayloads[sha1] = {
+          sha1,
+          file_type: file.type,
+          extension: file.name.split(".").pop(),
+          size: file.size
         };
-        this.dispatch(addFormRevisionAttachment(offlinePayload));
-        return attach;
+        await this.client.files.addCache(file, sha1);
+      }
+      const offlineFormRevisionAttachment = offline({
+        file: URL.createObjectURL(file),
+        file_type: file.type,
+        file_name: file.name,
+        file_sha1: sha1,
+        created_by: createdBy,
+        revision: revisionId,
+        submitted_at: submittedAt,
+        field_identifier: fieldIdentifier
       });
+      offlineFormRevisionAttachments.push(offlineFormRevisionAttachment);
+      const attachmentPayload = {
+        offline_id: offlineFormRevisionAttachment.offline_id,
+        name: file.name,
+        field_identifier: fieldIdentifier,
+        sha1
+      };
+      attachmentPayloads.push(attachmentPayload);
+    }
+    this.dispatch(addFormRevisionAttachments(offlineFormRevisionAttachments));
+    const promise = this.enqueueRequest({
+      description: "Attach files to form revision",
+      method: HttpMethod.POST,
+      url: `/forms/revisions/${revisionId}/attachments/bulk/`,
+      payload: {
+        submitted_at: submittedAt,
+        attachments: attachmentPayloads,
+        files: Object.values(filePayloads)
+      },
+      blockers: [revisionId],
+      blocks: offlineFormRevisionAttachments.map((attachment) => attachment.offline_id)
     });
+    promise.then((result) => {
+      this.processPresignedUrls(result.presigned_urls);
+      this.dispatch(updateFormRevisionAttachments(result.attachments));
+    }).catch(() => {
+      this.dispatch(
+        deleteFormRevisionAttachments(
+          offlineFormRevisionAttachments.map((attachment) => attachment.offline_id)
+        )
+      );
+    });
+    return [offlineFormRevisionAttachments, promise.then(({ attachments }) => attachments)];
   }
   async add(ownerId, form, initialRevision, urlPrefix) {
     const { fields, images } = await separateImageFromFields(initialRevision.fields);
@@ -5559,14 +5675,16 @@ class FormService extends BaseApiService {
       blockers: [ownerId],
       blocks: [form.offline_id, offlineFormRevision.offline_id]
     });
-    const attachImagesPromises = this.getAttachImagePromises(images, offlineFormRevision.offline_id);
+    const [offlineFormRevisionAttachments, attachmentsPromise] = await this.bulkAddRevisionAttachments(
+      offlineFormRevision.offline_id,
+      images
+    );
     void formPromise.catch((e) => {
       this.dispatch(deleteForm(form.offline_id));
       this.dispatch(deleteFormRevision(offlineFormRevision.offline_id));
       throw e;
     });
-    const settledPromise = Promise.all([formPromise, ...attachImagesPromises]).then(() => formPromise);
-    return [form, offlineFormRevision, formPromise, settledPromise];
+    return [form, offlineFormRevision, offlineFormRevisionAttachments, formPromise, attachmentsPromise];
   }
   addForOrganization(organizationId, initialRevision) {
     const state = this.client.store.getState();
@@ -5648,14 +5766,16 @@ class FormService extends BaseApiService {
       blockers: [formId],
       blocks: [offlineRevision.offline_id]
     });
-    const attachImagesPromises = this.getAttachImagePromises(images, offlineRevision.offline_id);
+    const [offlineFormRevisionAttachments, attachmentsPromise] = await this.bulkAddRevisionAttachments(
+      fullRevision.offline_id,
+      images
+    );
     void promise.then((result) => {
       this.dispatch(setFormRevision(result));
     }).catch(() => {
       this.dispatch(deleteFormRevision(fullRevision.offline_id));
     });
-    const settledPromise = Promise.all([promise, ...attachImagesPromises]).then(() => promise);
-    return [fullRevision, settledPromise];
+    return [fullRevision, offlineFormRevisionAttachments, promise, attachmentsPromise];
   }
   async favorite(formId) {
     const { store } = this.client;
@@ -5818,46 +5938,71 @@ const separateFilesFromValues = (values) => {
   return { values: newValues, files };
 };
 class FormSubmissionService extends BaseUploadService {
-  constructor() {
-    super(...arguments);
-    // Attach files to submission, after uploading them to S3
-    __publicField(this, "getAttachFilesPromises", (files, submission) => {
-      return Object.entries(files).map(async ([key, fileArray]) => {
-        const attachResults = [];
-        for (const file of fileArray) {
-          const sha1 = await hashFile(file);
-          await this.client.files.addCache(file, sha1);
-          const [fileProps] = await this.client.files.uploadFileToS3(sha1);
-          const submissionAttachmentPayload = offline({
-            ...fileProps,
-            submission: submission.offline_id,
-            field_identifier: key
-          });
-          const attach = await this.enqueueRequest({
-            description: "Attach file to form submission",
-            method: HttpMethod.POST,
-            url: `/forms/submission/${submission.offline_id}/attachments/`,
-            payload: submissionAttachmentPayload,
-            blockers: [
-              submission.asset,
-              submission.asset_stage,
-              submission.issue,
-              submission.form_revision
-            ].filter((x) => x !== void 0),
-            blocks: [submissionAttachmentPayload.offline_id]
-          });
-          const offlinePayload = {
-            ...submissionAttachmentPayload,
-            file: URL.createObjectURL(file)
+  async bulkAddSubmissionAttachments(submissionId, files) {
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const createdBy = this.client.store.getState().userReducer.currentUser.id;
+    const filePayloads = {};
+    const offlineFormSubmissionAttachments = [];
+    const attachmentPayloads = [];
+    for (const [fieldIdentifier, filesArray] of Object.entries(files)) {
+      for (const file of filesArray) {
+        const sha1 = await hashFile(file);
+        if (!(sha1 in filePayloads)) {
+          filePayloads[sha1] = {
+            sha1,
+            file_type: file.type,
+            extension: file.name.split(".").pop(),
+            size: file.size
           };
-          this.dispatch(addFormSubmissionAttachment(offlinePayload));
-          attachResults.push(attach);
+          await this.client.files.addCache(file, sha1);
         }
-        return attachResults;
-      });
+        const offlineFormSubmissionAttachment = offline({
+          file: URL.createObjectURL(file),
+          file_type: file.type,
+          file_name: file.name,
+          file_sha1: sha1,
+          created_by: createdBy,
+          submission: submissionId,
+          submitted_at: submittedAt,
+          field_identifier: fieldIdentifier
+        });
+        offlineFormSubmissionAttachments.push(offlineFormSubmissionAttachment);
+        const attachmentPayload = {
+          offline_id: offlineFormSubmissionAttachment.offline_id,
+          name: file.name,
+          sha1,
+          field_identifier: fieldIdentifier
+        };
+        attachmentPayloads.push(attachmentPayload);
+      }
+    }
+    this.dispatch(addFormSubmissionAttachments(offlineFormSubmissionAttachments));
+    const promise = this.enqueueRequest({
+      description: "Attach files to form submission",
+      method: HttpMethod.POST,
+      url: `/forms/submissions/${submissionId}/attachments/bulk/`,
+      payload: {
+        submitted_at: submittedAt,
+        attachments: attachmentPayloads,
+        files: Object.values(filePayloads)
+      },
+      blockers: [submissionId],
+      blocks: offlineFormSubmissionAttachments.map((attachment) => attachment.offline_id)
+    });
+    promise.then((result) => {
+      this.processPresignedUrls(result.presigned_urls);
+      this.dispatch(updateFormSubmissionAttachments(result.attachments));
+    }).catch(() => {
+      this.dispatch(
+        deleteFormSubmissionAttachments(
+          offlineFormSubmissionAttachments.map((attachment) => attachment.offline_id)
+        )
+      );
     });
+    return [offlineFormSubmissionAttachments, promise.then(({ attachments }) => attachments)];
   }
-  add(payload) {
+  // Outer promise is for hashing and caching files for submission attachments
+  async add(payload) {
     const { store } = this.client;
     const state = store.getState();
     const activeProjectId = state.projectReducer.activeProjectId;
@@ -5865,12 +6010,12 @@ class FormSubmissionService extends BaseUploadService {
       throw new Error("Expected an active project");
     }
     const { values, files } = separateFilesFromValues(payload.values);
-    const offlineSubmission = {
+    const offlineSubmission = offline({
       ...payload,
       values,
       created_by: state.userReducer.currentUser.id,
       submitted_at: (/* @__PURE__ */ new Date()).toISOString()
-    };
+    });
     const promise = this.enqueueRequest({
       description: "Respond to form",
       method: HttpMethod.POST,
@@ -5879,20 +6024,22 @@ class FormSubmissionService extends BaseUploadService {
       blockers: [payload.issue, payload.asset, payload.asset_stage, "add-form-entry"].filter(
         (x) => x !== void 0
       ),
-      blocks: [payload.offline_id]
+      blocks: [offlineSubmission.offline_id]
     });
-    const attachFilesPromises = this.getAttachFilesPromises(files, offlineSubmission);
     this.dispatch(addFormSubmission(offlineSubmission));
-    void promise.then((result) => {
+    const [offlineFormSubmissionAttachments, attachmentsPromise] = await this.bulkAddSubmissionAttachments(
+      offlineSubmission.offline_id,
+      files
+    );
+    promise.then((result) => {
       this.dispatch(addActiveProjectFormSubmissionsCount(1));
       this.dispatch(setFormSubmission(result));
       return result;
     }).catch(() => {
-      this.dispatch(deleteFormSubmission(payload.offline_id));
+      this.dispatch(deleteFormSubmission(offlineSubmission.offline_id));
       this.dispatch(addActiveProjectFormSubmissionsCount(-1));
     });
-    const settledPromise = Promise.all([promise, ...attachFilesPromises]).then(() => promise);
-    return [offlineSubmission, settledPromise];
+    return [offlineSubmission, offlineFormSubmissionAttachments, promise, attachmentsPromise];
   }
   // Note currently the bulkAdd method is specific to form submissions for assets
   // TODO: adapt the support bulk adding to any model type
@@ -5993,36 +6140,6 @@ class FormSubmissionService extends BaseUploadService {
     });
     return batchPromises;
   }
-  update(submission) {
-    const { store } = this.client;
-    const { values, files } = separateFilesFromValues(submission.values);
-    const attachFilesPromises = this.getAttachFilesPromises(files, submission);
-    const offlineSubmission = {
-      ...submission,
-      values
-    };
-    const submissionToBeUpdated = selectFormSubmission(submission.offline_id)(store.getState());
-    if (!submissionToBeUpdated) {
-      throw new Error(`Expected submission with offline_id ${submission.offline_id} to exist`);
-    }
-    this.dispatch(updateFormSubmission(offlineSubmission));
-    const promise = this.enqueueRequest({
-      description: "Patch form submission",
-      method: HttpMethod.PATCH,
-      url: `/forms/submissions/${submission.offline_id}/`,
-      payload: offlineSubmission,
-      blockers: [offlineSubmission.issue, offlineSubmission.asset, offlineSubmission.asset_stage].filter(
-        (x) => x !== void 0
-      ),
-      blocks: [offlineSubmission.offline_id]
-    });
-    promise.then((createdSubmission) => {
-      this.dispatch(setFormSubmission(createdSubmission));
-    }).catch(() => {
-      this.dispatch(setFormSubmission(submissionToBeUpdated));
-    });
-    return [offlineSubmission, Promise.all([promise, ...attachFilesPromises]).then(() => promise)];
-  }
   async delete(submissionId) {
     const { store } = this.client;
     const state = store.getState();
@@ -6493,7 +6610,9 @@ class LicenseService extends BaseApiService {
       method: HttpMethod.GET,
       url: `/billing/${license.offline_id}/`,
       isAuthNeeded: true,
-      blockers: [license.organization_owner ? license.organization_owner.toString() : ""],
+      blockers: [
+        license.organization_owner ? license.organization_owner.toString() : license.user_owner ? license.user_owner.toString() : ""
+      ],
       blocks: []
     });
     this.dispatch(updateLicense(result));
@@ -6505,7 +6624,9 @@ class LicenseService extends BaseApiService {
       method: HttpMethod.DELETE,
       url: `/billing/${license.offline_id}/suspend/`,
       isAuthNeeded: true,
-      blockers: [license.organization_owner ? license.organization_owner.toString() : ""],
+      blockers: [
+        license.organization_owner ? license.organization_owner.toString() : license.user_owner ? license.user_owner.toString() : ""
+      ],
       blocks: []
     });
     this.dispatch(updateLicense(result));
@@ -6517,7 +6638,9 @@ class LicenseService extends BaseApiService {
       method: HttpMethod.PATCH,
       url: `/billing/${license.offline_id}/suspend/`,
       isAuthNeeded: true,
-      blockers: [license.organization_owner ? license.organization_owner.toString() : ""],
+      blockers: [
+        license.organization_owner ? license.organization_owner.toString() : license.user_owner ? license.user_owner.toString() : ""
+      ],
       blocks: []
     });
     this.dispatch(updateLicense(result));
@@ -6529,7 +6652,9 @@ class LicenseService extends BaseApiService {
       method: HttpMethod.DELETE,
       url: `/billing/${license.offline_id}/`,
       isAuthNeeded: true,
-      blockers: [license.organization_owner ? license.organization_owner.toString() : ""],
+      blockers: [
+        license.organization_owner ? license.organization_owner.toString() : license.user_owner ? license.user_owner.toString() : ""
+      ],
       blocks: []
     });
     this.dispatch(updateLicense(result));
@@ -6543,7 +6668,7 @@ class LicenseService extends BaseApiService {
       isAuthNeeded: true,
       payload: { project: project.id },
       blockers: [
-        license.organization_owner ? license.organization_owner.toString() : "",
+        license.organization_owner ? license.organization_owner.toString() : license.user_owner ? license.user_owner.toString() : "",
         project.id ? project.id.toString() : ""
       ],
       blocks: ["add-issue", "add-form-entry", "change-access-level", "add-workspace"]
@@ -6557,7 +6682,9 @@ class LicenseService extends BaseApiService {
       method: HttpMethod.DELETE,
       url: `/billing/${license.offline_id}/project/`,
       isAuthNeeded: true,
-      blockers: [license.organization_owner ? license.organization_owner.toString() : ""],
+      blockers: [
+        license.organization_owner ? license.organization_owner.toString() : license.user_owner ? license.user_owner.toString() : ""
+      ],
       blocks: ["add-issue", "add-form-entry", "change-access-level", "add-workspace"]
     });
     this.dispatch(updateLicense(result));
@@ -6601,27 +6728,20 @@ class LicenseService extends BaseApiService {
   }
 }
 class DocumentService extends BaseApiService {
-  // TODO: Support adding for project or organization
-  add(document2) {
+  add(payload) {
     const { store } = this.client;
     const currentUserId = store.getState().userReducer.currentUser.id;
-    const activeProjectId = store.getState().projectReducer.activeProjectId;
-    if (!activeProjectId) {
-      throw new Error("No active project ID while creating document.");
-    }
-    const offlineDocument = offline(document2);
-    const submittedDocument = {
-      ...offlineDocument,
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const offlineDocument = offline({
+      ...payload,
       created_by: currentUserId,
-      project: activeProjectId,
-      organization: null,
-      children_documents: []
-    };
-    this.dispatch(addDocuments([submittedDocument]));
+      submitted_at: submittedAt
+    });
+    this.dispatch(addDocuments([offlineDocument]));
     const promise = this.enqueueRequest({
       description: "Create Document",
       method: HttpMethod.POST,
-      url: `/projects/${activeProjectId}/documents/`,
+      url: "/documents/",
       payload: offlineDocument,
       queryParams: {
         parent_document: offlineDocument.parent_document ?? void 0
@@ -6633,7 +6753,7 @@ class DocumentService extends BaseApiService {
     promise.catch(() => {
       this.dispatch(removeDocuments([offlineDocument.offline_id]));
     });
-    return [submittedDocument, promise];
+    return [offlineDocument, promise];
   }
   update(document2) {
     const { store } = this.client;
@@ -7193,6 +7313,72 @@ class GeoImageService extends BaseUploadService {
     store.dispatch(initializeGeoImages(result));
   }
 }
+class IssueAssociationService extends BaseUploadService {
+  add(payload) {
+    const { store } = this.client;
+    const submittedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const createdBy = store.getState().userReducer.currentUser.id;
+    const offlineIssueAssociation = offline({
+      ...payload,
+      submitted_at: submittedAt,
+      created_by: createdBy
+    });
+    this.dispatch(addIssueAssociation(offlineIssueAssociation));
+    const promise = this.enqueueRequest({
+      description: "Add issue association",
+      method: HttpMethod.POST,
+      url: "/issues/associations/",
+      payload: {
+        offline_id: offlineIssueAssociation.offline_id,
+        submitted_at: submittedAt,
+        created_by: createdBy,
+        ...payload
+      },
+      blockers: [
+        payload.associated_issue,
+        ...payload.issue ? [payload.issue] : [],
+        ...payload.asset ? [payload.asset] : []
+      ],
+      blocks: [offlineIssueAssociation.offline_id]
+    });
+    promise.then((issueAssociation) => {
+      this.dispatch(updateIssueAssociation(issueAssociation));
+    }).catch(() => {
+      this.dispatch(deleteIssueAssociation(offlineIssueAssociation.offline_id));
+    });
+    return [offlineIssueAssociation, promise];
+  }
+  async delete(id) {
+    const { store } = this.client;
+    const issueAssociation = selectIssueAssociationById(id)(store.getState());
+    if (!issueAssociation) {
+      throw new Error(`Issue association with id ${id} not found in store.`);
+    }
+    this.dispatch(deleteIssueAssociation(id));
+    const promise = this.enqueueRequest({
+      description: "Delete issue association",
+      method: HttpMethod.DELETE,
+      url: `/issues/associations/${id}/`,
+      blockers: [id],
+      blocks: []
+    });
+    promise.catch(() => {
+      this.dispatch(addIssueAssociation(issueAssociation));
+    });
+    return promise;
+  }
+  async refreshStore(projectId) {
+    const issueAssociations = await this.enqueueRequest({
+      description: "Fetch issue associations",
+      method: HttpMethod.GET,
+      url: "/issues/associations/",
+      queryParams: { project_id: projectId.toString() },
+      blockers: [],
+      blocks: []
+    });
+    this.dispatch(initializeIssueAssociations(issueAssociations));
+  }
+}
 export {
   APIError,
   AgentService,
@@ -7221,6 +7407,7 @@ export {
   GREEN,
   GeoImageService,
   HttpMethod,
+  IssueAssociationService,
   IssueAttachmentService,
   IssueCommentService,
   IssuePriority,
@@ -7282,6 +7469,8 @@ export {
   addGeoImage,
   addGeoImages,
   addIssue,
+  addIssueAssociation,
+  addIssueAssociations,
   addIssueAttachment,
   addIssueAttachments,
   addIssueComment,
@@ -7359,6 +7548,8 @@ export {
   deleteGeoImage,
   deleteGeoImages,
   deleteIssue,
+  deleteIssueAssociation,
+  deleteIssueAssociations,
   deleteIssueAttachment,
   deleteIssueAttachments,
   deleteIssueComment,
@@ -7431,6 +7622,7 @@ export {
   initializeFormSubmissions,
   initializeForms,
   initializeGeoImages,
+  initializeIssueAssociations,
   initializeIssueAttachments,
   initializeIssueTypes,
   initializeIssueUpdates,
@@ -7443,6 +7635,8 @@ export {
   initializeTeams,
   initializeWorkspaces,
   isToday,
+  issueAssociationReducer,
+  issueAssociationSlice,
   issueAttachmentReducer,
   issueAttachmentSlice,
   issueCommentReducer,
@@ -7598,6 +7792,11 @@ export {
   selectIsImportingProjectFile,
   selectIsLoggedIn,
   selectIssue,
+  selectIssueAssociationById,
+  selectIssueAssociationMapping,
+  selectIssueAssociationsOfAsset,
+  selectIssueAssociationsOfIssue,
+  selectIssueAssociationsToIssue,
   selectIssueAttachment,
   selectIssueAttachmentMapping,
   selectIssueAttachments,
@@ -7702,6 +7901,8 @@ export {
   setGeoImages,
   setIsFetchingInitialData,
   setIsImportingProjectFile,
+  setIssueAssociation,
+  setIssueAssociations,
   setIssueAttachment,
   setIssueAttachments,
   setIssueComment,
@@ -7755,6 +7956,8 @@ export {
   updateGeoImage,
   updateGeoImages,
   updateIssue,
+  updateIssueAssociation,
+  updateIssueAssociations,
   updateIssueAttachment,
   updateIssueAttachments,
   updateIssueType,