@overmap-ai/core 1.0.74-gcs.2 → 1.0.74-geojson-layers.1

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

@@ -1,41 +1,47 @@
 import { MultiPoint } from 'geojson';
 import { OvermapRootState, OvermapSelector, OvermapSelectorWithArgs, ProjectFile, Stored } from '../../typings';
 import { ModelState } from '../typings';
-export interface ProjectFileState extends ModelState<Stored<ProjectFile>> {
+export interface ProjectFileState extends ModelState<ProjectFile["uuid"], Stored<ProjectFile>> {
     activeProjectFileId: string | null;
     isImportingProjectFile: boolean;
 }
 export declare const projectFileSlice: import('@reduxjs/toolkit').Slice<ProjectFileState, {
-    initializeProjectFiles: (state: ModelState<Stored<ProjectFile>>, action: {
+    initializeProjectFiles: (state: ModelState<string, Stored<ProjectFile>>, action: {
         payload: Stored<ProjectFile>[];
         type: string;
     }) => void;
-    setProjectFile: (state: ModelState<Stored<ProjectFile>>, action: {
+    setProjectFile: (state: ModelState<string, Stored<ProjectFile>>, action: {
         payload: Stored<ProjectFile>;
         type: string;
     }) => void;
-    setProjectFiles: (state: ModelState<Stored<ProjectFile>>, action: {
+    setProjectFiles: (state: ModelState<string, Stored<ProjectFile>>, action: {
         payload: Stored<ProjectFile>[];
         type: string;
     }) => void;
-    addProjectFile: (state: ModelState<Stored<ProjectFile>>, action: {
+    addProjectFile: (state: ModelState<string, Stored<ProjectFile>>, action: {
         payload: Stored<ProjectFile>;
         type: string;
     }) => void;
-    addProjectFiles: (state: ModelState<Stored<ProjectFile>>, action: {
+    addProjectFiles: (state: ModelState<string, Stored<ProjectFile>>, action: {
         payload: Stored<ProjectFile>[];
         type: string;
     }) => void;
-    updateProjectFile: (state: ModelState<Stored<ProjectFile>>, action: {
+    updateProjectFile: (state: ModelState<string, Stored<ProjectFile>>, action: {
         payload: Stored<ProjectFile>;
         type: string;
     }) => void;
-    updateProjectFiles: (state: ModelState<Stored<ProjectFile>>, action: {
+    updateProjectFiles: (state: ModelState<string, Stored<ProjectFile>>, action: {
         payload: Stored<ProjectFile>[];
         type: string;
     }) => void;
-    deleteProjectFile: (state: ModelState<Stored<ProjectFile>>, action: import('@reduxjs/toolkit').PayloadAction<string>) => void;
-    deleteProjectFiles: (state: ModelState<Stored<ProjectFile>>, action: import('@reduxjs/toolkit').PayloadAction<string[]>) => void;
+    deleteProjectFile: (state: ModelState<string, Stored<ProjectFile>>, action: {
+        payload: string;
+        type: string;
+    }) => void;
+    deleteProjectFiles: (state: ModelState<string, Stored<ProjectFile>>, action: {
+        payload: string[];
+        type: string;
+    }) => void;
     setIsImportingProjectFile: (state: import('immer').WritableDraft<ProjectFileState>, action: {
         payload: boolean;
     }) => void;

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

@@ -1,39 +1,45 @@
 import { PayloadAction } from '@reduxjs/toolkit';
 import { OvermapRootState, OvermapSelector, OvermapSelectorWithArgs, Project, User } from '../../typings';
 import { ModelState } from '../typings';
-export interface ProjectState extends ModelState<Project> {
+export interface ProjectState extends ModelState<Project["uuid"], Project> {
 }
 export declare const projectSlice: import('@reduxjs/toolkit').Slice<ProjectState, {
-    initializeProjects: (state: ModelState<Project>, action: {
+    initializeProjects: (state: ModelState<string, Project>, action: {
         payload: Project[];
         type: string;
     }) => void;
-    setProjects: (state: ModelState<Project>, action: {
+    setProjects: (state: ModelState<string, Project>, action: {
         payload: Project[];
         type: string;
     }) => void;
-    setProject: (state: ModelState<Project>, action: {
+    setProject: (state: ModelState<string, Project>, action: {
         payload: Project;
         type: string;
     }) => void;
-    addProjects: (state: ModelState<Project>, action: {
+    addProjects: (state: ModelState<string, Project>, action: {
         payload: Project[];
         type: string;
     }) => void;
-    addProject: (state: ModelState<Project>, action: {
+    addProject: (state: ModelState<string, Project>, action: {
         payload: Project;
         type: string;
     }) => void;
-    updateProjects: (state: ModelState<Project>, action: {
+    updateProjects: (state: ModelState<string, Project>, action: {
         payload: Project[];
         type: string;
     }) => void;
-    updateProject: (state: ModelState<Project>, action: {
+    updateProject: (state: ModelState<string, Project>, action: {
         payload: Project;
         type: string;
     }) => void;
-    deleteProject: (state: ModelState<Project>, action: PayloadAction<string>) => void;
-    deleteProjects: (state: ModelState<Project>, action: PayloadAction<string[]>) => void;
+    deleteProject: (state: ModelState<string, Project>, action: {
+        payload: string;
+        type: string;
+    }) => void;
+    deleteProjects: (state: ModelState<string, Project>, action: {
+        payload: string[];
+        type: string;
+    }) => void;
     acceptProjectInvite: (state: import('immer').WritableDraft<ProjectState>, action: PayloadAction<Project["uuid"]>) => void;
 }, "projects", "projects", import('@reduxjs/toolkit').SliceSelectors<ProjectState>>;
 export declare const initializeProjects: import('@reduxjs/toolkit').ActionCreatorWithPayload<Project[], "projects/initializeProjects">, setProjects: import('@reduxjs/toolkit').ActionCreatorWithPayload<Project[], "projects/setProjects">, setProject: import('@reduxjs/toolkit').ActionCreatorWithPayload<Project, "projects/setProject">, addProjects: import('@reduxjs/toolkit').ActionCreatorWithPayload<Project[], "projects/addProjects">, addProject: import('@reduxjs/toolkit').ActionCreatorWithPayload<Project, "projects/addProject">, updateProjects: import('@reduxjs/toolkit').ActionCreatorWithPayload<Project[], "projects/updateProjects">, updateProject: import('@reduxjs/toolkit').ActionCreatorWithPayload<Project, "projects/updateProject">, deleteProject: import('@reduxjs/toolkit').ActionCreatorWithPayload<string, "projects/deleteProject">, deleteProjects: import('@reduxjs/toolkit').ActionCreatorWithPayload<string[], "projects/deleteProjects">, acceptProjectInvite: import('@reduxjs/toolkit').ActionCreatorWithPayload<string, "projects/acceptProjectInvite">;
@@ -61,6 +67,6 @@ export declare const selectProjects: ((state: OvermapRootState) => Project[]) &
     memoize: typeof import('reselect').weakMapMemoize;
 };
 export declare const selectProjectById: OvermapSelectorWithArgs<Project["uuid"], Project | undefined>;
-export declare const selectProjectUsersIds: OvermapSelector<User["uuid"][]>;
-export declare const selectProjectUsersAsMapping: OvermapSelector<Record<User["uuid"], User>>;
+export declare const selectProjectUsersIds: OvermapSelector<User["id"][]>;
+export declare const selectProjectUsersAsMapping: OvermapSelector<Record<User["id"], User>>;
 export declare const selectSortedProjectUsers: OvermapSelector<User[]>;

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

@@ -1,24 +1,27 @@
 import { Organization, OvermapSelector, OvermapSelectorWithArgs, Stored, Team, User } from '../../typings';
 import { ModelState } from '../typings';
-export type TeamState = ModelState<Stored<Team>>;
+export type TeamState = ModelState<Team["uuid"], Stored<Team>>;
 export declare const teamSlice: import('@reduxjs/toolkit').Slice<TeamState, {
-    setTeam: (state: ModelState<Stored<Team>>, action: {
+    setTeam: (state: ModelState<string, Stored<Team>>, action: {
         payload: Stored<Team>;
         type: string;
     }) => void;
-    initializeTeams: (state: ModelState<Stored<Team>>, action: {
+    initializeTeams: (state: ModelState<string, Stored<Team>>, action: {
         payload: Stored<Team>[];
         type: string;
     }) => void;
-    addTeam: (state: ModelState<Stored<Team>>, action: {
+    addTeam: (state: ModelState<string, Stored<Team>>, action: {
         payload: Stored<Team>;
         type: string;
     }) => void;
-    updateTeam: (state: ModelState<Stored<Team>>, action: {
+    updateTeam: (state: ModelState<string, Stored<Team>>, action: {
         payload: Stored<Team>;
         type: string;
     }) => void;
-    deleteTeam: (state: ModelState<Stored<Team>>, action: import('@reduxjs/toolkit').PayloadAction<string>) => void;
+    deleteTeam: (state: ModelState<string, Stored<Team>>, action: {
+        payload: string;
+        type: string;
+    }) => void;
 }, "teams", "teams", import('@reduxjs/toolkit').SliceSelectors<TeamState>>;
 export declare const setTeam: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<Team>, "teams/setTeam">, initializeTeams: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<Team>[], "teams/initializeTeams">, addTeam: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<Team>, "teams/addTeam">, updateTeam: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<Team>, "teams/updateTeam">, deleteTeam: import('@reduxjs/toolkit').ActionCreatorWithPayload<string, "teams/deleteTeam">;
 export declare const selectTeamsMapping: OvermapSelector<TeamState["instances"]>;
@@ -26,5 +29,5 @@ export declare const selectTeams: OvermapSelector<Stored<Team>[]>;
 export declare const selectTeamById: OvermapSelectorWithArgs<Team["uuid"], Stored<Team> | undefined>;
 export declare const selectTeamsByIds: OvermapSelectorWithArgs<Team["uuid"][], Stored<Team>[]>;
 export declare const selectTeamsOfOrganization: OvermapSelectorWithArgs<Organization["uuid"], Stored<Team>[]>;
-export declare const selectTeamsOfUser: OvermapSelectorWithArgs<User["uuid"], Stored<Team>[]>;
+export declare const selectTeamsOfUser: OvermapSelectorWithArgs<User["id"], Stored<Team>[]>;
 export declare const teamReducer: import('redux').Reducer<TeamState>;

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

@@ -1,46 +1,62 @@
 import { PayloadAction } from '@reduxjs/toolkit';
 import { OvermapRootState, OvermapSelectorWithArgs, User } from '../../typings';
 import { ModelState } from '../typings';
-export interface UserState extends ModelState<User> {
+export interface UserState extends ModelState<User["id"], User> {
     currentUser: User | null;
 }
 export declare const userSlice: import('@reduxjs/toolkit').Slice<UserState, {
-    initializeUsers: (state: ModelState<User>, action: {
+    initializeUsers: (state: ModelState<number, User>, action: {
         payload: User[];
         type: string;
     }) => void;
-    setUsers: (state: ModelState<User>, action: {
+    setUsers: (state: ModelState<number, User>, action: {
         payload: User[];
         type: string;
     }) => void;
-    setUser: (state: ModelState<User>, action: {
+    setUser: (state: ModelState<number, User>, action: {
         payload: User;
         type: string;
     }) => void;
-    addUsers: (state: ModelState<User>, action: {
+    addUsers: (state: ModelState<number, User>, action: {
         payload: User[];
         type: string;
     }) => void;
-    addUser: (state: ModelState<User>, action: {
+    addUser: (state: ModelState<number, User>, action: {
         payload: User;
         type: string;
     }) => void;
-    updateUsers: (state: ModelState<User>, action: {
+    updateUsers: (state: ModelState<number, User>, action: {
         payload: User[];
         type: string;
     }) => void;
-    updateUser: (state: ModelState<User>, action: {
+    updateUser: (state: ModelState<number, User>, action: {
         payload: User;
         type: string;
     }) => void;
-    deleteUser: (state: ModelState<User>, action: PayloadAction<string>) => void;
-    deleteUsers: (state: ModelState<User>, action: PayloadAction<string[]>) => void;
-    removeUser: (state: ModelState<User>, action: PayloadAction<string>) => void;
+    deleteUser: (state: ModelState<number, User>, action: {
+        payload: number;
+        type: string;
+    }) => void;
+    deleteUsers: (state: ModelState<number, User>, action: {
+        payload: number[];
+        type: string;
+    }) => void;
+    removeUser: (state: ModelState<number, User>, action: {
+        payload: number;
+        type: string;
+    }) => void;
     setCurrentUser: (state: import('immer').WritableDraft<UserState>, action: PayloadAction<User | null>) => void;
+    setProfilePicture: (state: import('immer').WritableDraft<UserState>, action: PayloadAction<{
+        file?: string;
+        file_sha1?: string;
+    }>) => void;
 }, "users", "users", import('@reduxjs/toolkit').SliceSelectors<UserState>>;
-export declare const initializeUsers: import('@reduxjs/toolkit').ActionCreatorWithPayload<User[], "users/initializeUsers">, setUsers: import('@reduxjs/toolkit').ActionCreatorWithPayload<User[], "users/setUsers">, setUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<User, "users/setUser">, addUsers: import('@reduxjs/toolkit').ActionCreatorWithPayload<User[], "users/addUsers">, addUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<User, "users/addUser">, updateUsers: import('@reduxjs/toolkit').ActionCreatorWithPayload<User[], "users/updateUsers">, updateUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<User, "users/updateUser">, deleteUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<string, "users/deleteUser">, deleteUsers: import('@reduxjs/toolkit').ActionCreatorWithPayload<string[], "users/deleteUsers">, removeUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<string, "users/removeUser">, setCurrentUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<User | null, "users/setCurrentUser">;
+export declare const initializeUsers: import('@reduxjs/toolkit').ActionCreatorWithPayload<User[], "users/initializeUsers">, setUsers: import('@reduxjs/toolkit').ActionCreatorWithPayload<User[], "users/setUsers">, setUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<User, "users/setUser">, addUsers: import('@reduxjs/toolkit').ActionCreatorWithPayload<User[], "users/addUsers">, addUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<User, "users/addUser">, updateUsers: import('@reduxjs/toolkit').ActionCreatorWithPayload<User[], "users/updateUsers">, updateUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<User, "users/updateUser">, deleteUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<number, "users/deleteUser">, deleteUsers: import('@reduxjs/toolkit').ActionCreatorWithPayload<number[], "users/deleteUsers">, removeUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<number, "users/removeUser">, setCurrentUser: import('@reduxjs/toolkit').ActionCreatorWithPayload<User | null, "users/setCurrentUser">, setProfilePicture: import('@reduxjs/toolkit').ActionCreatorWithPayload<{
+    file?: string;
+    file_sha1?: string;
+}, "users/setProfilePicture">;
 export declare const userReducer: import('redux').Reducer<UserState>;
 export declare const selectCurrentUser: (state: OvermapRootState) => User | null;
-export declare const selectUsersMapping: (state: OvermapRootState) => Record<string, User>;
-export declare const selectUserById: OvermapSelectorWithArgs<User["uuid"], User | undefined>;
-export declare const selectUsersByIds: (args: string[]) => (state: OvermapRootState) => User[];
+export declare const selectUsersMapping: (state: OvermapRootState) => Record<number, User>;
+export declare const selectUserById: OvermapSelectorWithArgs<User["id"], User | undefined>;
+export declare const selectUsersByIds: (args: number[]) => (state: OvermapRootState) => User[];

package/dist/store/store.d.ts

@@ -33,6 +33,8 @@ export declare const overmapReducers: {
     formSubmissionAttachmentReducer: Reducer<import('./slices').FormSubmissionAttachmentState>;
     formSubmissionReducer: Reducer<import('./slices').FormSubmissionState>;
     userReducer: Reducer<import('./slices').UserState>;
+    emailDomainsReducer: Reducer<import('./slices').EmailDomainState>;
+    licenseReducer: Reducer<import('./slices').LicenseState>;
     documentsReducer: Reducer<import('./slices').DocumentState>;
     documentAttachmentReducer: Reducer<import('./slices').DocumentAttachmentState>;
     teamReducer: Reducer<import('./slices').TeamState>;
@@ -41,6 +43,8 @@ export declare const overmapReducers: {
     issueCommentAttachmentReducer: Reducer<import('./slices').IssueCommentAttachmentState>;
     issueUpdateReducer: Reducer<import('./slices').IssueUpdateState>;
     geoImageReducer: Reducer<import('./slices').GeoImageSliceState>;
+    geoJsonFeatureReducer: Reducer<import('./slices').GeoJsonFeatureState>;
+    geoJsonLayerReducer: Reducer<import('./slices').GeoJsonLayerState>;
     issueAssociationReducer: Reducer<import('./slices').IssueAssociationSliceState>;
     issueTypeFieldsReducer: Reducer<import('./slices').IssueTypeFieldsState>;
     issueTypeFieldValuesReducer: Reducer<import('./slices').IssueTypeFieldValuesState>;
@@ -56,6 +60,7 @@ export declare const overmapReducers: {
     assetProcedureFieldValuesReducer: Reducer<import('./slices').AssetProcedureFieldValuesState>;
     assetProcedureFieldsAttachmentReducer: Reducer<import('./slices').AssetProcedureFieldsAttachmentState>;
     assetProcedureFieldValuesAttachmentReducer: Reducer<import('./slices').AssetProcedureFieldValuesAttachmentState>;
+    assetProcedureAttachmentReducer: Reducer<import('./slices').AssetProcedureAttachmentState>;
 };
 export declare const resetStore = "RESET";
 export declare const overmapRootReducer: Reducer<OvermapRootState>;

package/dist/store/typings.d.ts

@@ -1,5 +1,5 @@
-export interface ModelState<TModel> {
-    instances: Record<string, TModel>;
+export interface ModelState<TId extends number | string | symbol, TModel> {
+    instances: Record<TId, TModel>;
 }
 export interface SelectionState<TSelection> {
     selection: TSelection[];

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

@@ -1,7 +1,5 @@
-import { BaseSerializedObject, ISerializedField } from '@overmap-ai/forms';
-import { ColorModel, CreatedByModel, IconModel, IndexedModel, SubmittedAtModel, TimestampedModel, UUIDModel } from './base';
+import { CanvasMarkableModel, ColorModel, CreatedByModel, IconModel, IndexedModel, MarkableModel, SubmittedAtModel, TimestampedModel, UUIDModel } from './base';
 import { FieldsAttachmentModel, FieldsModel, FieldValuesModel } from './fields';
-import { CanvasMarkableModel, MarkableModel } from './geo';
 export interface Asset extends UUIDModel, TimestampedModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel, IndexedModel {
     asset_type: string;
     label: string | null;
@@ -35,7 +33,7 @@ export interface AssetStageCompletion extends UUIDModel, TimestampedModel, Submi
     asset_procedure_instance: string;
 }
 export type CompletedStagesMapping = Record<string, Record<string, string>>;
-export interface AssetTypeFields<TFields extends BaseSerializedObject = ISerializedField> extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel<TFields> {
+export interface AssetTypeFields extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel {
     asset_type: string;
 }
 export interface AssetTypeFieldsAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
@@ -48,7 +46,7 @@ export interface AssetTypeFieldValues extends UUIDModel, SubmittedAtModel, Times
 export interface AssetTypeFieldValuesAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
     field_values: string;
 }
-export interface AssetProcedureFields<TFields extends BaseSerializedObject = ISerializedField> extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel<TFields> {
+export interface AssetProcedureFields extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel {
     asset_procedure: string;
 }
 export interface AssetProcedureFieldsAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {

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

@@ -19,6 +19,9 @@ export interface AssetAttachment extends Attachment {
 export interface AssetTypeAttachment extends Attachment {
     asset_type: string;
 }
+export interface AssetProcedureAttachment extends Attachment {
+    asset_procedure: string;
+}
 export interface ProjectAttachment extends Attachment {
     project: string;
 }

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

@@ -1,9 +1,50 @@
 import { IconType } from '@overmap-ai/blocks';
+import { MultiPoint, Point } from 'geojson';
+import { COMMON_AUTO_FIELDS } from '../../utils';
 import { CSSColor } from '../colors';
-import { CommonAutoFields } from './issues';
 import { User } from './users';
+export type UUID<T> = T & {
+    uuid: string;
+};
+export type UUIDModelMapping<TModel extends UUIDModel> = Record<TModel["uuid"], TModel>;
+type FilteredKeys<T> = {
+    [P in keyof T]: T[P] extends never ? never : P;
+}[keyof T];
+type ExcludeNeverFields<O> = {
+    [K in FilteredKeys<O>]: O[K];
+};
+type PropertyUndefined<T> = {
+    [P in keyof T]?: T[P];
+};
+export type CommonAutoFields = (typeof COMMON_AUTO_FIELDS)[number];
+/**
+ * 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.
+ */
+export type Submitted<TModel> = Omit<TModel, CommonAutoFields> & PropertyUndefined<ExcludeNeverFields<{
+    created_at: "created_at" extends keyof TModel ? undefined : never;
+    updated_at: "updated_at" extends keyof TModel ? undefined : never;
+    index: "index" extends keyof TModel ? undefined : never;
+    revision: "revision" extends keyof TModel ? undefined : never;
+}>>;
+/**
+ * Represents a model instance that has been submitted to the backend, accepted, then downloaded. Created models
+ * typically have additional properties that are only known once it has been processed and accepted by the API, such as
+ * the `created_at` timestamp, which is the time at which the data was written to the database.
+ */
+export type Created<TModel> = TModel;
+/**
+ * Model instances that are stored in the Redux store can be already-created (and will likely be gotten with the initial
+ * data load), or to-be-created. In the former case, you will get a `Created<TModel>`. In the latter case, you will get
+ * a `Submitted<TModel>`.
+ */
+export type Stored<TModel> = Created<TModel> | Submitted<TModel>;
+export type Payload<TModel> = Omit<TModel, CommonAutoFields | "uuid" | "id" | "submitted_at" | "created_by">;
 export interface Model {
 }
+export interface IdModel extends Model {
+    id: number;
+}
 export interface UUIDModel extends Model {
     uuid: string;
 }
@@ -14,16 +55,6 @@ export interface TimestampedModel extends Model {
     created_at: string;
     updated_at: string;
 }
-export type UUID<T> = T & {
-    uuid: string;
-};
-export type UUIDModelMapping<TModel extends UUIDModel> = Record<TModel["uuid"], TModel>;
-export type Payload<TModel> = Omit<TModel, CommonAutoFields | "uuid" | "id" | "submitted_at" | "created_by">;
-export interface FileObject {
-    file_sha1: string;
-    file: string;
-    objectURL?: string;
-}
 export interface OptionalFileModel {
     file_sha1?: string | null;
     file?: string | null;
@@ -39,8 +70,21 @@ export interface ColorModel {
     color: CSSColor;
 }
 export interface CreatedByModel {
-    created_by?: User["uuid"] | null;
+    created_by?: User["id"] | null;
 }
 export interface IndexedModel {
     index: number;
 }
+export interface BoundableModel {
+    bounds?: MultiPoint;
+}
+export interface CanvasBoundableModel {
+    canvas_bounds?: MultiPoint;
+}
+export interface MarkableModel {
+    geo_marker?: Point;
+}
+export interface CanvasMarkableModel {
+    canvas_marker?: Point;
+}
+export {};

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

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

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

@@ -1,10 +1,9 @@
-import { BaseSerializedObject, ISerializedField } from '@overmap-ai/forms';
 import { CreatedByModel, IndexedModel, Payload, SubmittedAtModel, TimestampedModel, UUIDModel } from './base';
 import { FieldsAttachmentModel, FieldsModel, FieldValuesAttachmentModel, FieldValuesModel } from './fields';
 export interface Form extends UUIDModel, SubmittedAtModel, CreatedByModel {
     organization: string;
 }
-export interface FormRevision<TFields extends BaseSerializedObject = ISerializedField> extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel<TFields> {
+export interface FormRevision extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel {
     form: string;
     title: string;
     description?: string;

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

@@ -1,13 +1,12 @@
-import { MultiPoint, Point } from 'geojson';
-export interface BoundableModel {
-    bounds?: MultiPoint;
-}
-export interface CanvasBoundableModel {
-    canvas_bounds?: MultiPoint;
-}
-export interface MarkableModel {
-    geo_marker?: Point;
-}
-export interface CanvasMarkableModel {
-    canvas_marker?: Point;
+import { Geometry } from 'geojson';
+import { CreatedByModel, SubmittedAtModel, TimestampedModel, UUIDModel } from './base';
+import { Project } from './projects';
+export interface GeoJsonLayer extends UUIDModel, TimestampedModel, SubmittedAtModel, CreatedByModel {
+    name?: string | null;
+    project: Project["uuid"];
+}
+export interface GeoJsonFeature extends UUIDModel, TimestampedModel, SubmittedAtModel, CreatedByModel {
+    geojson_layer: GeoJsonLayer["uuid"];
+    properties: object;
+    geometry: Geometry;
 }

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

@@ -1,6 +1,5 @@
 import { FileWithNameModel } from '../files';
-import { CreatedByModel, IndexedModel, Payload, SubmittedAtModel, UUIDModel } from './base';
-import { CanvasMarkableModel, MarkableModel } from './geo';
+import { CanvasMarkableModel, CreatedByModel, IndexedModel, MarkableModel, Payload, SubmittedAtModel, UUIDModel } from './base';
 import { Project } from './projects';
 export interface GeoImage extends UUIDModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel, FileWithNameModel, IndexedModel {
     title?: string;

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

@@ -12,6 +12,7 @@ export * from './geo';
 export * from './geoImages';
 export * from './issues';
 export * from './issueTypes';
+export * from './license';
 export * from './organizations';
 export * from './projects';
 export * from './store';

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

@@ -1,53 +1,14 @@
-import { BaseSerializedObject, ISerializedField } from '@overmap-ai/forms';
 import { IssuePriority, IssueStatus, IssueUpdateChange } from '../../enums';
-import { COMMON_AUTO_FIELDS } from '../../utils';
 import { CSSColor } from '../colors';
-import { CreatedByModel, IndexedModel, SubmittedAtModel, TimestampedModel, UUIDModel } from './base';
+import { CanvasMarkableModel, CreatedByModel, IndexedModel, MarkableModel, SubmittedAtModel, TimestampedModel, UUIDModel } from './base';
 import { FieldsAttachmentModel, FieldsModel, FieldValuesModel } from './fields';
-import { CanvasMarkableModel, MarkableModel } from './geo';
 import { User } from './users';
-type FilteredKeys<T> = {
-    [P in keyof T]: T[P] extends never ? never : P;
-}[keyof T];
-type ExcludeNeverFields<O> = {
-    [K in FilteredKeys<O>]: O[K];
-};
-type PropertyUndefined<T> = {
-    [P in keyof T]?: T[P];
-};
-export type CommonAutoFields = (typeof COMMON_AUTO_FIELDS)[number];
-/**
- * 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.
- */
-export type Submitted<TModel> = Omit<TModel, CommonAutoFields> & PropertyUndefined<ExcludeNeverFields<{
-    created_at: "created_at" extends keyof TModel ? undefined : never;
-    updated_at: "updated_at" extends keyof TModel ? undefined : never;
-    index: "index" extends keyof TModel ? undefined : never;
-    revision: "revision" extends keyof TModel ? undefined : never;
-}>>;
-/**
- * Represents a model instance that has been submitted to the backend, accepted, then downloaded. Created models
- * typically have additional properties that are only known once it has been processed and accepted by the API, such as
- * the `created_at` timestamp, which is the time at which the data was written to the database.
- */
-export type Created<TModel> = TModel;
-/**
- * Model instances that are stored in the Redux store can be already-created (and will likely be gotten with the initial
- * data load), or to-be-created. In the former case, you will get a `Created<TModel>`. In the latter case, you will get
- * a `Submitted<TModel>`.
- */
-export type Stored<TModel> = Created<TModel> | Submitted<TModel>;
-/**
- * Represents the properties you can always expect on any object representing an issue. These are the minimal details
- * required when creating an issue.
- */
 export interface Issue extends UUIDModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel, IndexedModel {
     title?: string | null;
     description?: string | null;
     priority: IssuePriority;
     status: IssueStatus;
-    assigned_to?: string | null;
+    assigned_to?: User["id"] | null;
     due_date?: string | Date | null;
     category?: string | null;
     issue_type: string;
@@ -56,7 +17,7 @@ export interface Issue extends UUIDModel, SubmittedAtModel, CreatedByModel, Mark
 export interface IssueComment extends UUIDModel, SubmittedAtModel, TimestampedModel {
     issue: string;
     content: string;
-    author?: string;
+    author?: number;
 }
 export interface IssueUpdateChangeTypes {
     status: IssueStatus;
@@ -70,7 +31,7 @@ export interface IssueUpdateChangeTypes {
     title: string;
     assigned_to: {
         full_name: string;
-        uuid: User["uuid"];
+        id: User["id"];
     } | null;
     due_date: string;
 }
@@ -84,7 +45,7 @@ export interface IssueAssociation extends UUIDModel, SubmittedAtModel, CreatedBy
     issue?: string;
     asset?: string;
 }
-export interface IssueTypeFields<TFields extends BaseSerializedObject = ISerializedField> extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel<TFields> {
+export interface IssueTypeFields extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel {
     issue_type: string;
 }
 export interface IssueTypeFieldsAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
@@ -97,4 +58,3 @@ export interface IssueTypeFieldValues extends UUIDModel, SubmittedAtModel, Times
 export interface IssueTypeFieldValuesAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
     field_values: string;
 }
-export {};

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

@@ -0,0 +1,13 @@
+import { LicenseLevel, LicenseStatus } from '../../enums';
+import { OwnedByOrganization, UUIDModel } from './base';
+export interface Transaction {
+    id: string;
+}
+export interface License extends UUIDModel, OwnedByOrganization {
+    project: string | null;
+    level: LicenseLevel;
+    status: LicenseStatus;
+    is_special: boolean;
+    is_active: boolean;
+    next_billing_date: Date;
+}

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

@@ -1,11 +1,12 @@
 import { OrganizationAccessLevel } from '../../enums';
 import { CreatedByModel, UUIDModel } from './base';
+import { User } from './users';
 export interface Organization extends UUIDModel, CreatedByModel {
     name: string;
     has_access: boolean;
 }
 export interface OrganizationAccess extends UUIDModel {
-    user: string;
+    user: User["id"];
     organization: string;
     access_level: OrganizationAccessLevel;
 }

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

@@ -1,7 +1,7 @@
 import { ProjectAccessLevel } from '../../enums';
 import { FileWithNameModel } from '../files';
-import { OwnedByOrganization, SubmittedAtModel, UUIDModel } from './base';
-import { BoundableModel, CanvasBoundableModel } from './geo';
+import { BoundableModel, CanvasBoundableModel, OwnedByOrganization, SubmittedAtModel, UUIDModel } from './base';
+import { User } from './users';
 export interface Project extends UUIDModel, BoundableModel, CanvasBoundableModel, OwnedByOrganization {
     name: string;
     invited?: boolean;
@@ -10,10 +10,10 @@ export interface Project extends UUIDModel, BoundableModel, CanvasBoundableModel
 }
 export interface ProjectFile extends UUIDModel, SubmittedAtModel, FileWithNameModel, BoundableModel, CanvasBoundableModel {
     z_index: number;
-    project: string;
+    project: Project["uuid"];
 }
 export interface ProjectAccess extends UUIDModel {
-    user: string;
-    project: string;
+    user: User["id"];
+    project: Project["uuid"];
     access_level: ProjectAccessLevel;
 }