@overmap-ai/core 1.0.63-form-submission-fix.4 → 1.0.63-org-projs-only.1

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

@@ -1,20 +1,16 @@
-import { Form, FormRevision, FormRevisionAttachment, FormRevisionPayload, ISerializedField } from '../../typings/models/forms';
-import { Created, OvermapRootState, Stored } from "../../typings";
+import { Form, FormRevision, FormRevisionPayload, ISerializedField } from '../../typings/models/forms';
+import { OptimisticModelResult } from "../typings";
+import { Created, OvermapRootState, Submitted } from "../../typings";
+import { BaseApiService } from "./BaseApiService";
 import type { BaseSDK } from "../base";
-import { BaseUploadService } from "./BaseUploadService";
-export declare abstract class FormService<TState extends OvermapRootState, TSDK extends BaseSDK<TState>> extends BaseUploadService<TState, TSDK> {
-    private bulkAddRevisionAttachments;
+export declare abstract class FormService<TState extends OvermapRootState, TSDK extends BaseSDK<TState>> extends BaseApiService<TState, TSDK> {
+    private getAttachImagePromises;
     private add;
-    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>[]>
-    ]>;
+    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>>;
     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,6 @@
+import { Offline } from '../../typings/models/base';
 import { FieldValue, FormSubmission, FormSubmissionAttachment, FormSubmissionPayload } from '../../typings/models/forms';
-import { PresignedUrlsResponse } from "../typings";
+import { OptimisticModelResult, PresignedUrlsResponse } from "../typings";
 import { Created, OvermapRootState, Stored } from "../../typings";
 import type { BaseSDK } from "../base";
 import { BaseUploadService } from "./BaseUploadService";
@@ -9,18 +10,14 @@ interface BulkAddRequestReturnValue {
     presigned_urls: PresignedUrlsResponse;
 }
 export declare abstract class FormSubmissionService<TState extends OvermapRootState, TSDK extends BaseSDK<TState>> extends BaseUploadService<TState, TSDK> {
-    private bulkAddSubmissionAttachments;
-    add(payload: FormSubmissionPayload): Promise<[
-        Stored<FormSubmission>,
-        Stored<FormSubmissionAttachment>[],
-        Promise<Created<FormSubmission>>,
-        Promise<Created<FormSubmissionAttachment>[]>
-    ]>;
+    private getAttachFilesPromises;
+    add(payload: Offline<FormSubmissionPayload>): OptimisticModelResult<FormSubmission>;
     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,8 +1,11 @@
-import { CreatedByModel, OfflineModel, SubmittedAtModel } from "./base";
-import { FileModel, FileWithNameModel, MaybeObjectURL } from "../files";
-export interface Attachment extends OfflineModel, SubmittedAtModel, FileWithNameModel, CreatedByModel {
+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 {
     description?: string;
     file_type: string;
+    submitted_at: string;
 }
 export interface IssueAttachment extends Attachment {
     issue: string;
@@ -14,10 +17,10 @@ export interface AssetTypeAttachment extends Attachment {
     asset_type: string;
 }
 export interface ProjectAttachment extends Attachment {
-    project: number;
+    project: Project["id"];
 }
 export interface DocumentAttachment extends Attachment {
-    document: string;
+    document: Document["offline_id"];
 }
 export declare enum AttachmentModel {
     Issue = "issue",

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

@@ -30,8 +30,7 @@ export interface OptionalFileModel {
     file?: string | null;
     objectURL?: string;
 }
-export interface OwnedByUserOrOrganization {
-    user_owner: number;
+export interface OwnedByOrganization {
     organization_owner: number;
 }
 export interface SubmittedAtModel {

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

@@ -1,6 +1,6 @@
 import { HTMLInputTypeAttribute } from "react";
 import { CreatedByModel, OfflineModel, Payload, SubmittedAtModel } from "./base";
-import { Attachment } from "./attachments";
+import { FileWithNameModel } from '../files';
 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 Attachment {
+export interface FormSubmissionAttachment extends OfflineModel, FileWithNameModel {
     submission: string;
     field_identifier: string;
 }
-export interface FormRevisionAttachment extends Attachment {
+export interface FormRevisionAttachment extends OfflineModel, FileWithNameModel {
     revision: string;
     field_identifier: string;
 }

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

@@ -1,4 +1,4 @@
-import { OfflineModel, OwnedByUserOrOrganization } from "./base";
+import { OfflineModel, OwnedByOrganization } from "./base";
 export declare enum PaddleCheckoutEvent {
     COMPLETED = "checkout.completed",
     CLOSED = "checkout.closed"
@@ -16,7 +16,7 @@ export declare enum LicenseStatus {
 export interface Transaction {
     id: string;
 }
-export interface License extends OfflineModel, OwnedByUserOrOrganization {
+export interface License extends OfflineModel, OwnedByOrganization {
     project: number | null;
     level: LicenseLevel;
     status: LicenseStatus;

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

@@ -1,11 +1,9 @@
-import { Model, OfflineModel } from "./base";
+import { Model, OfflineModel, OwnedByOrganization } from "./base";
 import { FileWithNameModel } from "../files";
 import { BoundableModel, CanvasBoundableModel } from "./geo";
-export interface Project extends Model, BoundableModel, CanvasBoundableModel {
+export interface Project extends Model, BoundableModel, CanvasBoundableModel, OwnedByOrganization {
     id: number;
     name: string;
-    organization_owner: number | null;
-    user_owner: number | null;
     invited?: boolean;
     issues_count?: number;
     form_submissions_count?: number;

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.4",
+	"version": "1.0.63-org-projs-only.1",
 	"type": "module",
 	"main": "dist/overmap-core.umd.cjs",
 	"module": "dist/overmap-core.js",