@overmap-ai/core 1.0.78-gcs.3 → 1.0.78-gcs.4

package/dist/typings/files.d.ts

@@ -1,16 +1,15 @@
-export interface OptionalFileModel {
-    file: string | null;
+import { Model } from './models';
+export interface OptionalFileModel extends Model {
+    file_url: string | null;
     file_sha1: string | null;
-}
-export interface OptionalFileWithNameModel extends OptionalFileModel {
+    file_extension: string | null;
     file_name: string | null;
 }
-export interface RequiredFileModel {
-    file: string;
-    file_sha1: string;
-}
-export interface RequiredFileWithNameModel extends RequiredFileModel {
-    file_name: string;
+export interface RequiredFileModel extends Model {
+    file_url: NonNullable<OptionalFileModel["file_url"]>;
+    file_sha1: NonNullable<OptionalFileModel["file_sha1"]>;
+    file_extension: NonNullable<OptionalFileModel["file_extension"]>;
+    file_name: NonNullable<OptionalFileModel["file_name"]>;
     file_type: string | null;
 }
 export interface FilePayload {
@@ -19,8 +18,22 @@ export interface FilePayload {
     extension: string;
     size: number;
 }
-export interface FileModelPayload {
-    file_sha1: string;
-    file_name: string;
-    file_extension: string;
+export interface GetS3UrlSuccessResponse {
+    url: string;
+    fields: Record<string, string>;
+}
+export interface GetS3UrlWarningResponse {
+    warning: string;
 }
+export type GetS3UrlResponse = GetS3UrlSuccessResponse | GetS3UrlWarningResponse;
+export type PresignedUrlsResponse = Record<string, GetS3UrlSuccessResponse>;
+export type FileAnnotated<T> = T extends {
+    file: unknown;
+} ? never : T & {
+    file: File;
+};
+export type FilePayloadAnnotated<T> = T extends {
+    file: unknown;
+} ? never : T & {
+    file: FilePayload;
+};

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

@@ -1,5 +1,5 @@
 import { SerializedCondition } from '@overmap-ai/forms';
-import { RequiredFileWithNameModel } from '../files';
+import { RequiredFileModel } from '../files';
 import { AbbreviationModel, ColorModel, CreatedByModel, GeometryModel, IconModel, IdentifierModel, IdentifierValueModel, IndexedModel, SubmittedAtModel, TimestampedModel, TreeModel, UUIDModel } from './base';
 import { FieldsAttachmentModel, FieldsModel, FieldValuesModel } from './fields';
 import { Organization } from './organizations';
@@ -97,13 +97,13 @@ export interface AssetTypeIdentifierValue extends UUIDModel, SubmittedAtModel, T
     asset: Asset["uuid"];
     asset_type_identifier: AssetTypeIdentifier["uuid"];
 }
-export interface AssetAttachment extends UUIDModel, TimestampedModel, SubmittedAtModel, RequiredFileWithNameModel, CreatedByModel {
+export interface AssetAttachment extends UUIDModel, TimestampedModel, SubmittedAtModel, RequiredFileModel, CreatedByModel {
     asset: Asset["uuid"];
 }
-export interface AssetTypeAttachment extends UUIDModel, TimestampedModel, SubmittedAtModel, RequiredFileWithNameModel, CreatedByModel {
+export interface AssetTypeAttachment extends UUIDModel, TimestampedModel, SubmittedAtModel, RequiredFileModel, CreatedByModel {
     asset_type: AssetType["uuid"];
 }
-export interface AssetProcedureTypeAttachment extends UUIDModel, TimestampedModel, SubmittedAtModel, RequiredFileWithNameModel, CreatedByModel {
+export interface AssetProcedureTypeAttachment extends UUIDModel, TimestampedModel, SubmittedAtModel, RequiredFileModel, CreatedByModel {
     asset_procedure_type: AssetProcedureType["uuid"];
 }
 export interface AssetTypeStatus extends UUIDModel, SubmittedAtModel, TimestampedModel, ColorModel, CreatedByModel {

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

@@ -1,4 +1,4 @@
-import { RequiredFileWithNameModel } from '../files';
+import { RequiredFileModel } from '../files';
 import { ColorModel, CreatedByModel, IconModel, SubmittedAtModel, TimestampedModel, UUIDModel } from './base';
 import { Organization } from './organizations';
 import { Project } from './projects';
@@ -10,7 +10,7 @@ export interface Document extends UUIDModel, SubmittedAtModel, CreatedByModel, T
     project: Project["uuid"] | null;
     organization: Organization["uuid"] | null;
 }
-export interface DocumentAttachment extends UUIDModel, TimestampedModel, SubmittedAtModel, RequiredFileWithNameModel, CreatedByModel {
+export interface DocumentAttachment extends UUIDModel, TimestampedModel, SubmittedAtModel, RequiredFileModel, CreatedByModel {
     document: Document["uuid"];
 }
 export type MovePosition = "left" | "right" | "left-child" | "right-child";

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

@@ -1,5 +1,5 @@
 import { SerializedField, SerializedFieldSection, SerializedFieldValues } from '@overmap-ai/forms';
-import { RequiredFileWithNameModel } from '../files';
+import { RequiredFileModel } from '../files';
 export interface FieldsModel {
     fields: SerializedFieldSection[];
     revision: number;
@@ -8,9 +8,9 @@ export interface FieldValuesModel {
     published_at: string | null;
     values: SerializedFieldValues;
 }
-export interface FieldsAttachmentModel extends RequiredFileWithNameModel {
+export interface FieldsAttachmentModel extends RequiredFileModel {
     field_identifier: SerializedField["identifier"];
 }
-export interface FieldValuesAttachmentModel extends RequiredFileWithNameModel {
+export interface FieldValuesAttachmentModel extends RequiredFileModel {
     field_identifier: SerializedField["identifier"];
 }

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

@@ -3,15 +3,16 @@ import { FieldsAttachmentModel, FieldsModel, FieldValuesAttachmentModel, FieldVa
 import { Organization } from './organizations';
 export interface Form extends UUIDModel, TimestampedModel, SubmittedAtModel, CreatedByModel {
     organization: Organization["uuid"];
+    name: string;
+    description: string | null;
 }
 export interface FormRevision extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel {
     form: Form["uuid"];
-    title: string;
-    description: string | null;
 }
 export type FormRevisionPayload = Omit<Payload<FormRevision>, "revision">;
 export interface FormSubmission extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel, IndexedModel {
     form_revision: FormRevision["uuid"];
+    form: Form["uuid"];
 }
 export interface FormSubmissionAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesAttachmentModel {
     form_submission: FormSubmission["uuid"];

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

@@ -1,14 +1,14 @@
-import { RequiredFileWithNameModel } from '../files';
+import { RequiredFileModel } from '../files';
 import { CanvasMarkableModel, CreatedByModel, IndexedModel, MarkableModel, Payload, SubmittedAtModel, TimestampedModel, UUIDModel } from './base';
 import { Project } from './projects';
-export interface GeoImage extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, MarkableModel, CanvasMarkableModel, RequiredFileWithNameModel, IndexedModel {
+export interface GeoImage extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, MarkableModel, CanvasMarkableModel, RequiredFileModel, IndexedModel {
     title: string | null;
     description: string | null;
     project: Project["uuid"];
     direction: number | null;
     original_date: string | null;
 }
-export type GeoImagePayload = Omit<Payload<GeoImage>, "file_name" | "file_sha1" | "file" | "file_type"> & {
+export type GeoImagePayload = Omit<Payload<GeoImage>, "file_name" | "file_sha1" | "file_url" | "file_type" | "file_extension"> & {
     file: File;
 };
 export type BulkGeoImagePayload = Omit<GeoImagePayload, "project">;

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

@@ -1,4 +1,4 @@
-import { RequiredFileWithNameModel } from '../files';
+import { RequiredFileModel } from '../files';
 import { Asset } from './assets';
 import { AbbreviationModel, CanvasMarkableModel, ColorModel, CreatedByModel, IconModel, IdentifierModel, IdentifierValueModel, IndexedModel, MarkableModel, SubmittedAtModel, TimestampedModel, UUIDModel } from './base';
 import { FieldsAttachmentModel, FieldsModel, FieldValuesModel } from './fields';
@@ -71,13 +71,13 @@ export interface IssueTypeIdentifierValue extends UUIDModel, SubmittedAtModel, T
     issue: Issue["uuid"];
     issue_type_identifier: IssueTypeIdentifier["uuid"];
 }
-export interface IssueAttachment extends UUIDModel, TimestampedModel, SubmittedAtModel, RequiredFileWithNameModel, CreatedByModel {
+export interface IssueAttachment extends UUIDModel, TimestampedModel, SubmittedAtModel, RequiredFileModel, CreatedByModel {
     issue: Issue["uuid"];
 }
-export interface IssueTypeAttachment extends UUIDModel, TimestampedModel, SubmittedAtModel, RequiredFileWithNameModel, CreatedByModel {
+export interface IssueTypeAttachment extends UUIDModel, TimestampedModel, SubmittedAtModel, RequiredFileModel, CreatedByModel {
     issue_type: IssueType["uuid"];
 }
-export interface IssueCommentAttachment extends UUIDModel, TimestampedModel, SubmittedAtModel, RequiredFileWithNameModel, CreatedByModel {
+export interface IssueCommentAttachment extends UUIDModel, TimestampedModel, SubmittedAtModel, RequiredFileModel, CreatedByModel {
     issue_comment: IssueComment["uuid"];
 }
 export interface IssueTypeStatus extends UUIDModel, SubmittedAtModel, TimestampedModel, ColorModel, CreatedByModel {

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

@@ -1,4 +1,4 @@
-import { RequiredFileWithNameModel } from '../files';
+import { RequiredFileModel } from '../files';
 import { BoundableModel, CanvasBoundableModel, CreatedByModel, PolygonBoundedModel, SubmittedAtModel, TimestampedModel, UUIDModel } from './base';
 import { Organization, OrganizationAccess } from './organizations';
 import { User } from './users';
@@ -6,7 +6,7 @@ export interface Project extends UUIDModel, TimestampedModel, PolygonBoundedMode
     name: string;
     organization: Organization["uuid"];
 }
-export interface ProjectFile extends UUIDModel, SubmittedAtModel, TimestampedModel, RequiredFileWithNameModel, BoundableModel, CanvasBoundableModel, CreatedByModel {
+export interface ProjectFile extends UUIDModel, SubmittedAtModel, TimestampedModel, RequiredFileModel, BoundableModel, CanvasBoundableModel, CreatedByModel {
     z_index: number;
     project: Project["uuid"];
 }
@@ -15,6 +15,6 @@ export interface ProjectAccess extends UUIDModel, CreatedByModel, TimestampedMod
     project: Project["uuid"];
     organization_access: OrganizationAccess["uuid"];
 }
-export interface ProjectAttachment extends UUIDModel, TimestampedModel, SubmittedAtModel, RequiredFileWithNameModel, CreatedByModel {
+export interface ProjectAttachment extends UUIDModel, TimestampedModel, SubmittedAtModel, RequiredFileModel, CreatedByModel {
     project: Project["uuid"];
 }

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

@@ -1,4 +1,3 @@
-import { OptionalFileModel } from '../files';
 import { UUIDModel } from './base';
 import { Organization } from './organizations';
 export interface User extends UUIDModel {
@@ -10,9 +9,6 @@ export interface User extends UUIDModel {
     is_active: boolean;
     date_joined: string;
 }
-export interface Profile extends OptionalFileModel {
-    tour_step: number;
-}
 export interface RegistrationPayload {
     username: string;
     password: string;

package/dist/utils/file.d.ts

@@ -1,13 +1,9 @@
-import { FilePayload } 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;
-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<FilePayload[]>;
-export declare const fileToBlob: (dataUrl: string) => Promise<Blob>;
-export declare const blobToBase64: (blob: Blob) => Promise<string>;
-/** Converts a profile `file` and `fileSha1` into an img src that can be rendered. This relies on an API request. */
+export declare const getS3FileKey: (sha1: string, extension: string) => string;
+export declare function getRenamedFile(file: File, newName: string): File;
+export declare function getFileExtension(file: File): string;
+export declare const fetchBlobFromObjectUrl: (objectUrl: string) => Promise<Blob>;
+export declare const fetchFileFromObjectUrl: (objectUrl: string, name: string) => Promise<File>;
 export declare function downloadFile(file: File): void;
+export declare function isObjectUrl(value: unknown): value is `blob:${string}`;
+export declare function isImageFile(file: File): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@overmap-ai/core",
-	"version": "1.0.78-gcs.3",
+	"version": "1.0.78-gcs.4",
 	"description": "Core functionality for Overmap",
 	"keywords": [
 		"components",
@@ -55,7 +55,7 @@
 	},
 	"devDependencies": {
 		"@overmap-ai/forms": "^1.0.34",
-		"@tiptap/core": "^3.0.7",
+		"@tiptap/core": "3.10.4",
 		"@types/file-saver": "^2.0.7",
 		"@types/geojson": "^7946.0.16",
 		"@types/jwt-decode": "^3.1.0",
@@ -81,7 +81,7 @@
 	},
 	"peerDependencies": {
 		"@overmap-ai/forms": "^1.0.34",
-		"@tiptap/core": "^2.4.0",
+		"@tiptap/core": "3.10.4",
 		"react": ">=18.2.0 <20.0.0",
 		"react-dom": ">=18.2.0 <20.0.0"
 	},

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

@@ -1,23 +0,0 @@
-import { OvermapRootState } from '../../store';
-import { FileModelPayload, FilePayload, RequiredFileWithNameModel, Stored, Submitted, User, UUIDModel } from '../../typings';
-import { BaseSDK } from '../base';
-import { OptimisticMultipleModelResult } from '../typings';
-import { BaseOfflineModelApiService } from './BaseOfflineModelApiService';
-export interface BuildModelData {
-    file: File;
-    file_sha1: string;
-    submitted_at: string;
-    created_by: User["uuid"] | null;
-    modelUuid: UUIDModel["uuid"];
-}
-export declare abstract class BaseOfflineAttachmentModelService<TState extends OvermapRootState, TSDK extends BaseSDK<TState>, TModelId extends string, TModel extends RequiredFileWithNameModel> extends BaseOfflineModelApiService<TModelId, TModel, TState, TSDK> {
-    protected pageSize: number;
-    protected abstract getId(model: Stored<TModel>): TModelId;
-    protected abstract buildModel(data: BuildModelData): Submitted<TModel>;
-    protected abstract buildPayload(model: Submitted<TModel>, filePayload: FilePayload): FileModelPayload;
-    _bulkAdd(payloads: {
-        modelUuid: UUIDModel["uuid"];
-        file: File;
-    }[]): Promise<OptimisticMultipleModelResult<TModel>>;
-    _delete(uuid: TModelId): Promise<void>;
-}