@overmap-ai/core 1.0.58-qr-code-field-fix.0 → 1.0.58-sign-up-hotfix.1

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

@@ -1,11 +1,11 @@
 import { BaseApiService } from "./BaseApiService";
-import { Asset, Payload } from "../../typings";
+import { Asset, Created, Payload } from "../../typings";
 import { OptimisticModelResult } from "../typings";
 export declare class AssetService extends BaseApiService {
     add(asset: Payload<Asset>, workspaceId: string): OptimisticModelResult<Asset>;
     update(asset: Asset, workspaceId: string): OptimisticModelResult<Asset>;
     remove(assetId: string): Promise<undefined>;
     deleteAllAssetsOfAssetType(assetTypeId: string): Promise<undefined>;
-    addBatch(assetsToCreate: Payload<Asset>[], workspaceId: string, assetTypeId: string): Promise<Record<string, Asset>>;
+    bulkAdd(assetsToCreate: Payload<Asset>[], workspaceId: string, assetTypeId: string, batchSize: number): Promise<Created<Asset>[]>[];
     refreshStore(): Promise<void>;
 }

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/sdk/services/UserFormSubmissionService.d.ts

@@ -1,18 +1,25 @@
 import { Offline } from '../../typings/models/base';
 import { BaseApiService } from "./BaseApiService";
-import { UserFormSubmission, UserFormSubmissionPayload } from '../../typings/models/forms';
-import { OptimisticModelResult, OptimisticMultipleModelResult } from "../typings";
+import { UserFormSubmission, UserFormSubmissionAttachment, UserFormSubmissionPayload } from '../../typings/models/forms';
+import { OptimisticModelResult } from "../typings";
 import { FieldValue } from '../../forms';
-import { Stored } from "../../typings";
+import { Created, Stored } from "../../typings";
+import { GetS3UrlSuccessResponse } from "./FileService";
+interface BulkAddRequestReturnValue {
+    submissions: Created<UserFormSubmission>[];
+    attachments: Created<UserFormSubmissionAttachment>[];
+    presigned_urls: Record<string, GetS3UrlSuccessResponse>;
+}
 export declare class UserFormSubmissionService extends BaseApiService {
     private getAttachFilesPromises;
     add(payload: Offline<UserFormSubmissionPayload>): OptimisticModelResult<UserFormSubmission>;
     bulkAdd(args: {
         formRevision: string;
-        values: Record<string, FieldValue>;
-        assetOfflineIds: string[];
-    }): Promise<OptimisticMultipleModelResult<UserFormSubmission>>;
+        commonFieldValues: Record<string, FieldValue>;
+        fieldValuesByAsset: Record<string, Record<string, FieldValue>>;
+    }, batchSize: number): Promise<Promise<BulkAddRequestReturnValue>[]>;
     update(submission: Stored<UserFormSubmission>): OptimisticModelResult<UserFormSubmission>;
     delete(submissionId: string): Promise<undefined>;
     refreshStore(): Promise<void>;
 }
+export {};

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

@@ -9,7 +9,9 @@ export declare const assetSlice: import("@reduxjs/toolkit").Slice<AssetState, {
     addAssetsInBatches: (state: import("immer/dist/internal.js").WritableDraft<AssetState>, action: PayloadAction<(Asset | Submitted<Asset>)[]>) => void;
     setAssets: (state: import("immer/dist/internal.js").WritableDraft<AssetState>, action: PayloadAction<Asset[]>) => void;
     updateAsset: (state: import("immer/dist/internal.js").WritableDraft<AssetState>, action: PayloadAction<Asset>) => void;
+    updateAssets: (state: import("immer/dist/internal.js").WritableDraft<AssetState>, action: PayloadAction<Asset[]>) => void;
     removeAsset: (state: import("immer/dist/internal.js").WritableDraft<AssetState>, action: PayloadAction<string>) => void;
+    removeAssets: (state: import("immer/dist/internal.js").WritableDraft<AssetState>, action: PayloadAction<string[]>) => void;
     removeAllAssetsOfType: (state: import("immer/dist/internal.js").WritableDraft<AssetState>, action: PayloadAction<string>) => void;
     setAssetAttachment: (state: AssetState, action: {
         payload: Stored<AssetAttachment>;
@@ -44,7 +46,7 @@ export declare const assetSlice: import("@reduxjs/toolkit").Slice<AssetState, {
         type: string;
     }) => void;
 }, "assets">;
-export declare const addAsset: import("@reduxjs/toolkit").ActionCreatorWithPayload<Asset, "assets/addAsset">, updateAsset: import("@reduxjs/toolkit").ActionCreatorWithPayload<Asset, "assets/updateAsset">, removeAsset: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "assets/removeAsset">, addAssetsInBatches: import("@reduxjs/toolkit").ActionCreatorWithPayload<(Asset | Submitted<Asset>)[], "assets/addAssetsInBatches">, setAssets: import("@reduxjs/toolkit").ActionCreatorWithPayload<Asset[], "assets/setAssets">, removeAllAssetsOfType: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "assets/removeAllAssetsOfType">, setAssetAttachment: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<AssetAttachment>, "assets/setAssetAttachment">, setAssetAttachments: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<AssetAttachment>[], "assets/setAssetAttachments">, addAssetAttachment: import("@reduxjs/toolkit").ActionCreatorWithPayload<Submitted<AssetAttachment>, "assets/addAssetAttachment">, addAssetAttachments: import("@reduxjs/toolkit").ActionCreatorWithPayload<Submitted<AssetAttachment>[], "assets/addAssetAttachments">, updateAssetAttachment: import("@reduxjs/toolkit").ActionCreatorWithPayload<Submitted<AssetAttachment>, "assets/updateAssetAttachment">, updateAssetAttachments: import("@reduxjs/toolkit").ActionCreatorWithPayload<Submitted<AssetAttachment>[], "assets/updateAssetAttachments">, removeAssetAttachment: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "assets/removeAssetAttachment">, removeAssetAttachments: import("@reduxjs/toolkit").ActionCreatorWithPayload<string[], "assets/removeAssetAttachments">;
+export declare const addAsset: import("@reduxjs/toolkit").ActionCreatorWithPayload<Asset, "assets/addAsset">, updateAsset: import("@reduxjs/toolkit").ActionCreatorWithPayload<Asset, "assets/updateAsset">, updateAssets: import("@reduxjs/toolkit").ActionCreatorWithPayload<Asset[], "assets/updateAssets">, removeAsset: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "assets/removeAsset">, removeAssets: import("@reduxjs/toolkit").ActionCreatorWithPayload<string[], "assets/removeAssets">, addAssetsInBatches: import("@reduxjs/toolkit").ActionCreatorWithPayload<(Asset | Submitted<Asset>)[], "assets/addAssetsInBatches">, setAssets: import("@reduxjs/toolkit").ActionCreatorWithPayload<Asset[], "assets/setAssets">, removeAllAssetsOfType: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "assets/removeAllAssetsOfType">, setAssetAttachment: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<AssetAttachment>, "assets/setAssetAttachment">, setAssetAttachments: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<AssetAttachment>[], "assets/setAssetAttachments">, addAssetAttachment: import("@reduxjs/toolkit").ActionCreatorWithPayload<Submitted<AssetAttachment>, "assets/addAssetAttachment">, addAssetAttachments: import("@reduxjs/toolkit").ActionCreatorWithPayload<Submitted<AssetAttachment>[], "assets/addAssetAttachments">, updateAssetAttachment: import("@reduxjs/toolkit").ActionCreatorWithPayload<Submitted<AssetAttachment>, "assets/updateAssetAttachment">, updateAssetAttachments: import("@reduxjs/toolkit").ActionCreatorWithPayload<Submitted<AssetAttachment>[], "assets/updateAssetAttachments">, removeAssetAttachment: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "assets/removeAssetAttachment">, removeAssetAttachments: import("@reduxjs/toolkit").ActionCreatorWithPayload<string[], "assets/removeAssetAttachments">;
 export declare const selectAssets: (state: RootState) => Asset[];
 export declare const selectAssetsMapping: (state: RootState) => Record<string, Asset | Submitted<Asset>>;
 export declare const selectAssetsOfAssetType: SelectorWithArgs<string, Asset[]>;

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/components.d.ts

@@ -5,6 +5,7 @@ export interface Asset extends OfflineModel {
     asset_type: string;
     created_at?: string;
     label: string | null;
+    description?: string;
 }
 export interface AssetType extends OfflineModel, IconModel {
     name?: string;

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/dist/utils/array.d.ts

@@ -0,0 +1 @@
+export declare function chunkArray<T>(arr: T[], chunkSize: number): T[][];

package/package.json

@@ -3,7 +3,7 @@
 	"description": "Core functionality for Overmap",
 	"author": "Wôrdn Inc.",
 	"license": "UNLICENSED",
-	"version": "1.0.58-qr-code-field-fix.0",
+	"version": "1.0.58-sign-up-hotfix.1",
 	"type": "module",
 	"main": "dist/overmap-core.umd.cjs",
 	"module": "dist/overmap-core.js",