@overmap-ai/core 1.0.69 → 1.0.71-depend-on-forms.0

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

@@ -1,6 +1,7 @@
-import type { Form, FormRevision, FormRevisionAttachment, FormRevisionPayload, ISerializedField, OvermapRootState, Stored, Created } from "../../typings";
+import type { Form, FormRevision, FormRevisionAttachment, FormRevisionPayload, OvermapRootState, Stored, Created } from "../../typings";
 import type { BaseSDK } from "../base";
 import { BaseUploadService } from "./BaseUploadService";
+import { ISerializedField } from "@overmap-ai/forms";
 export declare abstract class FormService<TState extends OvermapRootState, TSDK extends BaseSDK<TState>> extends BaseUploadService<TState, TSDK> {
     private bulkAddRevisionAttachments;
     private add;
@@ -14,6 +15,6 @@ export declare abstract class FormService<TState extends OvermapRootState, TSDK
         Promise<Created<FormRevision>>,
         Promise<Created<FormRevisionAttachment>[]>
     ]>;
-    delete(formId: string): Promise<undefined>;
+    delete(id: string): Promise<undefined>;
     refreshStore(projectId: number): Promise<void>;
 }

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

@@ -1,7 +1,8 @@
-import type { Created, FieldValue, FormSubmission, FormSubmissionAttachment, Offline, OvermapRootState, Payload, Stored } from "../../typings";
+import type { Created, FormSubmission, FormSubmissionAttachment, Offline, OvermapRootState, Payload, Stored } from "../../typings";
 import type { PresignedUrlsResponse } from "../typings";
 import type { BaseSDK } from "../base";
 import { BaseUploadService } from "./BaseUploadService";
+import { FieldValue } from "@overmap-ai/forms";
 interface BulkAddRequestReturnValue {
     submissions: Created<FormSubmission>[];
     attachments: Created<FormSubmissionAttachment>[];
@@ -28,7 +29,7 @@ export declare abstract class FormSubmissionService<TState extends OvermapRootSt
         Promise<Created<FormSubmissionAttachment>[]>,
         Promise<void>
     ]>;
-    delete(submissionId: string): Promise<undefined>;
+    delete(id: string): Promise<undefined>;
     refreshStore(projectId: number): Promise<void>;
 }
 export {};

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

@@ -6,6 +6,6 @@ export declare abstract class GeoImageService<TState extends OvermapRootState, T
     add(payload: GeoImagePayload): Promise<OptimisticModelResult<GeoImage>>;
     bulkAdd(payloads: BulkGeoImagePayload[], projectId: number): Promise<OptimisticMultipleModelResult<GeoImage>>;
     update(payload: Offline<Partial<Pick<GeoImagePayload, "title" | "description">>>): OptimisticModelResult<GeoImage>;
-    delete(geoImageId: string): Promise<void>;
+    delete(id: string): Promise<void>;
     refreshStore(projectId: number): Promise<void>;
 }

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

@@ -5,7 +5,7 @@ import type { BaseSDK } from "../base";
 export declare abstract class TeamService<TState extends OvermapRootState, TSDK extends BaseSDK<TState>> extends BaseApiService<TState, TSDK> {
     add(payload: Payload<Team>): OptimisticModelResult<Team>;
     update(payload: Offline<Partial<Payload<Team>>>): OptimisticModelResult<Team>;
-    delete(teamId: string): Promise<undefined>;
+    delete(id: string): Promise<undefined>;
     setMembers(teamId: string, members: User["id"][]): Promise<undefined>;
     addMembers(teamId: string, members: User["id"][]): Promise<undefined>;
     removeMembers(teamId: string, members: User["id"][]): Promise<undefined>;

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

@@ -5,6 +5,6 @@ import type { BaseSDK } from "../base";
 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(workspaceId: string): Promise<undefined>;
+    delete(id: string): Promise<undefined>;
     refreshStore(projectId: number): Promise<undefined>;
 }

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

@@ -3,34 +3,34 @@ import type { Form, FormRevision, OvermapRootState, OvermapSelector, OvermapSele
 import type { ModelState } from "../typings";
 export type FormRevisionState = ModelState<Stored<FormRevision>>;
 export declare const formRevisionsSlice: import("@reduxjs/toolkit").Slice<FormRevisionState, {
-    initializeFormRevisions: <TState extends ModelState<Stored<FormRevision<import('../../typings/models/forms').ISerializedField>>>>(state: TState, action: {
-        payload: Stored<FormRevision<import('../../typings/models/forms').ISerializedField>>[];
+    initializeFormRevisions: <TState extends ModelState<Stored<FormRevision<import("@overmap-ai/forms").ISerializedField>>>>(state: TState, action: {
+        payload: Stored<FormRevision<import("@overmap-ai/forms").ISerializedField>>[];
         type: string;
     }) => void;
-    setFormRevision: <TState_1 extends ModelState<Stored<FormRevision<import('../../typings/models/forms').ISerializedField>>>>(state: TState_1, action: {
-        payload: Stored<FormRevision<import('../../typings/models/forms').ISerializedField>>;
+    setFormRevision: <TState_1 extends ModelState<Stored<FormRevision<import("@overmap-ai/forms").ISerializedField>>>>(state: TState_1, action: {
+        payload: Stored<FormRevision<import("@overmap-ai/forms").ISerializedField>>;
         type: string;
     }) => void;
-    addFormRevision: <TState_2 extends ModelState<Stored<FormRevision<import('../../typings/models/forms').ISerializedField>>>>(state: TState_2, action: {
-        payload: Stored<FormRevision<import('../../typings/models/forms').ISerializedField>>;
+    addFormRevision: <TState_2 extends ModelState<Stored<FormRevision<import("@overmap-ai/forms").ISerializedField>>>>(state: TState_2, action: {
+        payload: Stored<FormRevision<import("@overmap-ai/forms").ISerializedField>>;
         type: string;
     }) => void;
-    addFormRevisions: <TState_3 extends ModelState<Stored<FormRevision<import('../../typings/models/forms').ISerializedField>>>>(state: TState_3, action: {
-        payload: Stored<FormRevision<import('../../typings/models/forms').ISerializedField>>[];
+    addFormRevisions: <TState_3 extends ModelState<Stored<FormRevision<import("@overmap-ai/forms").ISerializedField>>>>(state: TState_3, action: {
+        payload: Stored<FormRevision<import("@overmap-ai/forms").ISerializedField>>[];
         type: string;
     }) => void;
-    deleteFormRevision: <TState_4 extends ModelState<Stored<FormRevision<import('../../typings/models/forms').ISerializedField>>>>(state: TState_4, action: {
+    deleteFormRevision: <TState_4 extends ModelState<Stored<FormRevision<import("@overmap-ai/forms").ISerializedField>>>>(state: TState_4, action: {
         payload: string;
         type: string;
     }) => void;
-    deleteFormRevisions: <TState_5 extends ModelState<Stored<FormRevision<import('../../typings/models/forms').ISerializedField>>>>(state: TState_5, action: {
+    deleteFormRevisions: <TState_5 extends ModelState<Stored<FormRevision<import("@overmap-ai/forms").ISerializedField>>>>(state: TState_5, action: {
         payload: string[];
         type: string;
     }) => void;
 }, "formRevisions">;
-export declare const setFormRevision: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<FormRevision<import('../../typings/models/forms').ISerializedField>>, "formRevisions/setFormRevision">, initializeFormRevisions: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<FormRevision<import('../../typings/models/forms').ISerializedField>>[], "formRevisions/initializeFormRevisions">, addFormRevision: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<FormRevision<import('../../typings/models/forms').ISerializedField>>, "formRevisions/addFormRevision">, addFormRevisions: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<FormRevision<import('../../typings/models/forms').ISerializedField>>[], "formRevisions/addFormRevisions">, deleteFormRevision: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "formRevisions/deleteFormRevision">, deleteFormRevisions: import("@reduxjs/toolkit").ActionCreatorWithPayload<string[], "formRevisions/deleteFormRevisions">;
-export declare const selectFormRevisionMapping: (state: OvermapRootState) => Record<string, Stored<FormRevision<import('../../typings/models/forms').ISerializedField>>>;
-export declare const selectFormRevisions: ((state: OvermapRootState) => Stored<FormRevision<import('../../typings/models/forms').ISerializedField>>[]) & import("reselect").OutputSelectorFields<(args_0: Record<string, Stored<FormRevision<import('../../typings/models/forms').ISerializedField>>>) => Stored<FormRevision<import('../../typings/models/forms').ISerializedField>>[], {
+export declare const setFormRevision: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<FormRevision<import("@overmap-ai/forms").ISerializedField>>, "formRevisions/setFormRevision">, initializeFormRevisions: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<FormRevision<import("@overmap-ai/forms").ISerializedField>>[], "formRevisions/initializeFormRevisions">, addFormRevision: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<FormRevision<import("@overmap-ai/forms").ISerializedField>>, "formRevisions/addFormRevision">, addFormRevisions: import("@reduxjs/toolkit").ActionCreatorWithPayload<Stored<FormRevision<import("@overmap-ai/forms").ISerializedField>>[], "formRevisions/addFormRevisions">, deleteFormRevision: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "formRevisions/deleteFormRevision">, deleteFormRevisions: import("@reduxjs/toolkit").ActionCreatorWithPayload<string[], "formRevisions/deleteFormRevisions">;
+export declare const selectFormRevisionMapping: (state: OvermapRootState) => Record<string, Stored<FormRevision<import("@overmap-ai/forms").ISerializedField>>>;
+export declare const selectFormRevisions: ((state: OvermapRootState) => Stored<FormRevision<import("@overmap-ai/forms").ISerializedField>>[]) & import("reselect").OutputSelectorFields<(args_0: Record<string, Stored<FormRevision<import("@overmap-ai/forms").ISerializedField>>>) => Stored<FormRevision<import("@overmap-ai/forms").ISerializedField>>[], {
     clearCache: () => void;
 }> & {
     clearCache: () => void;

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

@@ -30,8 +30,7 @@ export interface OptionalFileModel {
     file?: string | null;
     objectURL?: string;
 }
-export interface OwnedByUserOrOrganization {
-    user_owner: number;
+export interface OwnedByOrganization {
     organization_owner: number;
 }
 export interface SubmittedAtModel {

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

@@ -1,91 +1,6 @@
-import { HTMLInputTypeAttribute } from "react";
 import type { CreatedByModel, OfflineModel, Payload, SubmittedAtModel, TimestampedModel } from "./base";
 import type { Attachment } from "./attachments";
-export interface BaseSerializedField<TIdentifier extends FieldTypeIdentifier = FieldTypeIdentifier> extends BaseSerializedObject<TIdentifier> {
-    label: string;
-    required: boolean;
-    image?: File | Promise<File>;
-}
-export interface SerializedCondition<TValue extends FieldValue = FieldValue> {
-    identifier: string;
-    value: TValue;
-}
-export interface SerializedFieldSection extends BaseSerializedObject {
-    label: string | null;
-    type: "section";
-    conditional: boolean;
-    condition: SerializedCondition | null;
-    fields: Exclude<ISerializedField, SerializedFieldSection>[];
-}
-interface BaseSerializedStringField extends BaseSerializedField {
-    minimum_length?: number;
-    maximum_length: number;
-    placeholder?: string;
-}
-export type StringInputType = Exclude<HTMLInputTypeAttribute, "checkbox" | "number" | "button">;
-export interface SerializedStringField extends BaseSerializedStringField {
-    type: "string";
-    input_type?: StringInputType;
-}
-export interface SerializedQrField extends BaseSerializedField {
-    type: "qr";
-}
-export interface SerializedTextField extends BaseSerializedStringField {
-    type: "text";
-}
-export interface SerializedMultiStringField extends BaseSerializedStringField {
-    type: "multi-string";
-}
-export interface SerializedBooleanField extends BaseSerializedField {
-    type: "boolean";
-}
-export interface SerializedNumberField extends BaseSerializedField {
-    type: "number";
-    minimum: number | undefined;
-    maximum: number | undefined;
-    integers: boolean;
-    placeholder?: string;
-}
-export interface SerializedDateField extends BaseSerializedField {
-    type: "date";
-}
-export type SelectFieldOptionValue = string;
-/** Represents an option in the select input. Not to be confused with the 'field options' of SelectField. */
-export interface SelectFieldOption {
-    value: SelectFieldOptionValue;
-    label: string;
-}
-export interface SerializedSelectField extends BaseSerializedField {
-    type: "select";
-    options: SelectFieldOption[];
-    placeholder?: string;
-}
-export interface SerializedMultiSelectField extends BaseSerializedField {
-    type: "multi-select";
-    options: SelectFieldOption[];
-    placeholder?: string;
-}
-export interface SerializedUploadField extends BaseSerializedField {
-    type: "upload";
-    /** @see https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/accept */
-    extensions?: string[];
-    /** in bytes */
-    maximum_size?: number;
-    /** how many files the user can upload to this field
-     * @default 1
-     */
-    maximum_files?: number;
-}
-export type ISerializedField = SerializedTextField | SerializedBooleanField | SerializedNumberField | SerializedDateField | SerializedStringField | SerializedSelectField | SerializedFieldSection | SerializedMultiStringField | SerializedMultiSelectField | SerializedUploadField | SerializedQrField;
-export type ISerializedOnlyField = Exclude<ISerializedField, SerializedFieldSection>;
-/** All the possible field values */
-export type FieldValue = string | number | boolean | string[] | File[] | Date | null;
-export type FieldTypeIdentifier = "string" | "text" | "boolean" | "number" | "date" | "select" | "custom" | "section" | "multi-string" | "multi-select" | "upload" | "qr";
-export interface BaseSerializedObject<TIdentifier extends FieldTypeIdentifier = FieldTypeIdentifier> {
-    description?: string | null;
-    identifier: string;
-    type: TIdentifier;
-}
+import type { BaseSerializedObject, FieldValue, ISerializedField } from "@overmap-ai/forms";
 export interface Form extends OfflineModel, SubmittedAtModel, CreatedByModel {
     asset_type?: string;
     issue_type?: string;
@@ -124,4 +39,3 @@ export interface FormRevisionAttachment extends Attachment {
     revision: string;
     field_identifier: string;
 }
-export {};

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

@@ -1,9 +1,9 @@
-import type { OfflineModel, OwnedByUserOrOrganization } from "./base";
+import type { OfflineModel, OwnedByOrganization } from "./base";
 import type { LicenseLevel, LicenseStatus } from "../../enums";
 export interface Transaction {
     id: string;
 }
-export interface License extends OfflineModel, OwnedByUserOrOrganization {
+export interface License extends OfflineModel, OwnedByOrganization {
     project: number | null;
     level: LicenseLevel;
     status: LicenseStatus;

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

@@ -1,11 +1,9 @@
-import type { Model, OfflineModel, SubmittedAtModel } from "./base";
+import type { Model, OfflineModel, OwnedByOrganization, SubmittedAtModel } from "./base";
 import type { FileWithNameModel } from "../files";
 import type { BoundableModel, CanvasBoundableModel } from "./geo";
-export interface Project extends Model, BoundableModel, CanvasBoundableModel {
+export interface Project extends Model, BoundableModel, CanvasBoundableModel, OwnedByOrganization {
     id: number;
     name: string;
-    organization_owner: number | null;
-    user_owner: number | null;
     invited?: boolean;
     issues_count?: number;
     form_submissions_count?: number;

package/package.json

@@ -3,7 +3,7 @@
 	"description": "Core functionality for Overmap",
 	"author": "Wôrdn Inc.",
 	"license": "UNLICENSED",
-	"version": "1.0.69",
+	"version": "1.0.71-depend-on-forms.0",
 	"type": "module",
 	"main": "dist/overmap-core.umd.cjs",
 	"module": "dist/overmap-core.js",
@@ -39,7 +39,8 @@
 	"devDependencies": {
 		"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
 		"@esbuild-plugins/node-modules-polyfill": "^0.2.2",
-		"@overmap-ai/blocks": "1.0.31-tailwind-components.25",
+		"@overmap-ai/blocks": "^1.0.35-radio-card.2",
+		"@overmap-ai/forms": "^1.0.17-radio-field.16",
 		"@rollup/plugin-commonjs": "^25.0.4",
 		"@testing-library/dom": "^9.3.4",
 		"@testing-library/react": "^14.1.2",
@@ -86,7 +87,8 @@
 		"vitest": "^1.2.1"
 	},
 	"peerDependencies": {
-		"@overmap-ai/blocks": "1.0.31-tailwind-components.25",
+		"@overmap-ai/blocks": "^1.0.35-radio-card.2",
+		"@overmap-ai/forms": "^1.0.17-radio-field.16",
 		"@tiptap/core": "^2.4.0",
 		"leaflet": "^1.9.0",
 		"react": ">=18.2.0 <20.0.0",