@overmap-ai/core 1.0.71-depend-on-forms.0 → 1.0.71-fields.0

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

@@ -1,41 +1,26 @@
 import type { CreatedByModel, OfflineModel, Payload, SubmittedAtModel, TimestampedModel } from "./base";
-import type { Attachment } from "./attachments";
-import type { BaseSerializedObject, FieldValue, ISerializedField } from "@overmap-ai/forms";
+import type { BaseSerializedObject, ISerializedField } from "@overmap-ai/forms";
+import type { FieldsAttachmentModel, FieldsModel, FieldValuesAttachmentModel, FieldValuesModel } from "./fields";
 export interface Form extends OfflineModel, SubmittedAtModel, CreatedByModel {
-    asset_type?: string;
-    issue_type?: string;
     organization?: number;
     project?: number;
 }
-export type SubmittedForm = Form & OfflineModel & {
-    created_by: number;
-    submitted_at: string;
-};
-export type CachedForm = SubmittedForm & {
-    latestRevision: FormRevision;
-};
-export interface FormRevision<TFields extends BaseSerializedObject = ISerializedField> extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel {
+export interface FormRevision<TFields extends BaseSerializedObject = ISerializedField> extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel<TFields> {
     form: string;
     title: string;
     description?: string;
-    fields: TFields[];
-    revision: number | "Pending";
 }
-export type FormRevisionPayload = Omit<Payload<FormRevision>, "revision" | "form">;
-export interface FormSubmission extends OfflineModel, SubmittedAtModel, CreatedByModel {
-    published_at?: string | null;
+export type FormRevisionPayload = Omit<Payload<FormRevision>, "revision">;
+export interface FormSubmission extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel {
     form_revision: string;
     project: number;
-    values: Record<string, FieldValue>;
-    issue?: string;
-    asset?: string;
-    asset_stage?: string;
+    issue?: string | null;
+    asset?: string | null;
+    asset_stage?: string | null;
 }
-export interface FormSubmissionAttachment extends Attachment {
-    submission: string;
-    field_identifier: string;
+export interface FormSubmissionAttachment extends FieldValuesAttachmentModel {
+    form_submission: string;
 }
-export interface FormRevisionAttachment extends Attachment {
-    revision: string;
-    field_identifier: string;
+export interface FormRevisionAttachment extends FieldsAttachmentModel {
+    form_revision: string;
 }

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

@@ -4,6 +4,7 @@ export * from "./base";
 export * from "./categories";
 export * from "./assets";
 export * from "./forms";
+export * from "./fields";
 export * from "./geo";
 export * from "./issues";
 export * from "./issueTypes";

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

@@ -4,6 +4,8 @@ import type { WorkspaceIndexedModel } from "./workspace";
 import type { CanvasMarkableModel, MarkableModel } from "./geo";
 import type { User } from "./users";
 import type { CSSColor } from "../colors";
+import type { BaseSerializedObject, ISerializedField } from "@overmap-ai/forms";
+import type { FieldsAttachmentModel, FieldsModel, FieldValuesModel } from "./fields";
 /**
  * Represents a model instance that has been submitted to the backend. Some properties (depending on which model, but in
  * all cases, the `offline_id`) are guaranteed to be set.
@@ -95,3 +97,16 @@ export interface IssueAssociation extends OfflineModel, SubmittedAtModel, Create
     issue?: string;
     asset?: string;
 }
+export interface IssueTypeFields<TFields extends BaseSerializedObject = ISerializedField> extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel<TFields> {
+    issue_type: string;
+}
+export interface IssueTypeFieldsAttachment extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
+    fields_revision: string;
+}
+export interface IssueTypeFieldValues extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel {
+    fields_revision: string;
+    issue: string;
+}
+export interface IssueTypeFieldValuesAttachment extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
+    field_values: string;
+}

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

@@ -1,6 +1,6 @@
 /// <reference types="@redux-offline/redux-offline" />
 import { OfflineState } from "@redux-offline/redux-offline/lib/types";
-import type { AgentsState, AssetAttachmentState, AssetStageCompletionState, AssetStageState, AssetState, AssetTypeAttachmentState, AssetTypeState, AuthState, CategoryState, DocumentAttachmentState, DocumentState, EmailDomainState, FileState, FormRevisionAttachmentState, FormRevisionState, FormState, FormSubmissionAttachmentState, FormSubmissionState, GeoImageSliceState, IssueAssociationSliceState, IssueAttachmentState, IssueCommentState, IssueState, IssueTypeState, IssueUpdateState, LicenseState, OrganizationAccessState, OrganizationState, OutboxState, ProjectAccessState, ProjectAttachmentState, ProjectFileState, ProjectState, RehydratedState, TeamState, UserState, VERSION_REDUCER_KEY, VersioningState, WorkspaceState } from "../../store";
+import type { AgentsState, AssetAttachmentState, AssetStageCompletionState, AssetStageState, AssetState, AssetTypeAttachmentState, AssetTypeFieldsAttachmentState, AssetTypeFieldsState, AssetTypeFieldValuesAttachmentState, AssetTypeFieldValuesState, AssetTypeState, AuthState, CategoryState, DocumentAttachmentState, DocumentState, EmailDomainState, FileState, FormRevisionAttachmentState, FormRevisionState, FormState, FormSubmissionAttachmentState, FormSubmissionState, GeoImageSliceState, IssueAssociationSliceState, IssueAttachmentState, IssueCommentState, IssueState, IssueTypeFieldsAttachmentState, IssueTypeFieldsState, IssueTypeFieldValuesAttachmentState, IssueTypeFieldValuesState, IssueTypeState, IssueUpdateState, LicenseState, OrganizationAccessState, OrganizationState, OutboxState, ProjectAccessState, ProjectAttachmentState, ProjectFileState, ProjectState, RehydratedState, TeamState, UserState, VERSION_REDUCER_KEY, VersioningState, WorkspaceState } from "../../store";
 export interface BaseState {
     outboxReducer: OutboxState;
     offline: OfflineState;
@@ -43,4 +43,12 @@ export interface OvermapRootState extends BaseState {
     agentsReducer: AgentsState;
     geoImageReducer: GeoImageSliceState;
     issueAssociationReducer: IssueAssociationSliceState;
+    issueTypeFieldsReducer: IssueTypeFieldsState;
+    issueTypeFieldValuesReducer: IssueTypeFieldValuesState;
+    issueTypeFieldsAttachmentReducer: IssueTypeFieldsAttachmentState;
+    issueTypeFieldValuesAttachmentReducer: IssueTypeFieldValuesAttachmentState;
+    assetTypeFieldsReducer: AssetTypeFieldsState;
+    assetTypeFieldValuesReducer: AssetTypeFieldValuesState;
+    assetTypeFieldsAttachmentReducer: AssetTypeFieldsAttachmentState;
+    assetTypeFieldValuesAttachmentReducer: AssetTypeFieldValuesAttachmentState;
 }

package/dist/utils/file.d.ts

@@ -1,4 +1,4 @@
-import { FileUploadPayload } from "../typings";
+import type { 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;
@@ -6,7 +6,7 @@ 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 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. */

package/package.json

@@ -3,7 +3,7 @@
 	"description": "Core functionality for Overmap",
 	"author": "Wôrdn Inc.",
 	"license": "UNLICENSED",
-	"version": "1.0.71-depend-on-forms.0",
+	"version": "1.0.71-fields.0",
 	"type": "module",
 	"main": "dist/overmap-core.umd.cjs",
 	"module": "dist/overmap-core.js",