@overmap-ai/core 1.0.63-form-submission-fix.0 → 1.0.63-form-submission-fix.2

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

@@ -1,16 +1,20 @@
-import { Form, FormRevision, FormRevisionPayload, ISerializedField } from '../../typings/models/forms';
-import { OptimisticModelResult } from "../typings";
-import { Created, OvermapRootState, Submitted } from "../../typings";
-import { BaseApiService } from "./BaseApiService";
+import { Form, FormRevision, FormRevisionAttachment, FormRevisionPayload, ISerializedField } from '../../typings/models/forms';
+import { Created, OvermapRootState, Stored } from "../../typings";
 import type { BaseSDK } from "../base";
-export declare abstract class FormService<TState extends OvermapRootState, TSDK extends BaseSDK<TState>> extends BaseApiService<TState, TSDK> {
-    private getAttachImagePromises;
+import { BaseUploadService } from "./BaseUploadService";
+export declare abstract class FormService<TState extends OvermapRootState, TSDK extends BaseSDK<TState>> extends BaseUploadService<TState, TSDK> {
+    private bulkAddRevisionAttachments;
     private add;
-    addForOrganization(organizationId: number, initialRevision: FormRevisionPayload): Promise<[Submitted<Form>, Submitted<FormRevision<ISerializedField>>, Promise<Created<FormRevision<ISerializedField>>>, Promise<Created<FormRevision<ISerializedField>>>]>;
-    addForProject(projectId: number, initialRevision: FormRevisionPayload): Promise<[Submitted<Form>, Submitted<FormRevision<ISerializedField>>, Promise<Created<FormRevision<ISerializedField>>>, Promise<Created<FormRevision<ISerializedField>>>]>;
-    addForIssueType(issueTypeId: string, initialRevision: FormRevisionPayload): Promise<[Submitted<Form>, Submitted<FormRevision<ISerializedField>>, Promise<Created<FormRevision<ISerializedField>>>, Promise<Created<FormRevision<ISerializedField>>>]>;
-    addForAssetType(assetTypeId: string, initialRevision: FormRevisionPayload): Promise<[Submitted<Form>, Submitted<FormRevision<ISerializedField>>, Promise<Created<FormRevision<ISerializedField>>>, Promise<Created<FormRevision<ISerializedField>>>]>;
-    createRevision(formId: string, revision: FormRevisionPayload): Promise<OptimisticModelResult<FormRevision>>;
+    addForOrganization(organizationId: number, initialRevision: FormRevisionPayload): Promise<[Stored<Form>, Stored<FormRevision<ISerializedField>>, Stored<FormRevisionAttachment>[], Promise<Created<FormRevision<ISerializedField>>>, Promise<Created<FormRevisionAttachment>[]>]>;
+    addForProject(projectId: number, initialRevision: FormRevisionPayload): Promise<[Stored<Form>, Stored<FormRevision<ISerializedField>>, Stored<FormRevisionAttachment>[], Promise<Created<FormRevision<ISerializedField>>>, Promise<Created<FormRevisionAttachment>[]>]>;
+    addForIssueType(issueTypeId: string, initialRevision: FormRevisionPayload): Promise<[Stored<Form>, Stored<FormRevision<ISerializedField>>, Stored<FormRevisionAttachment>[], Promise<Created<FormRevision<ISerializedField>>>, Promise<Created<FormRevisionAttachment>[]>]>;
+    addForAssetType(assetTypeId: string, initialRevision: FormRevisionPayload): Promise<[Stored<Form>, Stored<FormRevision<ISerializedField>>, Stored<FormRevisionAttachment>[], Promise<Created<FormRevision<ISerializedField>>>, Promise<Created<FormRevisionAttachment>[]>]>;
+    createRevision(formId: string, revision: FormRevisionPayload): Promise<[
+        Stored<FormRevision>,
+        Stored<FormRevisionAttachment>[],
+        Promise<Created<FormRevision>>,
+        Promise<Created<FormRevisionAttachment>[]>
+    ]>;
     favorite(formId: string): Promise<undefined>;
     unfavorite(formId: string): Promise<undefined>;
     delete(formId: string): Promise<undefined>;

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

@@ -1,5 +1,5 @@
 import { FieldValue, FormSubmission, FormSubmissionAttachment, FormSubmissionPayload } from '../../typings/models/forms';
-import { OptimisticModelResult, PresignedUrlsResponse } from "../typings";
+import { PresignedUrlsResponse } from "../typings";
 import { Created, OvermapRootState, Stored } from "../../typings";
 import type { BaseSDK } from "../base";
 import { BaseUploadService } from "./BaseUploadService";
@@ -9,14 +9,18 @@ interface BulkAddRequestReturnValue {
     presigned_urls: PresignedUrlsResponse;
 }
 export declare abstract class FormSubmissionService<TState extends OvermapRootState, TSDK extends BaseSDK<TState>> extends BaseUploadService<TState, TSDK> {
-    private getAttachFilesPromises;
-    add(payload: FormSubmissionPayload): OptimisticModelResult<FormSubmission>;
+    private bulkAddSubmissionAttachments;
+    add(payload: FormSubmissionPayload): Promise<[
+        Stored<FormSubmission>,
+        Stored<FormSubmissionAttachment>[],
+        Promise<Created<FormSubmission>>,
+        Promise<Created<FormSubmissionAttachment>[]>
+    ]>;
     bulkAdd(args: {
         formRevision: string;
         commonFieldValues: Record<string, FieldValue>;
         fieldValuesByAsset: Record<string, Record<string, FieldValue>>;
     }, batchSize: number): Promise<Promise<BulkAddRequestReturnValue>[]>;
-    update(submission: Stored<FormSubmission>): OptimisticModelResult<FormSubmission>;
     delete(submissionId: string): Promise<undefined>;
     refreshStore(projectId: number): Promise<void>;
 }

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

@@ -1,11 +1,8 @@
-import { CreatedByModel, OfflineModel } from "./base";
-import { MaybeObjectURL, FileModel, FileWithNameModel } from "../files";
-import { Project } from "./projects";
-import { Document } from "./documents";
-export interface Attachment extends OfflineModel, FileWithNameModel, CreatedByModel {
+import { CreatedByModel, OfflineModel, SubmittedAtModel } from "./base";
+import { FileModel, FileWithNameModel, MaybeObjectURL } from "../files";
+export interface Attachment extends OfflineModel, SubmittedAtModel, FileWithNameModel, CreatedByModel {
     description?: string;
     file_type: string;
-    submitted_at: string;
 }
 export interface IssueAttachment extends Attachment {
     issue: string;
@@ -17,10 +14,10 @@ export interface AssetTypeAttachment extends Attachment {
     asset_type: string;
 }
 export interface ProjectAttachment extends Attachment {
-    project: Project["id"];
+    project: number;
 }
 export interface DocumentAttachment extends Attachment {
-    document: Document["offline_id"];
+    document: string;
 }
 export declare enum AttachmentModel {
     Issue = "issue",

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

@@ -1,6 +1,6 @@
 import { HTMLInputTypeAttribute } from "react";
 import { CreatedByModel, OfflineModel, Payload, SubmittedAtModel } from "./base";
-import { FileWithNameModel } from '../files';
+import { Attachment } from "./attachments";
 export interface BaseSerializedField<TIdentifier extends FieldTypeIdentifier = FieldTypeIdentifier> extends BaseSerializedObject<TIdentifier> {
     label: string;
     required: boolean;
@@ -121,11 +121,11 @@ export interface FormSubmission extends OfflineModel, SubmittedAtModel, CreatedB
     asset?: string;
     asset_stage?: string;
 }
-export interface FormSubmissionAttachment extends OfflineModel, FileWithNameModel {
+export interface FormSubmissionAttachment extends Attachment {
     submission: string;
     field_identifier: string;
 }
-export interface FormRevisionAttachment extends OfflineModel, FileWithNameModel {
+export interface FormRevisionAttachment extends Attachment {
     revision: string;
     field_identifier: string;
 }

package/package.json

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