@overmap-ai/core 1.0.73 → 1.0.74-model-indexes.1

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

@@ -42,4 +42,3 @@ export * from './ProjectFileService';
 export * from './ProjectService';
 export * from './TeamService';
 export * from './UserService';
-export * from './WorkspaceService';

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

@@ -43,4 +43,3 @@ export * from './rehydratedSlice';
 export * from './teamSlice';
 export * from './userSlice';
 export * from './versioningSlice';
-export * from './workspaceSlice';

package/dist/store/store.d.ts

@@ -3,7 +3,7 @@ import { Reducer } from '@reduxjs/toolkit';
 import { default as request } from 'superagent';
 import { BaseSDK, OfflineMetaEffect, OutboxCoordinator, RequestDetails } from '../sdk';
 import { BaseState, OvermapRootState } from '../typings';
-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 { 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 } from './slices';
 export declare const VERSION_REDUCER_KEY = "versioning";
 export declare const overmapReducers: {
     versioning: Reducer<VersioningState>;
@@ -32,7 +32,6 @@ export declare const overmapReducers: {
     formRevisionAttachmentReducer: Reducer<FormRevisionAttachmentState>;
     formSubmissionAttachmentReducer: Reducer<FormSubmissionAttachmentState>;
     formSubmissionReducer: Reducer<FormSubmissionState>;
-    workspaceReducer: Reducer<WorkspaceState>;
     emailDomainsReducer: Reducer<EmailDomainState>;
     licenseReducer: Reducer<LicenseState>;
     documentsReducer: Reducer<DocumentState>;

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

@@ -1,8 +1,8 @@
 import { BaseSerializedObject, ISerializedField } from '@overmap-ai/forms';
-import { ColorModel, CreatedByModel, IconModel, OfflineModel, SubmittedAtModel, TimestampedModel } from './base';
+import { ColorModel, CreatedByModel, IconModel, IndexedModel, OfflineModel, SubmittedAtModel, TimestampedModel } 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 OfflineModel, TimestampedModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel, IndexedModel {
     asset_type: string;
     created_at?: string;
     label: string | null;

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

@@ -16,7 +16,7 @@ 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 Payload<TModel> = Omit<TModel, "offline_id" | "created_at" | "updated_at" | "id" | "submitted_at" | "created_by" | "index">;
 export type MaybePayload<TModel extends OfflineModel> = Payload<TModel> & {
     offline_id?: string | null;
 };
@@ -42,3 +42,6 @@ export interface ColorModel {
 export interface CreatedByModel {
     created_by?: User["id"] | null;
 }
+export interface IndexedModel {
+    index: number | null;
+}

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

@@ -4,5 +4,5 @@ export interface Category extends OfflineModel, SubmittedAtModel, TimestampedMod
     name: string;
     description?: string;
     color: CSSColor;
-    workspace: string;
+    project: number;
 }

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

@@ -1,5 +1,5 @@
 import { BaseSerializedObject, ISerializedField } from '@overmap-ai/forms';
-import { CreatedByModel, OfflineModel, Payload, SubmittedAtModel, TimestampedModel } from './base';
+import { CreatedByModel, IndexedModel, OfflineModel, Payload, SubmittedAtModel, TimestampedModel } from './base';
 import { FieldsAttachmentModel, FieldsModel, FieldValuesAttachmentModel, FieldValuesModel } from './fields';
 export interface Form extends OfflineModel, SubmittedAtModel, CreatedByModel {
     organization: number;
@@ -10,7 +10,7 @@ export interface FormRevision<TFields extends BaseSerializedObject = ISerialized
     description?: string;
 }
 export type FormRevisionPayload = Omit<Payload<FormRevision>, "revision">;
-export interface FormSubmission extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel {
+export interface FormSubmission extends OfflineModel, SubmittedAtModel, TimestampedModel, CreatedByModel, FieldValuesModel, IndexedModel {
     form_revision: string;
     project: number;
     issue?: string | null;

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

@@ -1,14 +1,14 @@
 import { FileWithNameModel } from '../files';
-import { CreatedByModel, OfflineModel, SubmittedAtModel } from './base';
+import { CreatedByModel, IndexedModel, OfflineModel, Payload, SubmittedAtModel } from './base';
 import { CanvasMarkableModel, MarkableModel } from './geo';
-export interface GeoImage extends OfflineModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel, FileWithNameModel {
+export interface GeoImage extends OfflineModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel, FileWithNameModel, IndexedModel {
     title?: string;
     description?: string;
     project: number;
     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

@@ -19,4 +19,3 @@ export * from './projects';
 export * from './store';
 export * from './teams';
 export * from './users';
-export * from './workspace';

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

@@ -1,11 +1,10 @@
 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 { CreatedByModel, IndexedModel, Offline, OfflineModel, SubmittedAtModel, TimestampedModel } from './base';
 import { FieldsAttachmentModel, FieldsModel, FieldValuesModel } from './fields';
 import { CanvasMarkableModel, MarkableModel } from './geo';
 import { User } from './users';
-import { WorkspaceIndexedModel } from './workspace';
 /**
  * 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.
@@ -27,7 +26,7 @@ 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, Pick<WorkspaceIndexedModel, "index_workspace">, MarkableModel, CanvasMarkableModel {
+export interface Issue extends OfflineModel, SubmittedAtModel, CreatedByModel, MarkableModel, CanvasMarkableModel, IndexedModel {
     title?: string | null;
     description?: string | null;
     priority: IssuePriority;
@@ -36,6 +35,7 @@ export interface Issue extends OfflineModel, SubmittedAtModel, CreatedByModel, P
     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.
@@ -49,7 +49,7 @@ export interface SubmittedIssue extends OfflineModel, CreatedByModel {
  * 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, Pick<WorkspaceIndexedModel, "index"> {
+export interface CreatedIssue extends Issue {
     title: Exclude<Issue["title"], undefined>;
     description: Exclude<Issue["description"], undefined>;
     assigned_to: Exclude<Issue["assigned_to"], undefined>;

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, 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 } from '../../store';
 export interface BaseState {
     outboxReducer: OutboxState;
     offline: OfflineState;
@@ -33,7 +33,6 @@ export interface OvermapRootState extends BaseState {
     formSubmissionReducer: FormSubmissionState;
     formSubmissionAttachmentReducer: FormSubmissionAttachmentState;
     userReducer: UserState;
-    workspaceReducer: WorkspaceState;
     emailDomainsReducer: EmailDomainState;
     licenseReducer: LicenseState;
     documentsReducer: DocumentState;

package/package.json

@@ -3,7 +3,7 @@
 	"description": "Core functionality for Overmap",
 	"author": "Wôrdn Inc.",
 	"license": "UNLICENSED",
-	"version": "1.0.73",
+	"version": "1.0.74-model-indexes.1",
 	"type": "module",
 	"main": "dist/overmap-core.umd.cjs",
 	"module": "dist/overmap-core.js",

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

@@ -1,10 +0,0 @@
-import { Offline, OvermapRootState, Payload, Workspace } from '../../typings';
-import { BaseSDK } from '../base';
-import { OptimisticModelResult } from '../typings';
-import { BaseApiService } from './BaseApiService';
-export declare abstract class WorkspaceService<TState extends OvermapRootState, TSDK extends BaseSDK<TState>> extends BaseApiService<TState, TSDK> {
-    add(payload: Payload<Workspace>): OptimisticModelResult<Workspace>;
-    update(payload: Offline<Partial<Payload<Workspace>>>): OptimisticModelResult<Workspace>;
-    delete(id: string): Promise<undefined>;
-    refreshStore(projectId: number): Promise<undefined>;
-}

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

@@ -1,50 +0,0 @@
-import { Reducer } from '@reduxjs/toolkit';
-import { OvermapRootState, OvermapSelector, OvermapSelectorWithArgs, Stored, Workspace } from '../../typings';
-import { ModelState } from '../typings';
-export type WorkspaceState = ModelState<Stored<Workspace>>;
-export declare const workspaceSlice: import('@reduxjs/toolkit').Slice<WorkspaceState, {
-    initializeWorkspaces: (state: ModelState<Stored<Workspace>>, action: {
-        payload: Stored<Workspace>[];
-        type: string;
-    }) => void;
-    setWorkspaces: (state: ModelState<Stored<Workspace>>, action: {
-        payload: Stored<Workspace>[];
-        type: string;
-    }) => void;
-    addWorkspace: (state: ModelState<Stored<Workspace>>, action: {
-        payload: Stored<Workspace>;
-        type: string;
-    }) => void;
-    updateWorkspace: (state: ModelState<Stored<Workspace>>, action: {
-        payload: Stored<Workspace>;
-        type: string;
-    }) => void;
-    deleteWorkspace: (state: ModelState<Stored<Workspace>>, action: import('@reduxjs/toolkit').PayloadAction<string>) => void;
-}, "workspace", "workspace", import('@reduxjs/toolkit').SliceSelectors<WorkspaceState>>;
-export declare const initializeWorkspaces: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<Workspace>[], "workspace/initializeWorkspaces">, setWorkspaces: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<Workspace>[], "workspace/setWorkspaces">, addWorkspace: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<Workspace>, "workspace/addWorkspace">, updateWorkspace: import('@reduxjs/toolkit').ActionCreatorWithPayload<Stored<Workspace>, "workspace/updateWorkspace">, deleteWorkspace: import('@reduxjs/toolkit').ActionCreatorWithPayload<string, "workspace/deleteWorkspace">;
-export declare const selectWorkspaceMapping: OvermapSelector<Record<string, Workspace>>;
-export declare const selectWorkspaces: ((state: OvermapRootState) => Workspace[]) & {
-    clearCache: () => void;
-    resultsCount: () => number;
-    resetResultsCount: () => void;
-} & {
-    resultFunc: (resultFuncArgs_0: Record<string, Workspace>) => Workspace[];
-    memoizedResultFunc: ((resultFuncArgs_0: Record<string, Workspace>) => Workspace[]) & {
-        clearCache: () => void;
-        resultsCount: () => number;
-        resetResultsCount: () => void;
-    };
-    lastResult: () => Workspace[];
-    dependencies: [OvermapSelector<Record<string, Workspace>>];
-    recomputations: () => number;
-    resetRecomputations: () => void;
-    dependencyRecomputations: () => number;
-    resetDependencyRecomputations: () => void;
-} & {
-    argsMemoize: typeof import('reselect').weakMapMemoize;
-    memoize: typeof import('reselect').weakMapMemoize;
-};
-export declare const selectMainWorkspace: OvermapSelector<Workspace | undefined>;
-export declare const selectWorkspaceById: OvermapSelectorWithArgs<string, Stored<Workspace> | undefined>;
-export declare const selectPermittedWorkspaceIds: OvermapSelector<Set<string>>;
-export declare const workspaceReducer: Reducer<WorkspaceState>;

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

@@ -1,11 +0,0 @@
-import { CreatedByModel, Model, OfflineModel, SubmittedAtModel, TimestampedModel } from './base';
-export interface Workspace extends OfflineModel, TimestampedModel, SubmittedAtModel, CreatedByModel {
-    name: string;
-    project: number;
-    abbreviation: string | null;
-    permitted: boolean;
-}
-export interface WorkspaceIndexedModel extends Model {
-    index: number | null;
-    index_workspace: string;
-}