@overmap-ai/core 1.0.71-mapbox.6 → 1.0.71-mapbox.7

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

@@ -0,0 +1,65 @@
+import { Reducer } from '@reduxjs/toolkit';
+import { IssueTypeFields, IssueTypeFieldValues, OvermapRootState, OvermapSelectorWithArgs, Stored } from '../../typings';
+import { ModelState } from '../typings';
+
+export type IssueTypeFieldsState = ModelState<Stored<IssueTypeFields>>;
+export declare const issueTypeFieldsSlice: import('@reduxjs/toolkit').Slice<IssueTypeFieldsState, {
+    initializeIssueTypeFields: (state: ModelState<Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>>, action: {
+        payload: Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>[];
+        type: string;
+    }) => void;
+    addIssueTypeFields: (state: ModelState<Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>>, action: {
+        payload: Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>;
+        type: string;
+    }) => void;
+    addIssueTypeFieldsMany: (state: ModelState<Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>>, action: {
+        payload: Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>[];
+        type: string;
+    }) => void;
+    setIssueTypeFields: (state: ModelState<Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>>, action: {
+        payload: Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>;
+        type: string;
+    }) => void;
+    setIssueTypeFieldsMany: (state: ModelState<Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>>, action: {
+        payload: Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>[];
+        type: string;
+    }) => void;
+    updateIssueTypeFields: (state: ModelState<Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>>, action: {
+        payload: Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>;
+        type: string;
+    }) => void;
+    updateIssueTypeFieldsMany: (state: ModelState<Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>>, action: {
+        payload: Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>[];
+        type: string;
+    }) => void;
+    deleteIssueTypeFields: (state: ModelState<Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>>, action: import('@reduxjs/toolkit').PayloadAction<string>) => void;
+    deleteIssueTypeFieldsMany: (state: ModelState<Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>>, action: import('@reduxjs/toolkit').PayloadAction<string[]>) => void;
+}, "issueTypeFields", "issueTypeFields", import('@reduxjs/toolkit').SliceSelectors<IssueTypeFieldsState>>;
+export declare const initializeIssueTypeFields: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>[], "issueTypeFields/initializeIssueTypeFields">, addIssueTypeFields: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>, "issueTypeFields/addIssueTypeFields">, addIssueTypeFieldsMany: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>[], "issueTypeFields/addIssueTypeFieldsMany">, setIssueTypeFields: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>, "issueTypeFields/setIssueTypeFields">, setIssueTypeFieldsMany: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>[], "issueTypeFields/setIssueTypeFieldsMany">, updateIssueTypeFields: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>, "issueTypeFields/updateIssueTypeFields">, updateIssueTypeFieldsMany: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>[], "issueTypeFields/updateIssueTypeFieldsMany">, deleteIssueTypeFields: import('@reduxjs/toolkit').ActionCreatorWithPayload<string, "issueTypeFields/deleteIssueTypeFields">, deleteIssueTypeFieldsMany: import('@reduxjs/toolkit').ActionCreatorWithPayload<string[], "issueTypeFields/deleteIssueTypeFieldsMany">;
+export declare const selectIssueTypeFieldsMapping: (state: OvermapRootState) => Record<string, Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>>;
+export declare const selectIssueTypeFields: ((state: OvermapRootState) => Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>[]) & {
+    clearCache: () => void;
+    resultsCount: () => number;
+    resetResultsCount: () => void;
+} & {
+    resultFunc: (resultFuncArgs_0: Record<string, Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>>) => Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>[];
+    memoizedResultFunc: ((resultFuncArgs_0: Record<string, Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>>) => Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>[]) & {
+        clearCache: () => void;
+        resultsCount: () => number;
+        resetResultsCount: () => void;
+    };
+    lastResult: () => Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>[];
+    dependencies: [(state: OvermapRootState) => Record<string, Stored<IssueTypeFields<import('@overmap-ai/forms').ISerializedField>>>];
+    recomputations: () => number;
+    resetRecomputations: () => void;
+    dependencyRecomputations: () => number;
+    resetDependencyRecomputations: () => void;
+} & {
+    argsMemoize: typeof import('reselect').weakMapMemoize;
+    memoize: typeof import('reselect').weakMapMemoize;
+};
+export declare const selectIssueTypeFieldsOfIssueType: OvermapSelectorWithArgs<string, Stored<IssueTypeFields>[]>;
+export declare const selectLatestIssueTypeFieldsOfIssueType: OvermapSelectorWithArgs<string, IssueTypeFields | undefined>;
+export declare const selectIssueTypeValuesOfIssueType: OvermapSelectorWithArgs<string, Stored<IssueTypeFieldValues>[]>;
+export declare const selectIssueTypeFieldsById: OvermapSelectorWithArgs<string, Stored<IssueTypeFields> | undefined>;
+export declare const issueTypeFieldsReducer: Reducer<IssueTypeFieldsState>;

package/dist/store/store.d.ts

@@ -2,7 +2,7 @@ import { Reducer } from '@reduxjs/toolkit';
 import { Config, OfflineAction, OfflineMetadata } from '@redux-offline/redux-offline/lib/types';
 import { default as request } from 'superagent';
 import { BaseSDK, OfflineMetaEffect, OutboxCoordinator, RequestDetails } from '../sdk';
-import { 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, VersioningState, WorkspaceState } from './slices';
+import { 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, VersioningState, WorkspaceState } from './slices';
 import { BaseState, OvermapRootState } from '../typings';
 
 export declare const VERSION_REDUCER_KEY = "versioning";
@@ -45,6 +45,14 @@ export declare const overmapReducers: {
     issueAttachmentReducer: Reducer<IssueAttachmentState>;
     geoImageReducer: Reducer<GeoImageSliceState>;
     issueAssociationReducer: Reducer<IssueAssociationSliceState>;
+    issueTypeFieldsReducer: Reducer<IssueTypeFieldsState>;
+    issueTypeFieldValuesReducer: Reducer<IssueTypeFieldValuesState>;
+    issueTypeFieldsAttachmentReducer: Reducer<IssueTypeFieldsAttachmentState>;
+    issueTypeFieldValuesAttachmentReducer: Reducer<IssueTypeFieldValuesAttachmentState>;
+    assetTypeFieldsReducer: Reducer<AssetTypeFieldsState>;
+    assetTypeFieldValuesReducer: Reducer<AssetTypeFieldValuesState>;
+    assetTypeFieldsAttachmentReducer: Reducer<AssetTypeFieldsAttachmentState>;
+    assetTypeFieldValuesAttachmentReducer: Reducer<AssetTypeFieldValuesAttachmentState>;
 };
 export declare const resetStore = "RESET";
 export declare const overmapRootReducer: Reducer<OvermapRootState>;

package/dist/typings/files.d.ts

@@ -12,10 +12,14 @@ export type FileModel = MaybeObjectURL<{
 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;
+export interface FilePayload {
+    sha1: FileModel["file_sha1"];
     file_type: string;
+    extension: string;
     size: number;
 }
+export interface FileModelPayload {
+    file_sha1: FileWithNameModel["file_sha1"];
+    file_name: FileWithNameModel["file_name"];
+    file_extension: string;
+}

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

@@ -1,14 +1,17 @@
+import { BaseSerializedObject, ISerializedField } from '@overmap-ai/forms';
 import { ColorModel, CreatedByModel, IconModel, OfflineModel, SubmittedAtModel, TimestampedModel } from './base';
 import { CanvasMarkableModel, MarkableModel } from './geo';
+import { FieldsAttachmentModel, FieldsModel, FieldValuesModel } from './fields';
 
 export interface Asset extends OfflineModel, TimestampedModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel {
     asset_type: string;
     created_at?: string;
     label: string | null;
     description?: string;
+    project: number;
 }
 export interface AssetType extends OfflineModel, TimestampedModel, SubmittedAtModel, CreatedByModel, IconModel, ColorModel {
-    project: number;
+    organization: number;
     name?: string;
     description?: string;
 }
@@ -17,10 +20,22 @@ export interface AssetStage extends OfflineModel, TimestampedModel, SubmittedAtM
     name?: string | null;
     description?: string | null;
     priority: number;
-    form?: string;
 }
 export interface AssetStageCompletion extends OfflineModel, TimestampedModel, SubmittedAtModel, CreatedByModel {
     asset: string;
     stage: string;
 }
 export type CompletedStagesMapping = Record<string, Record<string, string>>;
+export interface AssetTypeFields<TFields extends BaseSerializedObject = ISerializedField> extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel<TFields> {
+    asset_type: string;
+}
+export interface AssetTypeFieldsAttachment extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
+    fields_revision: string;
+}
+export interface AssetTypeFieldValues extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel {
+    fields_revision: string;
+    asset: string;
+}
+export interface AssetTypeFieldValuesAttachment extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
+    field_values: string;
+}

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

@@ -1,5 +1,5 @@
 import { CreatedByModel, OfflineModel, SubmittedAtModel } from './base';
-import { FileModel, FileWithNameModel, MaybeObjectURL } from '../files';
+import { FileModel, FileWithNameModel } from '../files';
 
 export interface Attachment extends OfflineModel, SubmittedAtModel, FileWithNameModel, CreatedByModel {
     description?: string;
@@ -20,9 +20,4 @@ export interface ProjectAttachment extends Attachment {
 export interface DocumentAttachment extends Attachment {
     document: string;
 }
-/** to get an AttachmentPayload for a specific type, pass in the given AttachmentType
- * ex. AttachmentPayload<IssueAttachment> */
-export type AttachmentPayload<TAttachment> = Omit<TAttachment, "file" | "submitted_at" | "created_by"> & {
-    file: MaybeObjectURL<File>;
-};
 export type ProfilePic = FileModel;

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

@@ -0,0 +1,17 @@
+import { BaseSerializedObject, FieldValue, ISerializedField } from '@overmap-ai/forms';
+import { FileWithNameModel } from '../files';
+
+export interface FieldsModel<TFields extends BaseSerializedObject = ISerializedField> {
+    fields: TFields[];
+    revision: number | "Pending";
+}
+export interface FieldValuesModel {
+    published_at?: string | null;
+    values: Record<string, FieldValue>;
+}
+export interface FieldsAttachmentModel extends FileWithNameModel {
+    field_identifier: string;
+}
+export interface FieldValuesAttachmentModel extends FileWithNameModel {
+    field_identifier: string;
+}

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

@@ -1,42 +1,25 @@
 import { CreatedByModel, OfflineModel, Payload, SubmittedAtModel, TimestampedModel } from './base';
-import { Attachment } from './attachments';
-import { BaseSerializedObject, FieldValue, ISerializedField } from '@overmap-ai/forms';
+import { BaseSerializedObject, ISerializedField } from '@overmap-ai/forms';
+import { FieldsAttachmentModel, FieldsModel, FieldValuesAttachmentModel, FieldValuesModel } from './fields';
 
 export interface Form extends OfflineModel, SubmittedAtModel, CreatedByModel {
-    asset_type?: string;
-    issue_type?: string;
-    organization?: number;
-    project?: number;
+    organization: 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;
 }
-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 { WorkspaceIndexedModel } from './workspace';
 import { CanvasMarkableModel, MarkableModel } from './geo';
 import { User } from './users';
 import { CSSColor } from '../colors';
+import { BaseSerializedObject, ISerializedField } from '@overmap-ai/forms';
+import { FieldsAttachmentModel, FieldsModel, FieldValuesModel } from './fields';
 
 /**
  * Represents a model instance that has been submitted to the backend. Some properties (depending on which model, but in
@@ -96,3 +98,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,5 +1,5 @@
 import { OfflineState } from '@redux-offline/redux-offline/lib/types';
-import { 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 { 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;
@@ -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 { FilePayload } from '../typings';
 
 export declare const getFileS3Key: (file: File, hash?: string) => Promise<string>;
 export declare function hashFile(file: Blob): Promise<string>;
@@ -7,7 +7,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-mapbox.6",
+	"version": "1.0.71-mapbox.7",
 	"type": "module",
 	"main": "dist/overmap-core.umd.cjs",
 	"module": "dist/overmap-core.js",