@overmap-ai/core 1.0.75-more-clean-ups.0 → 1.0.76

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

@@ -1,40 +1,62 @@
-import { BaseSerializedObject, ISerializedField } from '@overmap-ai/forms';
-import { ColorModel, CreatedByModel, IconModel, OfflineModel, SubmittedAtModel, TimestampedModel } 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 OfflineModel, TimestampedModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel {
+export interface Asset extends UUIDModel, TimestampedModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel, IndexedModel {
     asset_type: string;
-    created_at?: string;
     label: string | null;
     description?: string;
-    project: number;
+    project: string;
 }
-export interface AssetType extends OfflineModel, TimestampedModel, SubmittedAtModel, CreatedByModel, IconModel, ColorModel {
-    organization: number;
+export interface AssetType extends UUIDModel, TimestampedModel, SubmittedAtModel, CreatedByModel, IconModel, ColorModel {
+    organization: string;
     name?: string;
     description?: string;
 }
-export interface AssetStage extends OfflineModel, TimestampedModel, SubmittedAtModel, CreatedByModel, ColorModel {
+export interface AssetProcedure extends UUIDModel, TimestampedModel, SubmittedAtModel, CreatedByModel, IconModel, ColorModel {
+    organization: string;
+    name?: string | null;
+    description?: string | null;
+}
+export interface AssetProcedureInstance extends UUIDModel, TimestampedModel, SubmittedAtModel, CreatedByModel, IndexedModel {
+    asset_procedure: string;
     asset_type: string;
+    project: string;
+}
+export interface AssetStage extends UUIDModel, TimestampedModel, SubmittedAtModel, CreatedByModel, ColorModel {
+    asset_procedure: string;
     name?: string | null;
     description?: string | null;
     priority: number;
 }
-export interface AssetStageCompletion extends OfflineModel, TimestampedModel, SubmittedAtModel, CreatedByModel {
+export interface AssetStageCompletion extends UUIDModel, TimestampedModel, SubmittedAtModel, CreatedByModel {
     asset: string;
     stage: string;
+    asset_procedure_instance: string;
 }
 export type CompletedStagesMapping = Record<string, Record<string, string>>;
-export interface AssetTypeFields<TFields extends BaseSerializedObject = ISerializedField> extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel<TFields> {
+export interface AssetTypeFields extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel {
     asset_type: string;
 }
-export interface AssetTypeFieldsAttachment extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
+export interface AssetTypeFieldsAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
+    fields_revision: string;
+}
+export interface AssetTypeFieldValues extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel {
+    fields_revision: string;
+    asset: string;
+}
+export interface AssetTypeFieldValuesAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
+    field_values: string;
+}
+export interface AssetProcedureFields extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel {
+    asset_procedure: string;
+}
+export interface AssetProcedureFieldsAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
     fields_revision: string;
 }
-export interface AssetTypeFieldValues extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel {
+export interface AssetProcedureFieldValues extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel {
     fields_revision: string;
+    asset_procedure_instance: string;
     asset: string;
 }
-export interface AssetTypeFieldValuesAttachment extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
+export interface AssetProcedureFieldValuesAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
     field_values: string;
 }

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

@@ -1,20 +1,29 @@
 import { FileModel, FileWithNameModel } from '../files';
-import { CreatedByModel, OfflineModel, SubmittedAtModel } from './base';
-export interface Attachment extends OfflineModel, SubmittedAtModel, FileWithNameModel, CreatedByModel {
+import { CreatedByModel, SubmittedAtModel, UUIDModel } from './base';
+export interface Attachment extends UUIDModel, SubmittedAtModel, FileWithNameModel, CreatedByModel {
     description?: string;
     file_type: string;
 }
 export interface IssueAttachment extends Attachment {
     issue: string;
 }
+export interface IssueTypeAttachment extends Attachment {
+    issue_type: string;
+}
+export interface IssueCommentAttachment extends Attachment {
+    issue_comment: string;
+}
 export interface AssetAttachment extends Attachment {
     asset: string;
 }
 export interface AssetTypeAttachment extends Attachment {
     asset_type: string;
 }
+export interface AssetProcedureAttachment extends Attachment {
+    asset_procedure: string;
+}
 export interface ProjectAttachment extends Attachment {
-    project: number;
+    project: string;
 }
 export interface DocumentAttachment extends Attachment {
     document: string;

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

@@ -1,29 +1,59 @@
+import { IconType } from '@overmap-ai/blocks';
+import { MultiPoint, Point } from 'geojson';
+import { COMMON_AUTO_FIELDS } from '../../utils';
 import { CSSColor } from '../colors';
 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 OfflineModel extends Model {
-    offline_id: string;
+export interface IdModel extends Model {
+    id: number;
+}
+export interface UUIDModel extends Model {
+    uuid: string;
 }
 export interface SubmittedAtModel extends Model {
     submitted_at: string;
 }
 export interface TimestampedModel extends Model {
-    created_at?: string;
-    updated_at?: string;
-}
-export type Offline<T> = T & {
-    offline_id: string;
-};
-export type OfflineIdMapping<TModel extends OfflineModel> = Record<TModel["offline_id"], TModel>;
-export type Payload<TModel> = Omit<TModel, "offline_id" | "created_at" | "updated_at" | "id" | "submitted_at" | "created_by">;
-export type MaybePayload<TModel extends OfflineModel> = Payload<TModel> & {
-    offline_id?: string | null;
-};
-export interface FileObject {
-    file_sha1: string;
-    file: string;
-    objectURL?: string;
+    created_at: string;
+    updated_at: string;
 }
 export interface OptionalFileModel {
     file_sha1?: string | null;
@@ -31,10 +61,10 @@ export interface OptionalFileModel {
     objectURL?: string;
 }
 export interface OwnedByOrganization {
-    organization_owner: number;
+    organization_owner: string;
 }
 export interface IconModel {
-    icon: string;
+    icon: IconType;
 }
 export interface ColorModel {
     color: CSSColor;
@@ -42,3 +72,19 @@ export interface ColorModel {
 export interface CreatedByModel {
     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/categories.d.ts

@@ -1,8 +1,8 @@
 import { CSSColor } from '../colors';
-import { CreatedByModel, OfflineModel, SubmittedAtModel, TimestampedModel } from './base';
-export interface Category extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel {
+import { CreatedByModel, SubmittedAtModel, TimestampedModel, UUIDModel } from './base';
+export interface Category extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel {
     name: string;
     description?: string;
     color: CSSColor;
-    project: number;
+    project: string;
 }

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

@@ -1,11 +1,11 @@
-import { ColorModel, CreatedByModel, IconModel, OfflineModel, SubmittedAtModel, TimestampedModel } from './base';
-export interface Document extends OfflineModel, SubmittedAtModel, CreatedByModel, TimestampedModel, IconModel, ColorModel {
+import { ColorModel, CreatedByModel, IconModel, SubmittedAtModel, TimestampedModel, UUIDModel } from './base';
+export interface Document extends UUIDModel, SubmittedAtModel, CreatedByModel, TimestampedModel, IconModel, ColorModel {
     title: string | null;
     description: string | null;
     content: string | null;
     parent_document: string | null;
     children_documents: string[];
-    project?: number;
-    organization?: number;
+    project?: string;
+    organization?: string;
 }
 export type MovePosition = "left" | "right" | "left-child" | "right-child";

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

@@ -1,5 +1,5 @@
-import { OfflineModel } from './base';
-export interface EmailDomain extends OfflineModel {
+import { UUIDModel } from './base';
+export interface EmailDomain extends UUIDModel {
     domain: string;
-    organization: number;
+    organization: string;
 }

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

@@ -1,9 +1,9 @@
-import { OfflineModel } from './base';
+import { UUIDModel } from './base';
 import { RegistrationPayload } from './users';
 export type EmailVerificationPayload = undefined | RegistrationPayload | Omit<RegistrationPayload, "username" | "email">;
 export interface EmailVerificationReturn {
     username?: string;
-    project?: number;
+    project?: string;
 }
 export declare enum VerificationCodeType {
     USER_REGISTRATION = 0,
@@ -13,10 +13,10 @@ export declare enum VerificationCodeType {
     ADD_EMAIL_DOMAIN = 8,
     RESET_PASSWORD = 10
 }
-export interface VerificationCode extends OfflineModel {
+export interface VerificationCode extends UUIDModel {
     verification_code: string;
     verification_type: VerificationCodeType;
     organization?: number;
-    project?: number;
-    user?: number;
+    project?: string;
+    user?: string;
 }

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[];
-    revision: number | "Pending";
+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,24 +1,23 @@
-import { BaseSerializedObject, ISerializedField } from '@overmap-ai/forms';
-import { CreatedByModel, OfflineModel, Payload, SubmittedAtModel, TimestampedModel } from './base';
+import { CreatedByModel, IndexedModel, Payload, SubmittedAtModel, TimestampedModel, UUIDModel } from './base';
 import { FieldsAttachmentModel, FieldsModel, FieldValuesAttachmentModel, FieldValuesModel } from './fields';
-export interface Form extends OfflineModel, SubmittedAtModel, CreatedByModel {
-    organization: number;
+export interface Form extends UUIDModel, SubmittedAtModel, CreatedByModel {
+    organization: string;
 }
-export interface FormRevision<TFields extends BaseSerializedObject = ISerializedField> extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel<TFields> {
+export interface FormRevision extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel {
     form: string;
     title: string;
     description?: string;
 }
 export type FormRevisionPayload = Omit<Payload<FormRevision>, "revision">;
-export interface FormSubmission extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel {
+export interface FormSubmission extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel, IndexedModel {
     form_revision: string;
-    project: number;
+    project: string;
     issue?: string | null;
     asset?: string | null;
 }
-export interface FormSubmissionAttachment extends FieldValuesAttachmentModel {
+export interface FormSubmissionAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesAttachmentModel {
     form_submission: string;
 }
-export interface FormRevisionAttachment extends FieldsAttachmentModel {
+export interface FormRevisionAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
     form_revision: string;
 }

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

@@ -1,14 +1,14 @@
 import { FileWithNameModel } from '../files';
-import { CreatedByModel, OfflineModel, SubmittedAtModel } from './base';
-import { CanvasMarkableModel, MarkableModel } from './geo';
-export interface GeoImage extends OfflineModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel, FileWithNameModel {
+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;
     description?: string;
-    project: number;
+    project: Project["uuid"];
     direction?: number;
     original_date?: string;
 }
-export type GeoImagePayload = Omit<GeoImage, "offline_id" | "submitted_at" | "created_by" | "file_name" | "file_sha1" | "file"> & {
+export type GeoImagePayload = Omit<Payload<GeoImage>, "file_name" | "file_sha1" | "file"> & {
     file: File;
 };
 export type BulkGeoImagePayload = Omit<GeoImagePayload, "project">;

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

@@ -1,4 +1,3 @@
-export * from './access';
 export * from './agents';
 export * from './assets';
 export * from './attachments';
@@ -9,7 +8,6 @@ export * from './emailDomain';
 export * from './emailVerification';
 export * from './fields';
 export * from './forms';
-export * from './geo';
 export * from './geoImages';
 export * from './issues';
 export * from './issueTypes';

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

@@ -1,7 +1,7 @@
-import { ColorModel, CreatedByModel, IconModel, OfflineModel, SubmittedAtModel } from './base';
+import { ColorModel, CreatedByModel, IconModel, SubmittedAtModel, UUIDModel } from './base';
 import { Organization } from './organizations';
-export interface IssueType extends OfflineModel, SubmittedAtModel, IconModel, ColorModel, CreatedByModel {
+export interface IssueType extends UUIDModel, SubmittedAtModel, IconModel, ColorModel, CreatedByModel {
     name?: string;
     description?: string;
-    organization: Organization["id"];
+    organization: Organization["uuid"];
 }

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

@@ -1,83 +1,31 @@
-import { BaseSerializedObject, ISerializedField } from '@overmap-ai/forms';
 import { IssuePriority, IssueStatus, IssueUpdateChange } from '../../enums';
 import { CSSColor } from '../colors';
-import { CreatedByModel, Offline, OfflineModel, SubmittedAtModel, TimestampedModel } 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';
-/**
- * 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> = Offline<TModel> & (TModel extends Issue ? SubmittedIssue : Omit<TModel, "created_at" | "id">);
-/**
- * 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> = Submitted<TModel> & (TModel extends Issue ? CreatedIssue : TModel extends IssueComment ? CreatedIssueComment : 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 OfflineModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel {
+export interface Issue extends UUIDModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel, IndexedModel {
     title?: string | null;
     description?: string | null;
     priority: IssuePriority;
     status: IssueStatus;
-    assigned_to?: number | null;
+    assigned_to?: User["id"] | null;
     due_date?: string | Date | null;
     category?: string | null;
-    issue_type?: string | null;
-    project: number;
-}
-/**
- * These details need to be provided by the frontend code before submitting to the backend.
- */
-export interface SubmittedIssue extends OfflineModel, CreatedByModel {
-    submitted_at: string;
-    status: Exclude<Issue["status"], undefined>;
-    priority: Exclude<Issue["priority"], undefined>;
-}
-/**
- * These details exist on issues that have been successfully submitted, accepted, created, and serialized by the
- * backend, then downloaded by the frontend.
- */
-export interface CreatedIssue extends Issue {
-    title: Exclude<Issue["title"], undefined>;
-    description: Exclude<Issue["description"], undefined>;
-    assigned_to: Exclude<Issue["assigned_to"], undefined>;
-    due_date: Exclude<Issue["due_date"], undefined>;
-    category: Exclude<Issue["category"], undefined>;
-    geo_marker: Exclude<Issue["geo_marker"], undefined>;
-    created_at: string;
+    issue_type: string;
+    project: string;
 }
-export interface IssueComment extends OfflineModel, SubmittedAtModel, TimestampedModel {
+export interface IssueComment extends UUIDModel, SubmittedAtModel, TimestampedModel {
     issue: string;
     content: string;
     author?: number;
 }
-export interface SubmittedIssueComment {
-    created_at: Exclude<IssueComment["created_at"], undefined>;
-}
-export interface CreatedIssueComment {
-    author: Exclude<IssueComment["author"], undefined>;
-    created_at: Exclude<IssueComment["created_at"], undefined>;
-}
-export type IssueCommentPayload = Omit<IssueComment, "author" | "created_at" | "offline_id">;
 export interface IssueUpdateChangeTypes {
     status: IssueStatus;
     priority: IssuePriority;
     category: {
         name: string;
         color: CSSColor;
-        offline_id: OfflineModel["offline_id"];
+        uuid: UUIDModel["uuid"];
     } | null;
     description: string;
     title: string;
@@ -87,26 +35,26 @@ export interface IssueUpdateChangeTypes {
     } | null;
     due_date: string;
 }
-export interface IssueUpdate extends OfflineModel, CreatedByModel {
+export interface IssueUpdate extends UUIDModel, CreatedByModel {
     submitted_at: string;
-    issue: OfflineModel["offline_id"];
+    issue: UUIDModel["uuid"];
     changes: Partial<Record<IssueUpdateChange, IssueUpdateChangeTypes[IssueUpdateChange]>>;
 }
-export interface IssueAssociation extends OfflineModel, SubmittedAtModel, CreatedByModel {
+export interface IssueAssociation extends UUIDModel, SubmittedAtModel, CreatedByModel {
     associated_issue: string;
     issue?: string;
     asset?: string;
 }
-export interface IssueTypeFields<TFields extends BaseSerializedObject = ISerializedField> extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel<TFields> {
+export interface IssueTypeFields extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsModel {
     issue_type: string;
 }
-export interface IssueTypeFieldsAttachment extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
+export interface IssueTypeFieldsAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
     fields_revision: string;
 }
-export interface IssueTypeFieldValues extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel {
+export interface IssueTypeFieldValues extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel {
     fields_revision: string;
     issue: string;
 }
-export interface IssueTypeFieldValuesAttachment extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
+export interface IssueTypeFieldValuesAttachment extends UUIDModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldsAttachmentModel {
     field_values: string;
 }

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

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

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

@@ -1,6 +1,12 @@
-import { CreatedByModel, Model } from './base';
-export interface Organization extends Model, CreatedByModel {
-    id: number;
+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: User["id"];
+    organization: string;
+    access_level: OrganizationAccessLevel;
+}

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

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

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, 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 } from '../../store';
+import { AgentsState, AssetAttachmentState, AssetProcedureAttachmentState, AssetProcedureFieldsAttachmentState, AssetProcedureFieldsState, AssetProcedureFieldValuesAttachmentState, AssetProcedureFieldValuesState, AssetProcedureInstanceState, AssetProcedureState, AssetStageCompletionState, AssetStageState, AssetState, AssetTypeAttachmentState, AssetTypeFieldsAttachmentState, AssetTypeFieldsState, AssetTypeFieldValuesAttachmentState, AssetTypeFieldValuesState, AssetTypeState, AuthState, CategoryState, DocumentAttachmentState, DocumentState, EmailDomainState, FileState, FormRevisionAttachmentState, FormRevisionState, FormState, FormSubmissionAttachmentState, FormSubmissionState, GeoImageSliceState, IssueAssociationSliceState, IssueAttachmentState, IssueCommentAttachmentState, IssueCommentState, IssueState, IssueTypeAttachmentState, IssueTypeFieldsAttachmentState, IssueTypeFieldsState, IssueTypeFieldValuesAttachmentState, IssueTypeFieldValuesState, IssueTypeState, IssueUpdateState, LicenseState, OrganizationAccessState, OrganizationState, OutboxState, ProjectAccessState, ProjectAttachmentState, ProjectFileState, ProjectState, RehydratedState, TeamState, UserState, VERSION_REDUCER_KEY, VersioningState } from '../../store';
 export interface BaseState {
     outboxReducer: OutboxState;
     offline: OfflineState;
@@ -18,8 +18,10 @@ export interface OvermapRootState extends BaseState {
     issueReducer: IssueState;
     issueAttachmentReducer: IssueAttachmentState;
     issueCommentReducer: IssueCommentState;
+    issueCommentAttachmentReducer: IssueCommentAttachmentState;
     issueUpdateReducer: IssueUpdateState;
     issueTypeReducer: IssueTypeState;
+    issueTypeAttachmentReducer: IssueTypeAttachmentState;
     organizationReducer: OrganizationState;
     projectReducer: ProjectState;
     projectAttachmentReducer: ProjectAttachmentState;
@@ -49,4 +51,11 @@ export interface OvermapRootState extends BaseState {
     assetTypeFieldValuesReducer: AssetTypeFieldValuesState;
     assetTypeFieldsAttachmentReducer: AssetTypeFieldsAttachmentState;
     assetTypeFieldValuesAttachmentReducer: AssetTypeFieldValuesAttachmentState;
+    assetProcedureReducer: AssetProcedureState;
+    assetProcedureAttachmentReducer: AssetProcedureAttachmentState;
+    assetProcedureInstanceReducer: AssetProcedureInstanceState;
+    assetProcedureFieldsReducer: AssetProcedureFieldsState;
+    assetProcedureFieldValuesReducer: AssetProcedureFieldValuesState;
+    assetProcedureFieldsAttachmentReducer: AssetProcedureFieldsAttachmentState;
+    assetProcedureFieldValuesAttachmentReducer: AssetProcedureFieldValuesAttachmentState;
 }

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

@@ -1,9 +1,9 @@
-import { ColorModel, IconModel, OfflineModel, SubmittedAtModel } from './base';
+import { ColorModel, IconModel, SubmittedAtModel, UUIDModel } from './base';
 import { Organization } from './organizations';
 import { User } from './users';
-export interface Team extends OfflineModel, SubmittedAtModel, IconModel, ColorModel {
+export interface Team extends UUIDModel, SubmittedAtModel, IconModel, ColorModel {
     name: string;
-    parent: OfflineModel["offline_id"] | null;
-    organization: Organization["id"];
+    parent: Team["uuid"] | null;
+    organization: Organization["uuid"];
     members: User["id"][];
 }

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

@@ -1,10 +1,8 @@
-import { OptionalFileModel } from './base';
+import { IdModel, OptionalFileModel } from './base';
 export interface Profile extends OptionalFileModel {
-    favourite_project_ids: number[];
     tour_step: number;
 }
-export interface User {
-    id: number;
+export interface User extends IdModel {
     username: string;
     email: string;
     profile: Profile;