@overmap-ai/core 1.0.74-integration-improvements.1 → 1.0.74-integration-improvements.2

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,53 +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">, setProfilePicture: import('@reduxjs/toolkit').ActionCreatorWithPayload<{
+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/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/base.d.ts

@@ -4,6 +4,9 @@ import { CommonAutoFields } from './issues';
 import { User } from './users';
 export interface Model {
 }
+export interface IdModel extends Model {
+    id: number;
+}
 export interface UUIDModel extends Model {
     uuid: string;
 }
@@ -39,7 +42,7 @@ export interface ColorModel {
     color: CSSColor;
 }
 export interface CreatedByModel {
-    created_by?: User["uuid"] | null;
+    created_by?: User["id"] | null;
 }
 export interface IndexedModel {
     index: number;

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

@@ -47,7 +47,7 @@ export interface Issue extends UUIDModel, SubmittedAtModel, CreatedByModel, Mark
     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 +56,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 +70,7 @@ export interface IssueUpdateChangeTypes {
     title: string;
     assigned_to: {
         full_name: string;
-        uuid: User["uuid"];
+        id: User["id"];
     } | null;
     due_date: string;
 }

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

@@ -2,6 +2,7 @@ import { ProjectAccessLevel } from '../../enums';
 import { FileWithNameModel } from '../files';
 import { OwnedByOrganization, SubmittedAtModel, UUIDModel } from './base';
 import { BoundableModel, CanvasBoundableModel } from './geo';
+import { User } from './users';
 export interface Project extends UUIDModel, BoundableModel, CanvasBoundableModel, OwnedByOrganization {
     name: string;
     invited?: boolean;
@@ -10,10 +11,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;
 }

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

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

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

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

package/package.json

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