@overmap-ai/core 1.0.38-component-fields.8 → 1.0.38-component-fields.10

package/dist/forms/builder/FieldSectionWithActions.d.ts

@@ -5,6 +5,7 @@ interface FieldSectionWithActionsProps {
     field: SerializedFieldSection;
     index: number;
     dropState: DropState;
+    fieldsOnly: boolean;
 }
 export declare const FieldSectionWithActions: import("react").MemoExoticComponent<(props: FieldSectionWithActionsProps) => import("react/jsx-runtime").JSX.Element>;
 export {};

package/dist/forms/builder/FieldsEditor.d.ts

@@ -1,2 +1,6 @@
 /// <reference types="react" />
-export declare const FieldsEditor: import("react").MemoExoticComponent<() => import("react/jsx-runtime").JSX.Element>;
+interface FieldsEditorProps {
+    fieldsOnly: boolean;
+}
+export declare const FieldsEditor: import("react").MemoExoticComponent<(props: FieldsEditorProps) => import("react/jsx-runtime").JSX.Element>;
+export {};

package/dist/forms/builder/FormBuilder.d.ts

@@ -9,8 +9,16 @@ interface FormBuilderProps {
     initialTitle?: string;
     /** @default true */
     showExplainerText?: boolean;
-    /** @default false */
-    showSectionsOnly?: boolean;
+    /** @default true */
+    showFormTitle?: boolean;
+    /** Show and edit non-section fields only. Functionally, these fields will be in a single section with no label
+     * @default false
+     */
+    fieldsOnly?: boolean;
+    /** Show the Edit and Preview tabs at the top of the component. If false, the preview is entirely inaccessible.
+     * @default true
+     */
+    showTabs?: boolean;
 }
 export declare const FormBuilder: import("react").MemoExoticComponent<import("react").ForwardRefExoticComponent<FormBuilderProps & import("react").RefAttributes<HTMLDivElement>>>;
 export {};

package/dist/overmap-core.js

@@ -3291,6 +3291,24 @@ const selectLatestRevisionsFromComponentTypeIds = restructureCreateSelectorWithA
     }
   )
 );
+const selectLatestRevisionsForComponentStageForms = restructureCreateSelectorWithArgs(
+  createSelector(
+    [
+      selectUserFormMapping,
+      selectRevisionMapping,
+      (_state, componentStageId) => componentStageId
+    ],
+    (userForms, revisions, componentStageId) => {
+      const latestRevisions = [];
+      for (const form of Object.values(userForms)) {
+        if (form.component_stage === componentStageId) {
+          latestRevisions.push(_selectLatestFormRevision(revisions, form.offline_id));
+        }
+      }
+      return latestRevisions;
+    }
+  )
+);
 const selectLatestRevisionByFormId = createSelector([selectRevisionMapping], (revisions) => {
   const latestRevisions = {};
   for (const revision of Object.values(revisions)) {
@@ -5468,10 +5486,13 @@ class UserFormService extends BaseApiService {
       });
     });
   }
-  async add(state, initialRevision, url, ownerUser, ownerOrganization, componentType) {
+  async add(state, initialRevision, url, ownerUser, ownerOrganization, componentTypeId, componentStageId) {
     if (!!ownerUser === !!ownerOrganization) {
       throw new Error("Exactly one of ownerUser and ownerOrganization must be defined.");
     }
+    if (componentTypeId && componentStageId) {
+      throw new Error("At most one of componentTypeId and componentStageId should be defined.");
+    }
     const ownerAttrs = {
       owner_user: ownerUser,
       owner_organization: ownerOrganization
@@ -5486,7 +5507,8 @@ class UserFormService extends BaseApiService {
       favorite: true,
       submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
       created_by: currentUser.id,
-      ...componentType && { component_type: componentType },
+      ...componentTypeId && { component_type: componentTypeId },
+      ...componentStageId && { component_stage: componentStageId },
       ...ownerAttrs
     };
     const { payloadWithoutImage, images } = await separateImageFromFields(offlineRevisionPayload);
@@ -5508,10 +5530,11 @@ class UserFormService extends BaseApiService {
       } : void 0,
       payload: {
         ...offlineFormPayload,
-        ...componentType && { component_type: componentType },
+        ...componentTypeId && { component_type: componentTypeId },
+        ...componentStageId && { component_stage: componentStageId },
         initial_revision: payloadWithoutImage
       },
-      blockers: [],
+      blockers: [componentTypeId, componentStageId].filter((x) => x !== void 0),
       blocks: [offlineFormPayload.offline_id, payloadWithoutImage.offline_id]
     });
     const attachImagesPromises = this.getAttachImagePromises(images, offlineRevisionPayload.offline_id);
@@ -5523,7 +5546,7 @@ class UserFormService extends BaseApiService {
     const settledPromise = Promise.all([formPromise, ...attachImagesPromises]).then(() => formPromise);
     return [retForm, retRevision, formPromise, settledPromise];
   }
-  async addForOrganization(initialRevision, componentType) {
+  async addForOrganization(initialRevision, componentTypeId, componentStageId) {
     const state = this.client.store.getState();
     const activeOrganizationId = state.organizationReducer.activeOrganizationId;
     if (!activeOrganizationId) {
@@ -5535,13 +5558,22 @@ class UserFormService extends BaseApiService {
       `/forms/in-organization/${activeOrganizationId}/`,
       void 0,
       activeOrganizationId,
-      componentType
+      componentTypeId,
+      componentStageId
     );
   }
-  async addForCurrentUser(initialRevision, componentType) {
+  async addForCurrentUser(initialRevision, componentTypeId, componentStageId) {
     const state = this.client.store.getState();
     const currentUser = state.userReducer.currentUser;
-    return await this.add(state, initialRevision, "/forms/my-forms/", currentUser.id, void 0, componentType);
+    return await this.add(
+      state,
+      initialRevision,
+      "/forms/my-forms/",
+      currentUser.id,
+      void 0,
+      componentTypeId,
+      componentStageId
+    );
   }
   async createRevision(formId2, revision) {
     const offlineRevision = offline(revision);
@@ -11237,7 +11269,7 @@ const FieldWithActions = memo((props) => {
 FieldWithActions.displayName = "FieldWithActions";
 const FieldSectionWithActions = memo((props) => {
   var _a2;
-  const { field, index: sectionIndex, dropState } = props;
+  const { field, index: sectionIndex, dropState, fieldsOnly } = props;
   const isDropDisabled = (_a2 = dropState[field.identifier]) == null ? void 0 : _a2.disabled;
   const { setFieldValue, values } = useFormikContext();
   const alertDialog = useAlertDialog();
@@ -11377,7 +11409,7 @@ const FieldSectionWithActions = memo((props) => {
         mb: "4",
         children: /* @__PURE__ */ jsxs(Flex, { gap: "3", justify: "between", align: "center", children: [
           /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: "2", grow: "1", children: [
-            /* @__PURE__ */ jsx(FieldBuilder, { ...editSectionProps }),
+            !fieldsOnly && /* @__PURE__ */ jsx(FieldBuilder, { ...editSectionProps }),
             /* @__PURE__ */ jsx(
               Droppable,
               {
@@ -11421,7 +11453,7 @@ const FieldSectionWithActions = memo((props) => {
               }
             )
           ] }),
-          /* @__PURE__ */ jsx(
+          !fieldsOnly && /* @__PURE__ */ jsx(
             FieldActions,
             {
               index: sectionIndex,
@@ -11498,7 +11530,8 @@ const findSection = (fields, sectionId) => {
       return [section, i];
   }
 };
-const FieldsEditor = memo(() => {
+const FieldsEditor = memo((props) => {
+  const { fieldsOnly } = props;
   const { values, setFieldValue } = useFormikContext();
   const [dropState, dispatch] = useReducer(reducer, values.fields, initializer);
   const { reorderSection, reorderField } = useFieldReordering();
@@ -11551,8 +11584,16 @@ const FieldsEditor = memo(() => {
       gap: "0",
       children: [
         values.fields.map((field, index2) => /* @__PURE__ */ jsxs(Fragment$1, { children: [
-          /* @__PURE__ */ jsx(FieldSectionWithActions, { field, index: index2, dropState }),
-          /* @__PURE__ */ jsxs(
+          /* @__PURE__ */ jsx(
+            FieldSectionWithActions,
+            {
+              field,
+              index: index2,
+              dropState,
+              fieldsOnly
+            }
+          ),
+          !fieldsOnly && /* @__PURE__ */ jsxs(
             Button,
             {
               className: styles$1.addSectionButton,
@@ -11580,7 +11621,16 @@ const previewSubmit = () => {
 };
 const FormBuilder = memo(
   forwardRef((props, ref) => {
-    const { onCancel, onSave, revision, initialTitle, showExplainerText = true, showSectionsOnly = false } = props;
+    const {
+      onCancel,
+      onSave,
+      revision,
+      initialTitle,
+      showExplainerText = true,
+      showFormTitle = true,
+      fieldsOnly = false,
+      showTabs = true
+    } = props;
     const { showError } = useToast();
     const validate = useCallback(
       (form) => {
@@ -11643,7 +11693,7 @@ const FormBuilder = memo(
     });
     const previewSchema = useMemo(() => formRevisionToSchema(formik.values), [formik.values]);
     return /* @__PURE__ */ jsx(Tabs.Root, { ref, defaultValue: "edit", children: /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: "2", children: [
-      /* @__PURE__ */ jsxs(Tabs.List, { className: styles$7.tabsList, children: [
+      showTabs && /* @__PURE__ */ jsxs(Tabs.List, { className: styles$7.tabsList, children: [
         /* @__PURE__ */ jsx(Tabs.Trigger, { className: styles$7.tabTrigger, value: "edit", children: /* @__PURE__ */ jsxs(Flex, { align: "center", gap: "2", children: [
           /* @__PURE__ */ jsx(Pencil1Icon, {}),
           "Edit"
@@ -11664,7 +11714,7 @@ const FormBuilder = memo(
         ] }),
         /* @__PURE__ */ jsx(Flex, { asChild: true, direction: "column", gap: "2", mt: "3", children: /* @__PURE__ */ jsxs("form", { id: formId, onSubmit: formik.handleSubmit, children: [
           /* @__PURE__ */ jsxs(FormikProvider, { value: formik, children: [
-            !showSectionsOnly && /* @__PURE__ */ jsxs(Fragment, { children: [
+            showFormTitle && /* @__PURE__ */ jsxs(Fragment, { children: [
               /* @__PURE__ */ jsx(
                 PatchField,
                 {
@@ -11710,7 +11760,7 @@ const FormBuilder = memo(
                 }
               )
             ] }),
-            /* @__PURE__ */ jsx(FieldsEditor, {}),
+            /* @__PURE__ */ jsx(FieldsEditor, { fieldsOnly }),
             /* @__PURE__ */ jsx(Text, { severity: "danger", size: "1", children: typeof formik.errors.fields === "string" && formik.errors.fields })
           ] }),
           /* @__PURE__ */ jsxs(Flex, { className: styles$7.floatingButtonContainer, align: "center", justify: "end", gap: "2", children: [
@@ -11719,7 +11769,7 @@ const FormBuilder = memo(
           ] })
         ] }) })
       ] }),
-      /* @__PURE__ */ jsx(Tabs.Content, { value: "preview", children: /* @__PURE__ */ jsx(FormRenderer, { schema: previewSchema, onSubmit: previewSubmit, hideTitle: showSectionsOnly }) })
+      /* @__PURE__ */ jsx(Tabs.Content, { value: "preview", children: /* @__PURE__ */ jsx(FormRenderer, { schema: previewSchema, onSubmit: previewSubmit, hideTitle: !showFormTitle }) })
     ] }) });
   })
 );
@@ -12084,6 +12134,7 @@ export {
   selectLatestFormRevision,
   selectLatestRetryTime,
   selectLatestRevisionByFormId,
+  selectLatestRevisionsForComponentStageForms,
   selectLatestRevisionsForComponentTypeForms,
   selectLatestRevisionsFromComponentTypeIds,
   selectMainWorkspace,