@overmap-ai/core 1.0.38 → 1.0.39

package/dist/sdk/services/ComponentStageService.d.ts

@@ -5,5 +5,7 @@ export declare class ComponentStageService extends BaseApiService {
     bulkUpdateStages(stagesToUpdate: ComponentStage[], componentTypeId: string): Promise<ComponentStage[]>;
     bulkDelete(idsToDelete: string[]): Promise<undefined>;
     update(componentStage: ComponentStage): Promise<undefined>;
+    linkForm(stageId: string, formId: string): Promise<undefined>;
+    unlinkForm(stageId: string, formId: string): Promise<undefined>;
     refreshStore(): Promise<undefined>;
 }

package/dist/sdk/services/UserFormService.d.ts

@@ -1,11 +1,11 @@
-import { UserForm, UserFormRevision, UserFormRevisionPayload } from '../../typings/models/forms';
+import { SubmittedUserForm, UserFormRevision, UserFormRevisionPayload } from '../../typings/models/forms';
 import { OptimisticModelResult } from "../typings";
 import { BaseApiService } from "./BaseApiService";
 export declare class UserFormService extends BaseApiService {
     private getAttachImagePromises;
     private add;
-    addForOrganization(initialRevision: UserFormRevisionPayload): Promise<[UserForm, UserFormRevision, Promise<UserFormRevision>, Promise<UserFormRevision>]>;
-    addForCurrentUser(initialRevision: UserFormRevision): Promise<[UserForm, UserFormRevision, Promise<UserFormRevision>, Promise<UserFormRevision>]>;
+    addForOrganization(initialRevision: UserFormRevisionPayload, componentTypeId?: string): Promise<[SubmittedUserForm, UserFormRevision, Promise<UserFormRevision>, Promise<UserFormRevision>]>;
+    addForCurrentUser(initialRevision: UserFormRevision, componentTypeId?: string): Promise<[SubmittedUserForm, UserFormRevision, Promise<UserFormRevision>, Promise<UserFormRevision>]>;
     createRevision(formId: string, revision: UserFormRevisionPayload): Promise<OptimisticModelResult<UserFormRevision>>;
     favorite(formId: string): Promise<undefined>;
     unfavorite(formId: string): Promise<undefined>;

package/dist/sdk/services/UserFormSubmissionService.d.ts

@@ -3,7 +3,9 @@ import { BaseApiService } from "./BaseApiService";
 import { UserFormSubmission, UserFormSubmissionPayload } from '../../typings/models/forms';
 import { OptimisticModelResult } from "../typings";
 export declare class UserFormSubmissionService extends BaseApiService {
+    private getAttachFilesPromises;
     add(payload: Offline<UserFormSubmissionPayload>): OptimisticModelResult<UserFormSubmission>;
+    update(submission: UserFormSubmission): Promise<UserFormSubmission>;
     delete(submissionId: string): Promise<undefined>;
     refreshStore(): Promise<void>;
 }

package/dist/store/slices/componentStageSlice.d.ts

@@ -13,11 +13,28 @@ export declare const componentStageSlice: import("@reduxjs/toolkit").Slice<Compo
     removeStages: (state: import("immer/dist/internal.js").WritableDraft<ComponentStageState>, action: {
         payload: string[];
     }) => void;
+    linkStageToForm: (state: import("immer/dist/internal.js").WritableDraft<ComponentStageState>, action: {
+        payload: {
+            stageId: string;
+            formId: string;
+        };
+    }) => void;
+    unlinkStageToForm: (state: import("immer/dist/internal.js").WritableDraft<ComponentStageState>, action: {
+        payload: {
+            stageId: string;
+        };
+    }) => void;
 }, "componentStages">;
 export declare const selectStageMapping: (state: RootState) => Record<string, ComponentStage>;
 export declare const selectStages: (state: RootState) => ComponentStage[];
 export declare const selectStagesFromComponentTypeIds: SelectorWithArgs<string[], Record<string, ComponentStage[]>>;
 export declare const selectStagesFromComponentType: SelectorWithArgs<string, ComponentStage[]>;
 export declare const selectStagesFromStageIds: SelectorWithArgs<string[], ComponentStage[]>;
-export declare const addStages: import("@reduxjs/toolkit").ActionCreatorWithPayload<ComponentStage[], "componentStages/addStages">, updateStages: import("@reduxjs/toolkit").ActionCreatorWithPayload<ComponentStage[], "componentStages/updateStages">, removeStages: import("@reduxjs/toolkit").ActionCreatorWithPayload<string[], "componentStages/removeStages">;
+export declare const selectStageFormIdsFromStageIds: SelectorWithArgs<string[], Record<string, string>>;
+export declare const addStages: import("@reduxjs/toolkit").ActionCreatorWithPayload<ComponentStage[], "componentStages/addStages">, updateStages: import("@reduxjs/toolkit").ActionCreatorWithPayload<ComponentStage[], "componentStages/updateStages">, removeStages: import("@reduxjs/toolkit").ActionCreatorWithPayload<string[], "componentStages/removeStages">, linkStageToForm: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    stageId: string;
+    formId: string;
+}, "componentStages/linkStageToForm">, unlinkStageToForm: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    stageId: string;
+}, "componentStages/unlinkStageToForm">;
 export declare const componentStageReducer: Reducer<ComponentStageState>;

package/dist/store/slices/userFormSlice.d.ts

@@ -28,7 +28,7 @@ export declare const userFormSlice: import("@reduxjs/toolkit").Slice<UserFormSta
     deleteUserFormRevisions: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
         payload: UserFormRevision[];
     }) => void;
-    addUserFormSubmission: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
+    updateOrCreateUserFormSubmission: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
         payload: UserFormSubmission;
     }) => void;
     addUserFormSubmissionAttachment: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
@@ -69,6 +69,7 @@ export declare const userFormSlice: import("@reduxjs/toolkit").Slice<UserFormSta
 }, "userForms">;
 export declare const addUserForm: import("@reduxjs/toolkit").ActionCreatorWithPayload<(Pick<import('../../typings/models/workspace').WorkspaceIndexedModel, "index_workspace"> & {
     favorite: boolean;
+    component_type?: string | undefined;
 } & {
     owner_organization: number;
     owner_user: undefined;
@@ -79,6 +80,7 @@ export declare const addUserForm: import("@reduxjs/toolkit").ActionCreatorWithPa
     submitted_at: string;
 }) | (Pick<import('../../typings/models/workspace').WorkspaceIndexedModel, "index_workspace"> & {
     favorite: boolean;
+    component_type?: string | undefined;
 } & {
     owner_organization: undefined;
     owner_user: number;
@@ -89,6 +91,7 @@ export declare const addUserForm: import("@reduxjs/toolkit").ActionCreatorWithPa
     submitted_at: string;
 }), "userForms/addUserForm">, addUserForms: import("@reduxjs/toolkit").ActionCreatorWithPayload<((Pick<import('../../typings/models/workspace').WorkspaceIndexedModel, "index_workspace"> & {
     favorite: boolean;
+    component_type?: string | undefined;
 } & {
     owner_organization: number;
     owner_user: undefined;
@@ -99,6 +102,7 @@ export declare const addUserForm: import("@reduxjs/toolkit").ActionCreatorWithPa
     submitted_at: string;
 }) | (Pick<import('../../typings/models/workspace').WorkspaceIndexedModel, "index_workspace"> & {
     favorite: boolean;
+    component_type?: string | undefined;
 } & {
     owner_organization: undefined;
     owner_user: number;
@@ -107,7 +111,7 @@ export declare const addUserForm: import("@reduxjs/toolkit").ActionCreatorWithPa
 } & import('../../typings/models/base').OfflineModel & {
     created_by: number;
     submitted_at: string;
-}))[], "userForms/addUserForms">, addUserFormRevisions: import("@reduxjs/toolkit").ActionCreatorWithPayload<UserFormRevision<import('../../forms').ISerializedField>[], "userForms/addUserFormRevisions">, addUserFormSubmission: import("@reduxjs/toolkit").ActionCreatorWithPayload<UserFormSubmission, "userForms/addUserFormSubmission">, addUserFormSubmissions: import("@reduxjs/toolkit").ActionCreatorWithPayload<UserFormSubmission[], "userForms/addUserFormSubmissions">, deleteUserFormSubmission: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "userForms/deleteUserFormSubmission">, deleteUserFormSubmissions: import("@reduxjs/toolkit").ActionCreatorWithPayload<UserFormSubmission[], "userForms/deleteUserFormSubmissions">, favoriteForm: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}))[], "userForms/addUserForms">, addUserFormRevisions: import("@reduxjs/toolkit").ActionCreatorWithPayload<UserFormRevision<import('../../forms').ISerializedField>[], "userForms/addUserFormRevisions">, updateOrCreateUserFormSubmission: import("@reduxjs/toolkit").ActionCreatorWithPayload<UserFormSubmission, "userForms/updateOrCreateUserFormSubmission">, addUserFormSubmissions: import("@reduxjs/toolkit").ActionCreatorWithPayload<UserFormSubmission[], "userForms/addUserFormSubmissions">, deleteUserFormSubmission: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "userForms/deleteUserFormSubmission">, deleteUserFormSubmissions: import("@reduxjs/toolkit").ActionCreatorWithPayload<UserFormSubmission[], "userForms/deleteUserFormSubmissions">, favoriteForm: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     formId: string;
 }, "userForms/favoriteForm">, unfavoriteForm: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     formId: string;
@@ -131,7 +135,9 @@ export declare const selectSubmissionsForForm: SelectorWithArgs<string, UserForm
 export declare const selectSubmissionsForIssue: SelectorWithArgs<string, UserFormSubmission[]>;
 export declare const selectSubmissionsForComponent: SelectorWithArgs<string, UserFormSubmission[]>;
 export declare const selectUserFormMapping: Selector<Record<Stored<UserForm>["offline_id"], Stored<UserForm>>>;
+export declare const selectComponentTypeForm: SelectorWithArgs<string, Stored<UserForm>>;
+export declare const selectLatestRevisionsFromComponentTypeIds: SelectorWithArgs<string[], Record<string, Stored<UserFormRevision>>>;
 export declare const selectLatestRevisionByFormId: Selector<Record<Stored<UserForm>["offline_id"], UserFormRevision>>;
-export declare const selectAllRevisionAttachmentsByLatestRevisionId: Selector<Record<Stored<UserFormRevision>["offline_id"], UserFormRevisionAttachment[]>>;
 export declare const selectNumberOfUserForms: Selector<number>;
+export declare const selectNumberOfGeneralUserForms: Selector<number>;
 export declare const userFormReducer: Reducer<UserFormState>;

package/dist/style.css

@@ -1,15 +1,15 @@
-._description_p31lm_1 {
+._description_1w0fq_1 {
   white-space: pre-line;
 }
 
-._floatingButtonContainer_p31lm_5 {
+._floatingButtonContainer_1w0fq_5 {
   position: sticky;
   bottom: 0;
   padding-bottom: 10px;
   padding-right: 10px;
 }
 
-._FullScreenImageContainer_p31lm_12 {
+._FullScreenImageContainer_1w0fq_12 {
   position: fixed;
   top: 0;
   left: 0;
@@ -19,7 +19,8 @@
   background-color: rgba(0, 0, 0, 0.85);
 }
 
-._TopBarContainer_p31lm_22 {
+._TopBarContainer_1w0fq_22 {
+  background-color: var(--color-background);
   position: fixed;
   top: 0;
   left: 0;
@@ -27,18 +28,18 @@
   z-index: 5001;
 }
 
-._fileName_p31lm_30 {
+._fileName_1w0fq_31 {
   flex-grow: 1;
   text-align: center;
 }
 
-._longIconButton_p31lm_35 {
+._longIconButton_1w0fq_36 {
   font-size: 0.8em;
   min-width: 50px;
   margin: 10px;
 }
 
-._previewImage_p31lm_41 {
+._previewImage_1w0fq_42 {
   object-fit: cover;
   width: min(300px, 100%);
   height: 100px;
@@ -46,7 +47,7 @@
   cursor: pointer;
 }
 
-._FullScreenImage_p31lm_12 {
+._FullScreenImage_1w0fq_12 {
   position: absolute;
   top: 50%;
   left: 50%;
@@ -57,7 +58,7 @@
   z-index: 5001;
 }
 
-._tabsList_p31lm_60 {
+._tabsList_1w0fq_61 {
   display: flex;
   position: sticky;
   background-color: var(--color-background);
@@ -65,40 +66,40 @@
   z-index: 2000;
 }
 
-._tabTrigger_p31lm_68 {
+._tabTrigger_1w0fq_69 {
   flex: 1;
 }
 
-._patchfieldBorder_p31lm_72, ._description_p31lm_1, ._title_p31lm_72 {
+._patchfieldBorder_1w0fq_73, ._description_1w0fq_1, ._title_1w0fq_73 {
   accent-color: var(--gray-surface);
   border: 1px solid var(--gray-a7);
   border-radius: 8px;
   padding-left: var(--space-2);
 }
 
-._title_p31lm_72 {
+._title_1w0fq_73 {
   font-weight: bold;
 }
 
-._description_p31lm_1 {
+._description_1w0fq_1 {
   min-height: max-content;
   padding-top: var(--space-2);
 }
 
-._error_p31lm_88 {
+._error_1w0fq_89 {
   border-color: var(--red-a11);
-}._description_1kceu_1 {
+}._description_10o76_1 {
   white-space: pre-line;
 }
 
-._floatingButtonContainer_1kceu_5 {
+._floatingButtonContainer_10o76_5 {
   position: sticky;
   bottom: 0;
   padding-bottom: 10px;
   padding-right: 10px;
 }
 
-._FullScreenImageContainer_1kceu_12 {
+._FullScreenImageContainer_10o76_12 {
   position: fixed;
   top: 0;
   left: 0;
@@ -108,7 +109,8 @@
   background-color: rgba(0, 0, 0, 0.85);
 }
 
-._TopBarContainer_1kceu_22 {
+._TopBarContainer_10o76_22 {
+  background-color: var(--color-background);
   position: fixed;
   top: 0;
   left: 0;
@@ -116,18 +118,18 @@
   z-index: 5001;
 }
 
-._fileName_1kceu_30 {
+._fileName_10o76_31 {
   flex-grow: 1;
   text-align: center;
 }
 
-._longIconButton_1kceu_35 {
+._longIconButton_10o76_36 {
   font-size: 0.8em;
   min-width: 50px;
   margin: 10px;
 }
 
-._previewImage_1kceu_41 {
+._previewImage_10o76_42 {
   object-fit: cover;
   width: min(300px, 100%);
   height: 100px;
@@ -135,7 +137,7 @@
   cursor: pointer;
 }
 
-._FullScreenImage_1kceu_12 {
+._FullScreenImage_10o76_12 {
   position: absolute;
   top: 50%;
   left: 50%;
@@ -152,25 +154,34 @@
   overflow-x: auto;
   white-space: nowrap;
   padding-top: calc(var(--space-1) + 1px);
-}._previewImage_ebhyt_1 {
-  max-height: 100px;
-  border-radius: max(var(--radius-2), var(--radius-4));
-  flex-basis: 50%;
+}._displayFileContainer_1vdfw_1 {
+  width: 100%;
+  background-color: var(--surface-900);
+}
+
+._infoContainer_1vdfw_6 {
+  margin-bottom: calc(-1 * var(--space-1));
+}
+
+._previewImage_1vdfw_10 {
   object-fit: cover;
+  width: 100%;
+  max-height: 150px;
+  overflow: hidden !important;
+  border-radius: max(var(--radius-full), var(--radius-4));
   cursor: pointer;
 }
 
-._nameContainer_ebhyt_9 {
-  width: 80%;
+._fileSizeText_1vdfw_19 {
+  white-space: nowrap;
+  margin-right: var(--space-2);
 }
 
-@media only screen and (min-width: 768px) {
-  ._hasPreview_ebhyt_14 {
-    max-width: 250px;
-  }
+._nameContainer_1vdfw_24 {
+  width: calc(100% - var(--space-6));
 }
 
-._useEllipsis_ebhyt_19 {
+._useEllipsis_1vdfw_28 {
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -198,18 +209,18 @@
 
 ._addSectionButton_an5ff_5 {
   margin-bottom: var(--space-4);
-}._description_o5qyx_1 {
+}._description_6795p_1 {
   white-space: pre-line;
 }
 
-._floatingButtonContainer_o5qyx_5 {
+._floatingButtonContainer_6795p_5 {
   position: sticky;
   bottom: 0;
   padding-bottom: 10px;
   padding-right: 10px;
 }
 
-._FullScreenImageContainer_o5qyx_12 {
+._FullScreenImageContainer_6795p_12 {
   position: fixed;
   top: 0;
   left: 0;
@@ -219,7 +230,8 @@
   background-color: rgba(0, 0, 0, 0.85);
 }
 
-._TopBarContainer_o5qyx_22 {
+._TopBarContainer_6795p_22 {
+  background-color: var(--color-background);
   position: fixed;
   top: 0;
   left: 0;
@@ -227,18 +239,18 @@
   z-index: 5001;
 }
 
-._fileName_o5qyx_30 {
+._fileName_6795p_31 {
   flex-grow: 1;
   text-align: center;
 }
 
-._longIconButton_o5qyx_35 {
+._longIconButton_6795p_36 {
   font-size: 0.8em;
   min-width: 50px;
   margin: 10px;
 }
 
-._previewImage_o5qyx_41 {
+._previewImage_6795p_42 {
   object-fit: cover;
   width: min(300px, 100%);
   height: 100px;
@@ -246,7 +258,7 @@
   cursor: pointer;
 }
 
-._FullScreenImage_o5qyx_12 {
+._FullScreenImage_6795p_12 {
   position: absolute;
   top: 50%;
   left: 50%;
@@ -257,62 +269,62 @@
   z-index: 5001;
 }
 
-._popoverInputsContainer_o5qyx_60 {
+._popoverInputsContainer_6795p_61 {
   max-width: 240px;
 }
 
-._imageContainer_o5qyx_64 {
+._imageContainer_6795p_65 {
   position: relative;
   display: inline-block;
   width: min(300px, 100%);
 }
-._imageContainer_o5qyx_64:hover:not(:disabled) ._deleteImageButton_o5qyx_69 {
+._imageContainer_6795p_65:hover:not(:disabled) ._deleteImageButton_6795p_70 {
   display: flex;
 }
 
-._deleteImageButton_o5qyx_69 {
+._deleteImageButton_6795p_70 {
   position: absolute;
   top: var(--space-2);
   right: var(--space-2);
   display: none;
 }
 
-._typeBadge_o5qyx_80 {
+._typeBadge_6795p_81 {
   width: fit-content;
   height: var(--space-5);
 }
 
-._previewInput_o5qyx_85 button[id=upload-input-upload-button] {
+._previewInput_6795p_86 button[id=upload-input-upload-button] {
   width: 100%;
 }
 
-._directInput_o5qyx_89 {
+._directInput_6795p_90 {
   min-width: 40%;
   margin-left: var(--space-3);
 }
 
-._grow_o5qyx_94 {
+._grow_6795p_95 {
   display: grid;
 }
 
-._grow_o5qyx_94::after {
+._grow_6795p_95::after {
   content: attr(data-replicated-value) " ";
   white-space: pre-wrap;
   visibility: hidden;
 }
 
-._grow_o5qyx_94 > textarea {
+._grow_6795p_95 > textarea {
   resize: none;
   overflow: hidden;
   min-height: max-content;
 }
 
-._grow_o5qyx_94 > input,
-._grow_o5qyx_94::after {
+._grow_6795p_95 > input,
+._grow_6795p_95::after {
   grid-area: 1/1;
 }
 
-._grow_o5qyx_94 > textarea,
-._grow_o5qyx_94::after {
+._grow_6795p_95 > textarea,
+._grow_6795p_95::after {
   grid-area: 1/1/2/2;
 }

package/dist/typings/models/base.d.ts

@@ -7,7 +7,7 @@ export type Offline<T> = T & {
     offline_id: string;
 };
 export type OfflineIdMapping<TModel extends OfflineModel> = Record<TModel["offline_id"], TModel>;
-export type Payload<TModel> = Omit<TModel, "offline_id" | "created_at" | "id">;
+export type Payload<TModel> = Omit<TModel, "offline_id" | "created_at" | "updated_at" | "id">;
 export type MaybePayload<TModel extends OfflineModel> = Payload<TModel> & {
     offline_id?: string | null;
 };

package/dist/typings/models/components.d.ts

@@ -16,6 +16,7 @@ export interface ComponentStage extends OfflineModel {
     name: string;
     description?: string;
     priority: number;
+    user_form?: string;
 }
 export type ComponentStagePayload = Omit<ComponentStage, "component_type">;
 export type CompletedStagesMapping = Record<string, Record<string, string>>;

package/dist/typings/models/forms.d.ts

@@ -4,6 +4,7 @@ import { UploadedFileModel } from '../files';
 import { WorkspaceIndexedModel } from "./workspace";
 export type UserForm = Pick<WorkspaceIndexedModel, "index_workspace"> & {
     favorite: boolean;
+    component_type?: string;
 } & ({
     owner_organization: number;
     owner_user: undefined;
@@ -36,8 +37,10 @@ export interface UserFormSubmission extends OfflineModel {
     created_by: number;
     created_at: string;
     submitted_at: string;
+    updated_at: string;
     issue?: string;
     component?: string;
+    component_stage?: string;
 }
 export interface UserFormSubmissionAttachment extends OfflineModel, UploadedFileModel {
     submission: string;

package/package.json

@@ -3,7 +3,7 @@
 	"description": "Core functionality for Overmap",
 	"author": "Wôrdn Inc.",
 	"license": "UNLICENSED",
-	"version": "1.0.38",
+	"version": "1.0.39",
 	"type": "module",
 	"main": "dist/overmap-core.umd.cjs",
 	"module": "dist/overmap-core.js",
@@ -47,7 +47,7 @@
 	"devDependencies": {
 		"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
 		"@esbuild-plugins/node-modules-polyfill": "^0.2.2",
-		"@overmap-ai/blocks": "1.0.27",
+		"@overmap-ai/blocks": "1.0.23",
 		"@rollup/plugin-commonjs": "^25.0.4",
 		"@storybook/addon-essentials": "7.3.2",
 		"@storybook/addon-interactions": "7.3.2",