@overmap-ai/core 1.0.58-export-overmap-reducer.14 → 1.0.58-export-overmap-reducer.15

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

@@ -1,19 +1,15 @@
-import { SubmittedUserForm, UserFormRevision, UserFormRevisionPayload } from '../../typings/models/forms';
+import { UserForm, UserFormRevision, UserFormRevisionPayload } from '../../typings/models/forms';
 import { OptimisticModelResult } from "../typings";
 import { BaseApiService } from "./BaseApiService";
+import { Created, Submitted } from "../../typings";
+import { ISerializedField } from "../../forms";
 export declare class UserFormService extends BaseApiService {
     private getAttachImagePromises;
     private add;
-    addForOrganization(initialRevision: UserFormRevisionPayload, attachedTo?: {
-        assetTypeId: string;
-    } | {
-        issueTypeId: string;
-    }): Promise<[SubmittedUserForm, UserFormRevision, Promise<UserFormRevision>, Promise<UserFormRevision>]>;
-    addForCurrentUser(initialRevision: UserFormRevision, attachedTo?: {
-        assetTypeId: string;
-    } | {
-        issueTypeId: string;
-    }): Promise<[SubmittedUserForm, UserFormRevision, Promise<UserFormRevision>, Promise<UserFormRevision>]>;
+    addForOrganization(organizationId: number, initialRevision: UserFormRevisionPayload): Promise<[Submitted<UserForm>, Submitted<UserFormRevision<ISerializedField>>, Promise<Created<UserFormRevision<ISerializedField>>>, Promise<Created<UserFormRevision<ISerializedField>>>]>;
+    addForProject(projectId: number, initialRevision: UserFormRevisionPayload): Promise<[Submitted<UserForm>, Submitted<UserFormRevision<ISerializedField>>, Promise<Created<UserFormRevision<ISerializedField>>>, Promise<Created<UserFormRevision<ISerializedField>>>]>;
+    addForIssueType(issueTypeId: string, initialRevision: UserFormRevisionPayload): Promise<[Submitted<UserForm>, Submitted<UserFormRevision<ISerializedField>>, Promise<Created<UserFormRevision<ISerializedField>>>, Promise<Created<UserFormRevision<ISerializedField>>>]>;
+    addForAssetType(assetTypeId: string, initialRevision: UserFormRevisionPayload): Promise<[Submitted<UserForm>, Submitted<UserFormRevision<ISerializedField>>, Promise<Created<UserFormRevision<ISerializedField>>>, Promise<Created<UserFormRevision<ISerializedField>>>]>;
     createRevision(formId: string, revision: UserFormRevisionPayload): Promise<OptimisticModelResult<UserFormRevision>>;
     favorite(formId: string): Promise<undefined>;
     unfavorite(formId: string): Promise<undefined>;

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

@@ -22,79 +22,7 @@ export declare const formSlice: import("@reduxjs/toolkit").Slice<FormState, {
     }) => void;
     deleteForm: (state: import("immer/dist/internal.js").WritableDraft<FormState>, action: PayloadAction<string>) => void;
 }, "forms">;
-export declare const setForms: import("@reduxjs/toolkit").ActionCreatorWithPayload<((Pick<import('../../typings/models/workspace').WorkspaceIndexedModel, "index_workspace"> & {
-    favorite: boolean;
-    asset_type?: string | undefined;
-    issue_type?: string | undefined;
-} & {
-    owner_organization: number;
-    owner_user: undefined;
-} & {
-    offline_id: string;
-} & import('../../typings/models/base').OfflineModel & {
-    created_by: number;
-    submitted_at: string;
-}) | (Pick<import('../../typings/models/workspace').WorkspaceIndexedModel, "index_workspace"> & {
-    favorite: boolean;
-    asset_type?: string | undefined;
-    issue_type?: string | undefined;
-} & {
-    owner_organization: undefined;
-    owner_user: number;
-} & {
-    offline_id: string;
-} & import('../../typings/models/base').OfflineModel & {
-    created_by: number;
-    submitted_at: string;
-}))[], "forms/setForms">, addForm: import("@reduxjs/toolkit").ActionCreatorWithPayload<(Pick<import('../../typings/models/workspace').WorkspaceIndexedModel, "index_workspace"> & {
-    favorite: boolean;
-    asset_type?: string | undefined;
-    issue_type?: string | undefined;
-} & {
-    owner_organization: number;
-    owner_user: undefined;
-} & {
-    offline_id: string;
-} & import('../../typings/models/base').OfflineModel & {
-    created_by: number;
-    submitted_at: string;
-}) | (Pick<import('../../typings/models/workspace').WorkspaceIndexedModel, "index_workspace"> & {
-    favorite: boolean;
-    asset_type?: string | undefined;
-    issue_type?: string | undefined;
-} & {
-    owner_organization: undefined;
-    owner_user: number;
-} & {
-    offline_id: string;
-} & import('../../typings/models/base').OfflineModel & {
-    created_by: number;
-    submitted_at: string;
-}), "forms/addForm">, addForms: import("@reduxjs/toolkit").ActionCreatorWithPayload<((Pick<import('../../typings/models/workspace').WorkspaceIndexedModel, "index_workspace"> & {
-    favorite: boolean;
-    asset_type?: string | undefined;
-    issue_type?: string | undefined;
-} & {
-    owner_organization: number;
-    owner_user: undefined;
-} & {
-    offline_id: string;
-} & import('../../typings/models/base').OfflineModel & {
-    created_by: number;
-    submitted_at: string;
-}) | (Pick<import('../../typings/models/workspace').WorkspaceIndexedModel, "index_workspace"> & {
-    favorite: boolean;
-    asset_type?: string | undefined;
-    issue_type?: string | undefined;
-} & {
-    owner_organization: undefined;
-    owner_user: number;
-} & {
-    offline_id: string;
-} & import('../../typings/models/base').OfflineModel & {
-    created_by: number;
-    submitted_at: string;
-}))[], "forms/addForms">, favoriteForm: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+export declare const setForms: import("@reduxjs/toolkit").ActionCreatorWithPayload<Submitted<UserForm>[], "forms/setForms">, addForm: import("@reduxjs/toolkit").ActionCreatorWithPayload<Submitted<UserForm>, "forms/addForm">, addForms: import("@reduxjs/toolkit").ActionCreatorWithPayload<Submitted<UserForm>[], "forms/addForms">, favoriteForm: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     formId: string;
 }, "forms/favoriteForm">, unfavoriteForm: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     formId: string;
@@ -103,9 +31,7 @@ export type FormSearchArgs = SearchArgs<{
     /** `undefined` means don't filter by favorite. `boolean` filters forms. */
     favorites?: boolean;
     /** organization owner */
-    owner_organization?: number;
-    /** user owner */
-    owner_user?: number;
+    organization?: number;
 }>;
 export declare const selectFilteredForms: SelectorWithArgs<FormSearchArgs, CachedUserForm[]>;
 export declare const selectForm: SelectorWithArgs<string, Stored<UserForm>>;

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

@@ -1,23 +1,19 @@
 import { CreatedByModel, OfflineModel, Payload, SubmittedAtModel } from "./base";
 import { BaseSerializedObject, FieldValue, ISerializedField } from "../../forms";
 import { FileWithNameModel } from '../files';
-import { WorkspaceIndexedModel } from "./workspace";
-export type UserForm = Pick<WorkspaceIndexedModel, "index_workspace"> & {
+export interface UserForm extends OfflineModel {
     favorite: boolean;
+    created_by: number;
     asset_type?: string;
     issue_type?: string;
-} & ({
-    owner_organization: number;
-    owner_user: undefined;
-} | {
-    owner_organization: undefined;
-    owner_user: number;
-});
+    organization?: number;
+    project?: number;
+}
 export type SubmittedUserForm = UserForm & OfflineModel & {
     created_by: number;
     submitted_at: string;
 };
-export type CreatedUserForm = SubmittedUserForm & Pick<WorkspaceIndexedModel, "index"> & {
+export type CreatedUserForm = SubmittedUserForm & {
     created_at: string;
 };
 export type CachedUserForm = SubmittedUserForm & {

package/package.json

@@ -3,7 +3,7 @@
 	"description": "Core functionality for Overmap",
 	"author": "Wôrdn Inc.",
 	"license": "UNLICENSED",
-	"version": "1.0.58-export-overmap-reducer.14",
+	"version": "1.0.58-export-overmap-reducer.15",
 	"type": "module",
 	"main": "dist/overmap-core.umd.cjs",
 	"module": "dist/overmap-core.js",