@overmap-ai/core 1.0.50-bulk-form-submission.3 → 1.0.50-document-attachments.0

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

@@ -1,18 +1,11 @@
 import { Offline } from '../../typings/models/base';
 import { BaseApiService } from "./BaseApiService";
 import { UserFormSubmission, UserFormSubmissionPayload } from '../../typings/models/forms';
-import { OptimisticModelResult, OptimisticMultipleModelResult } from "../typings";
-import { FieldValue } from '../../forms';
-import { Stored } from "../../typings";
+import { OptimisticModelResult } from "../typings";
 export declare class UserFormSubmissionService extends BaseApiService {
     private getAttachFilesPromises;
     add(payload: Offline<UserFormSubmissionPayload>): OptimisticModelResult<UserFormSubmission>;
-    bulkAdd(args: {
-        form_revision: string;
-        values: Record<string, FieldValue>;
-        componentOfflineIds: string[];
-    }): Promise<OptimisticMultipleModelResult<UserFormSubmission>>;
-    update(submission: Stored<UserFormSubmission>): OptimisticModelResult<UserFormSubmission>;
+    update(submission: UserFormSubmission): Promise<UserFormSubmission>;
     delete(submissionId: string): Promise<undefined>;
     refreshStore(): Promise<void>;
 }

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

@@ -60,10 +60,8 @@ export declare const selectCategories: ((state: import("redux").EmptyObject & {
     projectFileReducer: import('..').ProjectFileState;
     rehydratedReducer: import('..').RehydratedState;
     settingReducer: import('..').SettingState;
-    formReducer: import('..').FormState;
+    userFormReducer: import('..').UserFormState;
     userReducer: import('..').UserState;
-    formRevisionReducer: import('..').FormRevisionState;
-    formSubmissionReducer: import('..').FormSubmissionState;
     workspaceReducer: import('..').WorkspaceState;
     emailDomainsReducer: import('..').EmailDomainState;
     licenseReducer: import('..').LicenseState;

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

@@ -55,7 +55,6 @@ export declare const selectNumberOfComponentsOfComponentType: SelectorWithArgs<s
 export declare const selectComponentTypesFromIds: SelectorWithArgs<string[], ComponentType[]>;
 export declare const selectComponentAttachmentMapping: (state: RootState) => Record<string, Stored<ComponentAttachment>>;
 export declare const selectAllComponentAttachments: Selector<Stored<ComponentAttachment>[]>;
-export declare const selectComponentAttachment: SelectorWithArgs<string, Stored<ComponentAttachment>>;
 export declare const selectAttachmentsOfComponent: (args: string) => (state: RootState) => Stored<ComponentAttachment>[];
 export declare const selectAttachmentsOfComponentByType: (args: string) => (state: RootState) => {
     fileAttachments: Stored<ComponentAttachment>[];

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

@@ -56,7 +56,6 @@ export declare const selectComponentTypesByName: SelectorWithArgs<string, Compon
 export declare const selectHiddenComponentTypeIds: AppSelector<Record<string, boolean | undefined>>;
 export declare const selectComponentTypeAttachmentMapping: (state: RootState) => Record<string, ComponentTypeAttachment>;
 export declare const selectAllComponentTypeAttachments: Selector<Stored<ComponentTypeAttachment>[]>;
-export declare const selectComponentTypeAttachment: SelectorWithArgs<string, Stored<ComponentTypeAttachment>>;
 export declare const selectAttachmentsOfComponentType: (args: string) => (state: RootState) => Stored<ComponentTypeAttachment>[];
 export declare const selectAttachmentsOfComponentTypeByType: (args: string) => (state: RootState) => {
     fileAttachments: Stored<ComponentTypeAttachment>[];

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

@@ -1,6 +1,6 @@
 /// <reference types="@redux-offline/redux-offline" />
 import { Reducer } from "@reduxjs/toolkit";
-import { DocumentAttachment, MovePosition, ProjectDocument, RootState, Selector, SelectorWithArgs, Stored, Submitted } from "../../typings";
+import { DocumentAttachment, MovePosition, ProjectDocument, RootState, Selector, Stored, Submitted } from "../../typings";
 import { AppSelector } from "./componentTypeSlice";
 export interface DocumentState {
     documents: Record<string, Stored<ProjectDocument>>;
@@ -76,10 +76,8 @@ export declare const selectRootDocuments: ((state: import("redux").EmptyObject &
     projectFileReducer: import('..').ProjectFileState;
     rehydratedReducer: import('..').RehydratedState;
     settingReducer: import('..').SettingState;
-    formReducer: import('..').FormState;
+    userFormReducer: import('..').UserFormState;
     userReducer: import('..').UserState;
-    formRevisionReducer: import('..').FormRevisionState;
-    formSubmissionReducer: import('..').FormSubmissionState;
     workspaceReducer: import('..').WorkspaceState;
     emailDomainsReducer: import('..').EmailDomainState;
     licenseReducer: import('..').LicenseState;
@@ -93,7 +91,6 @@ export declare const selectRootDocuments: ((state: import("redux").EmptyObject &
 };
 export declare const selectDocumentAttachmentMapping: (state: RootState) => Record<string, Stored<DocumentAttachment>>;
 export declare const selectAllDocumentAttachments: Selector<Stored<DocumentAttachment>[]>;
-export declare const selectDocumentAttachment: SelectorWithArgs<string, Stored<DocumentAttachment>>;
 export declare const selectAttachmentsOfDocument: (args: string) => (state: RootState) => Stored<DocumentAttachment>[];
 export declare const selectAttachmentsOfDocumentByType: (args: string) => (state: RootState) => {
     fileAttachments: Stored<DocumentAttachment>[];

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

@@ -14,9 +14,7 @@ export * from "./projectFileSlice";
 export * from "./projectSlice";
 export * from "./rehydratedSlice";
 export * from "./settingsSlice";
-export * from "./formSlice";
-export * from "./formSubmissionSlice";
-export * from "./formRevisionSlice";
+export * from "./userFormSlice";
 export * from "./userSlice";
 export * from "./workspaceSlice";
 export * from "./organizationAccessSlice";

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

@@ -106,7 +106,6 @@ export declare const selectCommentsOfIssue: (args: string) => (state: RootState)
 export declare const selectIssueUpdateMapping: (state: RootState) => Record<string, Stored<IssueUpdate>>;
 export declare const selectIssueUpdatesOfIssue: (args: string) => (state: RootState) => Stored<IssueUpdate>[];
 export declare const selectAttachmentsOfIssue: (args: string) => (state: RootState) => Stored<IssueAttachment>[];
-export declare const selectIssueAttachment: SelectorWithArgs<string, Stored<IssueAttachment>>;
 export declare const selectAttachmentsOfIssueByType: (args: string) => (state: RootState) => {
     fileAttachments: Stored<IssueAttachment>[];
     imageAttachments: Stored<IssueAttachment>[];
@@ -132,10 +131,8 @@ export declare const selectAllAttachments: ((state: import("redux").EmptyObject
     projectFileReducer: import('..').ProjectFileState;
     rehydratedReducer: import('..').RehydratedState;
     settingReducer: import('..').SettingState;
-    formReducer: import('..').FormState;
+    userFormReducer: import('..').UserFormState;
     userReducer: import('..').UserState;
-    formRevisionReducer: import('..').FormRevisionState;
-    formSubmissionReducer: import('..').FormSubmissionState;
     workspaceReducer: import("./workspaceSlice").WorkspaceState;
     emailDomainsReducer: import('..').EmailDomainState;
     licenseReducer: import('..').LicenseState;

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

@@ -68,10 +68,8 @@ export declare const selectProjectFiles: ((state: import("redux").EmptyObject &
     projectFileReducer: ProjectFileState;
     rehydratedReducer: import('..').RehydratedState;
     settingReducer: import('..').SettingState;
-    formReducer: import('..').FormState;
+    userFormReducer: import('..').UserFormState;
     userReducer: import('..').UserState;
-    formRevisionReducer: import('..').FormRevisionState;
-    formSubmissionReducer: import('..').FormSubmissionState;
     workspaceReducer: import('..').WorkspaceState;
     emailDomainsReducer: import('..').EmailDomainState;
     licenseReducer: import('..').LicenseState;

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

@@ -0,0 +1,145 @@
+import { PayloadAction, Reducer } from "@reduxjs/toolkit";
+import { CachedUserForm, UserForm, UserFormRevision, UserFormRevisionAttachment, UserFormSubmission, UserFormSubmissionAttachment } from '../../typings/models/forms';
+import { SearchArgs } from '../../typings/search';
+import { Selector, SelectorWithArgs } from '../../typings/store';
+import { Stored, Submitted } from "../../typings";
+export interface UserFormState {
+    userForms: Record<string, Stored<UserForm>>;
+    submissions: Record<string, UserFormSubmission>;
+    submissionAttachments: Record<UserFormSubmission["offline_id"], UserFormSubmissionAttachment[]>;
+    revisions: Record<string, UserFormRevision>;
+    revisionAttachments: Record<UserFormRevision["offline_id"], UserFormRevisionAttachment[]>;
+}
+export declare const userFormSlice: import("@reduxjs/toolkit").Slice<UserFormState, {
+    setUserForms: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
+        payload: Submitted<UserForm>[];
+    }) => void;
+    addUserForm: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
+        payload: Submitted<UserForm>;
+    }) => void;
+    addUserForms: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
+        payload: Submitted<UserForm>[];
+    }) => void;
+    addUserFormRevisions: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
+        payload: UserFormRevision[];
+    }) => void;
+    addUserFormRevision: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: PayloadAction<UserFormRevision>) => void;
+    deleteUserFormRevision: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: PayloadAction<string>) => void;
+    deleteUserFormRevisions: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
+        payload: UserFormRevision[];
+    }) => void;
+    updateOrCreateUserFormSubmission: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
+        payload: UserFormSubmission;
+    }) => void;
+    addUserFormSubmissionAttachment: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
+        payload: UserFormSubmissionAttachment;
+    }) => void;
+    addUserFormRevisionAttachment: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
+        payload: UserFormRevisionAttachment;
+    }) => void;
+    setUserFormSubmissionAttachments: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
+        payload: UserFormSubmissionAttachment[];
+    }) => void;
+    setUserFormRevisionAttachments: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
+        payload: UserFormRevisionAttachment[];
+    }) => void;
+    deleteUserFormSubmission: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: PayloadAction<string>) => void;
+    deleteUserFormSubmissions: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
+        payload: UserFormSubmission[];
+    }) => void;
+    addUserFormSubmissions: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
+        payload: UserFormSubmission[];
+    }) => void;
+    setUserFormSubmissions: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
+        payload: UserFormSubmission[];
+    }) => void;
+    favoriteForm: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
+        payload: {
+            formId: string;
+        };
+    }) => void;
+    unfavoriteForm: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
+        payload: {
+            formId: string;
+        };
+    }) => void;
+    deleteUserForm: (state: import("immer/dist/internal.js").WritableDraft<UserFormState>, action: {
+        payload: string;
+    }) => void;
+}, "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;
+} & {
+    offline_id: string;
+} & import('../../typings/models/base').OfflineModel & {
+    created_by: number;
+    submitted_at: string;
+}) | (Pick<import('../../typings/models/workspace').WorkspaceIndexedModel, "index_workspace"> & {
+    favorite: boolean;
+    component_type?: string | undefined;
+} & {
+    owner_organization: undefined;
+    owner_user: number;
+} & {
+    offline_id: string;
+} & import('../../typings/models/base').OfflineModel & {
+    created_by: number;
+    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;
+} & {
+    offline_id: string;
+} & import('../../typings/models/base').OfflineModel & {
+    created_by: number;
+    submitted_at: string;
+}) | (Pick<import('../../typings/models/workspace').WorkspaceIndexedModel, "index_workspace"> & {
+    favorite: boolean;
+    component_type?: string | undefined;
+} & {
+    owner_organization: undefined;
+    owner_user: number;
+} & {
+    offline_id: string;
+} & import('../../typings/models/base').OfflineModel & {
+    created_by: number;
+    submitted_at: string;
+}))[], "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;
+}, "userForms/unfavoriteForm">, deleteUserForm: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "userForms/deleteUserForm">, deleteUserFormRevision: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "userForms/deleteUserFormRevision">, deleteUserFormRevisions: import("@reduxjs/toolkit").ActionCreatorWithPayload<UserFormRevision<import('../../forms').ISerializedField>[], "userForms/deleteUserFormRevisions">, setUserFormSubmissions: import("@reduxjs/toolkit").ActionCreatorWithPayload<UserFormSubmission[], "userForms/setUserFormSubmissions">, addUserFormRevision: import("@reduxjs/toolkit").ActionCreatorWithPayload<UserFormRevision<import('../../forms').ISerializedField>, "userForms/addUserFormRevision">, addUserFormSubmissionAttachment: import("@reduxjs/toolkit").ActionCreatorWithPayload<UserFormSubmissionAttachment, "userForms/addUserFormSubmissionAttachment">, addUserFormRevisionAttachment: import("@reduxjs/toolkit").ActionCreatorWithPayload<UserFormRevisionAttachment, "userForms/addUserFormRevisionAttachment">, setUserFormSubmissionAttachments: import("@reduxjs/toolkit").ActionCreatorWithPayload<UserFormSubmissionAttachment[], "userForms/setUserFormSubmissionAttachments">, setUserFormRevisionAttachments: import("@reduxjs/toolkit").ActionCreatorWithPayload<UserFormRevisionAttachment[], "userForms/setUserFormRevisionAttachments">;
+export type UserFormSearchArgs = SearchArgs<{
+    /** `undefined` means don't filter by favorite. `boolean` filters forms. */
+    favorites?: boolean;
+    /** organization owner */
+    owner_organization?: number;
+    /** user owner */
+    owner_user?: number;
+}>;
+export declare const selectSubmissionAttachments: SelectorWithArgs<string, UserFormSubmissionAttachment[]>;
+export declare const selectRevisionAttachments: SelectorWithArgs<string, UserFormRevisionAttachment[]>;
+export declare const selectFilteredUserForms: SelectorWithArgs<UserFormSearchArgs, CachedUserForm[]>;
+export declare const selectFormRevision: SelectorWithArgs<string, UserFormRevision>;
+export declare const selectLatestFormRevision: SelectorWithArgs<string, UserFormRevision>;
+export declare const selectUserForm: SelectorWithArgs<string, Stored<UserForm>>;
+export declare const selectUserFormSubmission: SelectorWithArgs<string, UserFormSubmission>;
+export declare const selectRevisionsForForm: SelectorWithArgs<string, UserFormRevision[]>;
+export declare const selectSubmissionsForForm: SelectorWithArgs<string, UserFormSubmission[]>;
+export declare const selectSubmissionsForIssue: SelectorWithArgs<string, UserFormSubmission[]>;
+export declare const selectSubmissionsForComponent: SelectorWithArgs<string, UserFormSubmission[]>;
+export declare const selectComponentSubmissionMapping: Selector<Record<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 selectNumberOfUserForms: Selector<number>;
+export declare const selectNumberOfGeneralUserForms: Selector<number>;
+export declare const userFormReducer: Reducer<UserFormState>;

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

@@ -7,7 +7,6 @@ export declare function setAttachments<TAttachment, TState extends AttachmentSta
 export declare function addAttachment<TAttachment, TState extends AttachmentState<TAttachment>>(state: TState, action: PayloadAction<Submitted<TAttachment>>): void;
 export declare function addAttachments<TAttachment, TState extends AttachmentState<TAttachment>>(state: TState, action: PayloadAction<Submitted<TAttachment>[]>): void;
 export declare function updateAttachment<TAttachment, TState extends AttachmentState<TAttachment>>(state: TState, action: PayloadAction<Submitted<TAttachment>>): void;
-export declare function updateAttachments<TAttachment, TState extends AttachmentState<TAttachment>>(state: TState, action: PayloadAction<Submitted<TAttachment>[]>): void;
 export declare function removeAttachment<TAttachment, TState extends AttachmentState<TAttachment>>(state: TState, action: PayloadAction<string>): void;
 export declare function removeAttachments<TAttachment, TState extends AttachmentState<TAttachment>>(state: TState, action: PayloadAction<string[]>): void;
 export {};

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

@@ -46,10 +46,8 @@ export declare const selectWorkspaces: ((state: import("redux").EmptyObject & {
     projectFileReducer: import('..').ProjectFileState;
     rehydratedReducer: import('..').RehydratedState;
     settingReducer: import('..').SettingState;
-    formReducer: import('..').FormState;
+    userFormReducer: import('..').UserFormState;
     userReducer: import('..').UserState;
-    formRevisionReducer: import('..').FormRevisionState;
-    formSubmissionReducer: import('..').FormSubmissionState;
     workspaceReducer: WorkspaceState;
     emailDomainsReducer: import('..').EmailDomainState;
     licenseReducer: import('..').LicenseState;

package/dist/store/store.d.ts

@@ -3,7 +3,7 @@ import { AnyAction, Reducer } from "redux";
 import { Config, OfflineAction, OfflineMetadata, OfflineState } from "@redux-offline/redux-offline/lib/types";
 import request from "superagent";
 import { type OfflineMetaEffect, type OvermapSDK, RequestDetails } from "../sdk";
-import { AuthState, CategoryState, ComponentStageCompletionState, ComponentStageState, ComponentState, ComponentTypeState, EmailDomainState, FileState, IssueState, LicenseState, MapState, OrganizationAccessState, OrganizationState, OutboxState, ProjectAccessState, ProjectFileState, ProjectState, RehydratedState, SettingState, FormState, FormRevisionState, FormSubmissionState, UserState, WorkspaceState, DocumentState } from "./slices";
+import { AuthState, CategoryState, ComponentStageCompletionState, ComponentStageState, ComponentState, ComponentTypeState, EmailDomainState, FileState, IssueState, LicenseState, MapState, OrganizationAccessState, OrganizationState, OutboxState, ProjectAccessState, ProjectFileState, ProjectState, RehydratedState, SettingState, UserFormState, UserState, WorkspaceState, DocumentState } from "./slices";
 import { VersioningState } from "./slices/versioningSlice";
 import { RootState } from "../typings";
 export declare const overmapReducers: {
@@ -25,10 +25,8 @@ export declare const overmapReducers: {
     projectFileReducer: Reducer<ProjectFileState>;
     rehydratedReducer: Reducer<RehydratedState>;
     settingReducer: Reducer<SettingState>;
-    formReducer: Reducer<FormState>;
+    userFormReducer: Reducer<UserFormState>;
     userReducer: Reducer<UserState>;
-    formRevisionReducer: Reducer<FormRevisionState>;
-    formSubmissionReducer: Reducer<FormSubmissionState>;
     workspaceReducer: Reducer<WorkspaceState>;
     emailDomainsReducer: Reducer<EmailDomainState>;
     licenseReducer: Reducer<LicenseState>;
@@ -53,10 +51,8 @@ export declare const overmapReducer: Reducer<import("redux").CombinedState<{
     projectFileReducer: ProjectFileState;
     rehydratedReducer: RehydratedState;
     settingReducer: SettingState;
-    formReducer: FormState;
+    userFormReducer: UserFormState;
     userReducer: UserState;
-    formRevisionReducer: FormRevisionState;
-    formSubmissionReducer: FormSubmissionState;
     workspaceReducer: WorkspaceState;
     emailDomainsReducer: EmailDomainState;
     licenseReducer: LicenseState;
@@ -99,10 +95,8 @@ export declare const defaultStore: import("@reduxjs/toolkit/dist/configureStore"
     projectFileReducer: ProjectFileState;
     rehydratedReducer: RehydratedState;
     settingReducer: SettingState;
-    formReducer: FormState;
+    userFormReducer: UserFormState;
     userReducer: UserState;
-    formRevisionReducer: FormRevisionState;
-    formSubmissionReducer: FormSubmissionState;
     workspaceReducer: WorkspaceState;
     emailDomainsReducer: EmailDomainState;
     licenseReducer: LicenseState;

package/dist/typings/files.d.ts

@@ -5,17 +5,7 @@ export type MaybeObjectURL<T> = T & {
  * Represents a file model that has been uploaded to the backend.
  * A corresponding abstract model exists in the backend (FileModelMixin).
  */
-export type FileModel = MaybeObjectURL<{
+export type UploadedFileModel = MaybeObjectURL<{
     file_sha1: string;
     file: string;
 }>;
-export interface FileWithNameModel extends FileModel {
-    file_name: string;
-}
-/** the attributes needed to generate a presigned url for a file that is being attempted to be uploaded */
-export interface FileUploadPayload {
-    sha1: string;
-    extension: string;
-    file_type: string;
-    size: number;
-}

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

@@ -1,26 +1,27 @@
 import { OfflineModel } from "./base";
-import { MaybeObjectURL, FileModel, FileWithNameModel } from "../files";
+import { MaybeObjectURL, UploadedFileModel } from "../files";
 import { Project } from "./projects";
 import { ProjectDocument } from "./documents";
-export interface Attachment extends OfflineModel, FileWithNameModel {
+export interface Attachment extends OfflineModel, UploadedFileModel {
     description?: string;
+    file_name: string;
     file_type: string;
     submitted_at: string;
     created_by: number;
 }
-export interface IssueAttachment extends Attachment {
+export interface IssueAttachment extends Attachment, UploadedFileModel {
     issue: string;
 }
-export interface ComponentAttachment extends Attachment {
+export interface ComponentAttachment extends Attachment, UploadedFileModel {
     component: string;
 }
-export interface ComponentTypeAttachment extends Attachment {
+export interface ComponentTypeAttachment extends Attachment, UploadedFileModel {
     component_type: string;
 }
-export interface ProjectAttachment extends Attachment {
+export interface ProjectAttachment extends Attachment, UploadedFileModel {
     project: Project["id"];
 }
-export interface DocumentAttachment extends Attachment {
+export interface DocumentAttachment extends Attachment, UploadedFileModel {
     document: ProjectDocument["offline_id"];
 }
 /** to get an AttachmentPayload for a specific type, pass in the given AttachmentType
@@ -28,4 +29,6 @@ export interface DocumentAttachment extends Attachment {
 export type AttachmentPayload<TAttachment> = Omit<TAttachment, "file" | "submitted_at" | "created_by"> & {
     file: MaybeObjectURL<File>;
 };
-export type ProfilePic = FileModel;
+export interface ProfilePic extends UploadedFileModel {
+    file: string;
+}

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

@@ -4,13 +4,6 @@ export interface Model {
 export interface OfflineModel extends Model {
     offline_id: string;
 }
-export interface SubmittedAtModel extends Model {
-    submitted_at: string;
-}
-export interface TimeStampedModel extends Model {
-    created_at: string;
-    updated_at: string;
-}
 export type Offline<T> = T & {
     offline_id: string;
 };

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

@@ -1,6 +1,6 @@
-import { OfflineModel, Payload, SubmittedAtModel } from "./base";
+import { OfflineModel, Payload } from "./base";
 import { BaseSerializedObject, FieldValue, ISerializedField } from "../../forms";
-import { FileWithNameModel } from '../files';
+import { UploadedFileModel } from '../files';
 import { WorkspaceIndexedModel } from "./workspace";
 export type UserForm = Pick<WorkspaceIndexedModel, "index_workspace"> & {
     favorite: boolean;
@@ -31,20 +31,25 @@ export interface UserFormRevision<TFields extends BaseSerializedObject = ISerial
     revision: number | "Pending";
 }
 export type UserFormRevisionPayload = Omit<Payload<UserFormRevision>, "created_by" | "revision" | "form">;
-export interface UserFormSubmission extends OfflineModel, SubmittedAtModel {
+export interface UserFormSubmission extends OfflineModel {
     form_revision: string;
     values: Record<string, FieldValue>;
     created_by: number;
+    created_at: string;
+    submitted_at: string;
+    updated_at: string;
     issue?: string;
     component?: string;
     component_stage?: string;
 }
-export interface UserFormSubmissionAttachment extends OfflineModel, FileWithNameModel {
+export interface UserFormSubmissionAttachment extends OfflineModel, UploadedFileModel {
     submission: string;
+    file_name: string;
     field_identifier: string;
 }
-export interface UserFormRevisionAttachment extends OfflineModel, FileWithNameModel {
+export interface UserFormRevisionAttachment extends OfflineModel, UploadedFileModel {
     revision: string;
+    file_name: string;
     field_identifier: string;
 }
-export type UserFormSubmissionPayload = Omit<Payload<UserFormSubmission>, "created_by" | "submitted_at">;
+export type UserFormSubmissionPayload = Omit<Payload<UserFormSubmission>, "created_by">;

package/dist/utils/file.d.ts

@@ -1,4 +1,3 @@
-import { FileUploadPayload } from "../typings";
 export declare const getFileS3Key: (file: File, hash?: string) => Promise<string>;
 export declare function hashFile(file: Blob): Promise<string>;
 export declare function getFileIdentifier(file: File): string;
@@ -6,7 +5,6 @@ export declare function getRenamedFile(file: File, newName: string): File & {
     name: string;
 };
 export declare function downloadInMemoryFile(filename: string, text: string): void;
-export declare const constructUploadedFilePayloads: (files: File[]) => Promise<FileUploadPayload[]>;
 export declare const fileToBlob: (dataUrl: string) => Promise<Blob>;
 export declare const blobToBase64: (blob: Blob) => Promise<string>;
 export interface useFileSrcProps {

package/package.json

@@ -3,7 +3,7 @@
 	"description": "Core functionality for Overmap",
 	"author": "Wôrdn Inc.",
 	"license": "UNLICENSED",
-	"version": "1.0.50-bulk-form-submission.3",
+	"version": "1.0.50-document-attachments.0",
 	"type": "module",
 	"main": "dist/overmap-core.umd.cjs",
 	"module": "dist/overmap-core.js",

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

@@ -1,73 +0,0 @@
-/// <reference types="@redux-offline/redux-offline" />
-import { PayloadAction, Reducer } from "@reduxjs/toolkit";
-import { RootState, Selector, SelectorWithArgs, Stored, UserForm, UserFormRevision, UserFormRevisionAttachment } from "../../typings";
-export interface FormRevisionState {
-    formRevisions: Record<UserFormRevision["offline_id"], Stored<UserFormRevision>>;
-    attachments: Record<UserFormRevisionAttachment["offline_id"], Stored<UserFormRevisionAttachment>>;
-}
-export declare const formRevisionsSlice: import("@reduxjs/toolkit").Slice<FormRevisionState, {
-    setFormRevision: (state: import("immer/dist/internal.js").WritableDraft<FormRevisionState>, action: PayloadAction<Stored<UserFormRevision>>) => void;
-    setFormRevisions: (state: import("immer/dist/internal.js").WritableDraft<FormRevisionState>, action: {
-        payload: Stored<UserFormRevision>[];
-    }) => void;
-    addFormRevision: (state: import("immer/dist/internal.js").WritableDraft<FormRevisionState>, action: PayloadAction<Stored<UserFormRevision>>) => void;
-    addFormRevisions: (state: import("immer/dist/internal.js").WritableDraft<FormRevisionState>, action: {
-        payload: Stored<UserFormRevision>[];
-    }) => void;
-    deleteFormRevision: (state: import("immer/dist/internal.js").WritableDraft<FormRevisionState>, action: PayloadAction<UserFormRevision["offline_id"]>) => void;
-    deleteFormRevisions: (state: import("immer/dist/internal.js").WritableDraft<FormRevisionState>, action: PayloadAction<UserFormRevision["offline_id"][]>) => void;
-    setFormRevisionAttachments: (state: import("immer/dist/internal.js").WritableDraft<FormRevisionState>, action: {
-        payload: Stored<UserFormRevisionAttachment>[];
-    }) => void;
-    addFormRevisionAttachment: (state: import("immer/dist/internal.js").WritableDraft<FormRevisionState>, action: PayloadAction<Stored<UserFormRevisionAttachment>>) => void;
-    addFormRevisionAttachments: (state: import("immer/dist/internal.js").WritableDraft<FormRevisionState>, action: {
-        payload: Stored<UserFormRevisionAttachment>[];
-    }) => void;
-    deleteFormRevisionAttachment: (state: import("immer/dist/internal.js").WritableDraft<FormRevisionState>, action: PayloadAction<UserFormRevisionAttachment["offline_id"]>) => void;
-    deleteFormRevisionAttachments: (state: import("immer/dist/internal.js").WritableDraft<FormRevisionState>, action: PayloadAction<UserFormRevisionAttachment["offline_id"][]>) => void;
-}, "formRevisions">;
-export declare const setFormRevision: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<UserFormRevision<import('../../forms').ISerializedField>>, "formRevisions/setFormRevision">, setFormRevisions: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<UserFormRevision<import('../../forms').ISerializedField>>[], "formRevisions/setFormRevisions">, addFormRevision: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<UserFormRevision<import('../../forms').ISerializedField>>, "formRevisions/addFormRevision">, addFormRevisions: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<UserFormRevision<import('../../forms').ISerializedField>>[], "formRevisions/addFormRevisions">, deleteFormRevision: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "formRevisions/deleteFormRevision">, deleteFormRevisions: import("@reduxjs/toolkit").ActionCreatorWithPayload<string[], "formRevisions/deleteFormRevisions">, setFormRevisionAttachments: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<UserFormRevisionAttachment>[], "formRevisions/setFormRevisionAttachments">, addFormRevisionAttachment: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<UserFormRevisionAttachment>, "formRevisions/addFormRevisionAttachment">, addFormRevisionAttachments: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<UserFormRevisionAttachment>[], "formRevisions/addFormRevisionAttachments">, deleteFormRevisionAttachment: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "formRevisions/deleteFormRevisionAttachment">, deleteFormRevisionAttachments: import("@reduxjs/toolkit").ActionCreatorWithPayload<string[], "formRevisions/deleteFormRevisionAttachments">;
-export declare const selectFormRevisionMapping: (state: RootState) => Record<string, Stored<UserFormRevision<import('../../forms').ISerializedField>>>;
-export declare const selectFormRevisions: ((state: import("redux").EmptyObject & {
-    versioning: import('../slices/versioningSlice').VersioningState;
-    fileReducer: import('..').FileState;
-    authReducer: import('..').AuthState;
-    categoryReducer: import('..').CategoryState;
-    componentReducer: import('..').ComponentState;
-    componentStageCompletionReducer: import('..').ComponentStageCompletionState;
-    componentStageReducer: import('..').ComponentStageState;
-    componentTypeReducer: import('..').ComponentTypeState;
-    issueReducer: import('..').IssueState;
-    mapReducer: import('..').MapState;
-    organizationReducer: import('..').OrganizationState;
-    outboxReducer: import('..').OutboxState;
-    projectReducer: import('..').ProjectState;
-    projectAccessReducer: import('..').ProjectAccessState;
-    organizationAccessReducer: import('..').OrganizationAccessState;
-    projectFileReducer: import('..').ProjectFileState;
-    rehydratedReducer: import('..').RehydratedState;
-    settingReducer: import('..').SettingState;
-    formReducer: import('..').FormState;
-    userReducer: import('..').UserState;
-    formRevisionReducer: FormRevisionState;
-    formSubmissionReducer: import('..').FormSubmissionState;
-    workspaceReducer: import('..').WorkspaceState;
-    emailDomainsReducer: import('..').EmailDomainState;
-    licenseReducer: import('..').LicenseState;
-    documentsReducer: import('..').DocumentState;
-} & {
-    offline: import("@redux-offline/redux-offline/lib/types").OfflineState;
-}) => Stored<UserFormRevision<import('../../forms').ISerializedField>>[]) & import("reselect").OutputSelectorFields<(args_0: Record<string, Stored<UserFormRevision<import('../../forms').ISerializedField>>>) => Stored<UserFormRevision<import('../../forms').ISerializedField>>[], {
-    clearCache: () => void;
-}> & {
-    clearCache: () => void;
-};
-export declare const selectFormRevision: SelectorWithArgs<string, Stored<UserFormRevision>>;
-export declare const _selectLatestFormRevision: (formRevisions: FormRevisionState["formRevisions"], formId: string) => Stored<UserFormRevision>;
-export declare const selectLatestFormRevisionOfForm: SelectorWithArgs<string, Stored<UserFormRevision>>;
-export declare const selectFormRevisionsOfForm: SelectorWithArgs<string, Stored<UserFormRevision>[]>;
-export declare const selectLatestFormRevisionsOfComponentTypes: SelectorWithArgs<string[], Record<string, Stored<UserFormRevision>>>;
-export declare const selectLatestFormRevisionByForm: Selector<Record<Stored<UserForm>["offline_id"], Stored<UserFormRevision>>>;
-export declare const selectUserFormRevisionAttachmentsMapping: Selector<FormRevisionState["attachments"]>;
-export declare const selectAttachmentsOfFormRevision: SelectorWithArgs<string, Stored<UserFormRevisionAttachment>[]>;
-export declare const formRevisionReducer: Reducer<FormRevisionState>;