synapse-react-client 4.0.35 → 4.0.37

package/dist/components/SchemaDrivenAnnotationEditor/SchemaDrivenAnnotationEditor.js

@@ -5,7 +5,8 @@ import { useGetSchemaBinding as ne } from "../../synapse-queries/jsonschema/useE
 import { useGetSchema as r } from "../../synapse-queries/jsonschema/useSchema.js";
 import "../../synapse-queries/index.js";
 import { ConfirmationButtons as re, ConfirmationDialog as ie } from "../ConfirmationDialog/ConfirmationDialog.js";
-import { customTranslateString as ae, dropNullValues as i, dropNullishArrayValues as a, getFriendlyPropertyName as oe, getJsonSchemaForForm as o, getPossibleTopLevelPropertiesInObjectSchema as s, getSchemaIdForConcreteType as c, getUiSchemaForForm as l, shouldLiveValidate as u, transformErrors as d } from "./AnnotationEditorUtils.js";
+import { collectTopLevelProperties as ae } from "../../utils/jsonschema/collectTopLevelProperties.js";
+import { customTranslateString as oe, dropNullValues as i, dropNullishArrayValues as a, getFriendlyPropertyName as o, getJsonSchemaForForm as s, getSchemaIdForConcreteType as c, getUiSchemaForForm as l, shouldLiveValidate as u, transformErrors as d } from "./AnnotationEditorUtils.js";
 import { JsonSchemaForm as f } from "../JsonSchemaForm/JsonSchemaForm.js";
 import p from "../../assets/icons/AddToList.js";
 import { SynapseAnnotationsRJSFObjectField as m } from "./field/SynapseAnnotationsRJSFObjectField.js";
@@ -49,7 +50,7 @@ function D(i) {
 	}), J = O || ye, Y = c(U?.concreteType ?? ""), { data: X, isLoading: xe } = r(Y ?? "", {
 		enabled: !!Y,
 		throwOnError: !0
-	}), Z = h(() => s(X ?? {}), [X]), Se = h(() => o(J, X), [J, X]), Ce = h(() => l(Z), [Z]), we = ve || be || xe, { mutate: Te, isPending: Ee } = te({
+	}), Z = h(() => ae(X), [X]), Se = h(() => s(J, X), [J, X]), Ce = h(() => l(Z), [Z]), we = ve || be || xe, { mutate: Te, isPending: Ee } = te({
 		onSuccess: () => {
 			A();
 		},
@@ -64,133 +65,133 @@ function D(i) {
 		});
 	}
 	let $ = k ?? u(W, J), De = U && C(fe(G, (e, t) => Object.keys(U).find((e) => e === t))), Oe = q === null && De;
-	return /* @__PURE__ */ x("div", {
-		className: "JsonSchemaFormContainer",
-		children: we ? /* @__PURE__ */ x("div", {
-			className: "LoadingPlaceholder",
-			children: /* @__PURE__ */ x(n, { size: 30 })
-		}) : /* @__PURE__ */ S(b, { children: [
-			U && q && /* @__PURE__ */ S(_, {
-				severity: "info",
-				sx: { mb: 2 },
+	return /* @__PURE__ */ x(b, { children: we ? /* @__PURE__ */ x(v, {
+		sx: {
+			display: "flex",
+			margin: "60px auto"
+		},
+		children: /* @__PURE__ */ x(n, { size: 30 })
+	}) : /* @__PURE__ */ S(b, { children: [
+		U && q && /* @__PURE__ */ S(_, {
+			severity: "info",
+			sx: { mb: 2 },
+			children: [
+				/* @__PURE__ */ x("b", { children: U.name }),
+				" requires scientific annotations specified by ",
+				/* @__PURE__ */ x("b", { children: q.jsonSchemaVersionInfo.$id }),
+				". ",
+				/* @__PURE__ */ x("b", { children: /* @__PURE__ */ x(me, {
+					href: `${t(e.REPO_ENDPOINT)}/repo/v1/schema/type/registered/${q.jsonSchemaVersionInfo.$id}`,
+					target: "_blank",
+					rel: "noopener noreferrer",
+					children: "View required schema (JSON)"
+				}) })
+			]
+		}),
+		Oe && /* @__PURE__ */ x(_, {
+			severity: "info",
+			children: /* @__PURE__ */ S(v, {
+				sx: {
+					display: "flex",
+					alignItems: "center",
+					gap: .5
+				},
 				children: [
-					/* @__PURE__ */ x("b", { children: U.name }),
-					" requires scientific annotations specified by ",
-					/* @__PURE__ */ x("b", { children: q.jsonSchemaVersionInfo.$id }),
-					". ",
-					/* @__PURE__ */ x("b", { children: /* @__PURE__ */ x(me, {
-						href: `${t(e.REPO_ENDPOINT)}/repo/v1/schema/type/registered/${q.jsonSchemaVersionInfo.$id}`,
-						target: "_blank",
-						rel: "noopener noreferrer",
-						children: "View required schema (JSON)"
-					}) })
+					/* @__PURE__ */ S(y, {
+						variant: "smallText1",
+						children: [
+							/* @__PURE__ */ x("b", { children: U.name }),
+							" has no annotations. Click the",
+							" "
+						]
+					}),
+					/* @__PURE__ */ x(p, {}),
+					/* @__PURE__ */ x(y, {
+						variant: "smallText1",
+						children: "button to annotate."
+					})
 				]
-			}),
-			Oe && /* @__PURE__ */ x(_, {
-				severity: "info",
-				children: /* @__PURE__ */ S(v, {
-					sx: {
-						display: "flex",
-						alignItems: "center",
-						gap: .5
-					},
-					children: [
-						/* @__PURE__ */ S(y, {
-							variant: "smallText1",
-							children: [
-								/* @__PURE__ */ x("b", { children: U.name }),
-								" has no annotations. Click the",
-								" "
-							]
-						}),
-						/* @__PURE__ */ x(p, {}),
-						/* @__PURE__ */ x(y, {
-							variant: "smallText1",
-							children: "button to annotate."
-						})
-					]
-				})
-			}),
-			/* @__PURE__ */ S(f, {
-				validator: T,
-				liveValidate: $,
-				noHtml5Validate: !0,
-				formRef: I,
-				disabled: Ee,
-				translateString: ae,
-				formContext: {
-					showDerivedAnnotationPlaceholder: !0,
-					descriptionVariant: "expand",
-					descriptionFormat: "table",
-					allowFreeSoloEnum: !0
-				},
-				experimental_defaultFormStateBehavior: { emptyObjectFields: "skipDefaults" },
-				fields: { ObjectField: m },
-				templates: {
-					ObjectFieldTemplate: se,
-					WrapIfAdditionalTemplate: ce
-				},
-				widgets: { TextWidget: le },
-				schema: Se,
-				uiSchema: Ce,
-				transformErrors: d,
-				formData: G,
-				onChange: ({ formData: e }) => {
-					N(e), K(e), R(void 0);
-				},
-				onBlur: () => {
-					K(E(G, !1));
-				},
-				onSubmit: ({ formData: e, errors: t }, n) => {
-					n.preventDefault(), t && t.length > 0 && R(t), B(!1), K(e), Q();
-				},
-				onError: (e) => {
-					R(e), (L || $) && a && V(!0);
+			})
+		}),
+		/* @__PURE__ */ S(f, {
+			validator: T,
+			liveValidate: $,
+			noHtml5Validate: !0,
+			formRef: I,
+			disabled: Ee,
+			translateString: oe,
+			formContext: {
+				showDerivedAnnotationPlaceholder: !0,
+				descriptionVariant: "expand",
+				descriptionFormat: "table",
+				allowFreeSoloEnum: !0
+			},
+			experimental_defaultFormStateBehavior: { emptyObjectFields: "skipDefaults" },
+			fields: { ObjectField: m },
+			templates: {
+				ObjectFieldTemplate: se,
+				WrapIfAdditionalTemplate: ce
+			},
+			widgets: { TextWidget: le },
+			schema: Se,
+			uiSchema: Ce,
+			transformErrors: d,
+			formData: G,
+			onChange: ({ formData: e }) => {
+				N(e), K(e), R(void 0);
+			},
+			onBlur: () => {
+				K(E(G, !1));
+			},
+			onSubmit: ({ formData: e, errors: t }, n) => {
+				n.preventDefault(), t && t.length > 0 && R(t), B(!1), K(e), Q();
+			},
+			onError: (e) => {
+				R(e), (L || $) && a && V(!0);
+			},
+			children: [z && ge && /* @__PURE__ */ S(_, {
+				severity: "error",
+				sx: { my: 2 },
+				children: ["Annotations could not be updated: ", z.reason]
+			}), !P && /* @__PURE__ */ S(b, { children: [/* @__PURE__ */ x(pe, { sx: { my: 2 } }), /* @__PURE__ */ x(v, {
+				sx: {
+					display: "flex",
+					justifyContent: "space-between",
+					gridRowStart: 5
 				},
-				children: [z && ge && /* @__PURE__ */ S(_, {
-					severity: "error",
-					sx: { my: 2 },
-					children: ["Annotations could not be updated: ", z.reason]
-				}), !P && /* @__PURE__ */ S(b, { children: [/* @__PURE__ */ x(pe, { sx: { my: 2 } }), /* @__PURE__ */ x(v, {
-					sx: {
-						display: "flex",
-						justifyContent: "space-between",
-						gridRowStart: 5
+				children: /* @__PURE__ */ x(re, {
+					hasCancelButton: j !== void 0,
+					onCancel: () => {
+						j && j();
 					},
-					children: /* @__PURE__ */ x(re, {
-						hasCancelButton: j !== void 0,
-						onCancel: () => {
-							j && j();
-						},
-						onConfirm: () => {
-							I.current.formElement.current.requestSubmit();
-						},
-						confirmButtonProps: { children: a ? "Save" : "Validate" }
-					})
-				})] })]
-			}),
-			_e && /* @__PURE__ */ x(ie, {
-				open: !0,
-				onConfirm: () => {
-					Q(), V(!1);
-				},
-				onCancel: () => {
-					V(!1);
-				},
-				title: "Update Annotations",
-				content: /* @__PURE__ */ S(b, { children: [
-					/* @__PURE__ */ x("div", { children: "The following errors exist with the annotations you entered:" }),
-					/* @__PURE__ */ x("div", { children: /* @__PURE__ */ x("ul", { children: (L ?? []).map((e, t) => /* @__PURE__ */ S("li", { children: [
-						/* @__PURE__ */ x("b", { children: `${oe(e)}: ` }),
-						" ",
-						`${e.message}`
-					] }, t)) }) }),
-					/* @__PURE__ */ x("div", { children: "Are you sure you want to save the invalid annotations?" })
-				] }),
-				confirmButtonProps: { children: "Save" }
-			})
-		] })
-	});
+					onConfirm: () => {
+						I.current.formElement.current.requestSubmit();
+					},
+					confirmButtonProps: { children: a ? "Save" : "Validate" }
+				})
+			})] })]
+		}),
+		_e && /* @__PURE__ */ x(ie, {
+			open: !0,
+			onConfirm: () => {
+				Q(), V(!1);
+			},
+			onCancel: () => {
+				V(!1);
+			},
+			title: "Update Annotations",
+			content: /* @__PURE__ */ S(b, { children: [
+				/* @__PURE__ */ x("div", { children: "The following errors exist with the annotations you entered:" }),
+				/* @__PURE__ */ x("div", { children: /* @__PURE__ */ x("ul", { children: (L ?? []).map((e, t) => /* @__PURE__ */ S("li", { children: [
+					/* @__PURE__ */ x("b", { children: `${o(e)}: ` }),
+					" ",
+					`${e.message}`
+				] }, t)) }) }),
+				/* @__PURE__ */ x("div", { children: "Are you sure you want to save the invalid annotations?" })
+			] }),
+			confirmButtonProps: { children: "Save" }
+		})
+	] }) });
 }
 //#endregion
 export { D as SchemaDrivenAnnotationEditor };

package/dist/components/SchemaDrivenAnnotationEditor/SchemaDrivenAnnotationEditor.js.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaDrivenAnnotationEditor.js","names":[],"sources":["../../../src/components/SchemaDrivenAnnotationEditor/SchemaDrivenAnnotationEditor.tsx"],"sourcesContent":["import AddToList from '@/assets/icons/AddToList'\nimport {\n  useGetJson,\n  useGetSchema,\n  useGetSchemaBinding,\n  useUpdateViaJson,\n} from '@/synapse-queries'\nimport {\n  BackendDestinationEnum,\n  getEndpoint,\n} from '@/utils/functions/getEndpoint'\nimport { Alert, Box, Divider, Link, Typography } from '@mui/material'\nimport RJSF from '@rjsf/core'\nimport { RJSFValidationError } from '@rjsf/utils'\nimport validator from '@rjsf/validator-ajv8'\nimport { SynapseClientError } from '@sage-bionetworks/synapse-client/util/SynapseClientError'\nimport { EntityJson } from '@sage-bionetworks/synapse-types'\nimport { JSONSchema7 } from 'json-schema'\nimport { omitBy } from 'lodash-es'\nimport isEmpty from 'lodash-es/isEmpty'\nimport noop from 'lodash-es/noop'\nimport { RefObject, useEffect, useMemo, useRef, useState } from 'react'\nimport {\n  ConfirmationButtons,\n  ConfirmationDialog,\n} from '../ConfirmationDialog/ConfirmationDialog'\nimport { JsonSchemaForm } from '../JsonSchemaForm/JsonSchemaForm'\nimport { SynapseSpinner } from '../LoadingScreen/LoadingScreen'\nimport {\n  dropNullishArrayValues,\n  dropNullValues,\n  getPossibleTopLevelPropertiesInObjectSchema,\n  getFriendlyPropertyName,\n  getJsonSchemaForForm,\n  getSchemaIdForConcreteType,\n  transformErrors,\n  getUiSchemaForForm,\n  shouldLiveValidate,\n  customTranslateString,\n} from './AnnotationEditorUtils'\nimport SynapseAnnotationsRJSFObjectField from './field/SynapseAnnotationsRJSFObjectField'\nimport { ObjectFieldTemplate } from './template/ObjectFieldTemplate'\nimport SynapseAnnotationsWrapIfAdditionalTemplate from './template/SynapseAnnotationsWrapIfAdditionalTemplate'\nimport TextWidget from './widget/TextWidget'\n\nexport type SchemaDrivenAnnotationEditorProps = {\n  /** The entity whose annotations should be edited with the form */\n  entityId?: string\n  /** If no entity ID is supplied, the schema to use for the form */\n  schemaId?: string\n  /** May be used to directly provide a JSON Schema to use for the form */\n  validationSchema?: JSONSchema7\n  /** Optionally supply a ref to the form to handle submission externally with `formRef.current.submit()`. */\n  formRef?: RefObject<RJSF | null>\n  /** Provide live input validation. This can cause performance degradation. By default, liveValidate will be true if an entity with a schema and existing annotations is being edited */\n  liveValidate?: boolean\n  /** Invoked after a successful form submission */\n  onSuccess?: () => void\n  /** If defined and formRef is not supplied, shows a 'Cancel' button and runs this effect on click */\n  onCancel?: () => void\n  /** Passes new form data upon each change to the form */\n  onChange?: (annotations: Record<string, unknown>) => void\n  /** If true, the editor will not render its own submit UI. */\n  hideActions?: boolean\n}\n\n/**\n * Cleans the formData to remove values that are invalid for Synapse Annotations\n * @param formData\n * @param dropNullishValuesInArrays\n */\nfunction cleanFormData(\n  formData: Record<string, unknown> | undefined,\n  dropNullishValuesInArrays: boolean,\n) {\n  let cleanedFormData = dropNullValues(formData)\n  if (dropNullishValuesInArrays) {\n    cleanedFormData = dropNullishArrayValues(cleanedFormData)\n  }\n  return cleanedFormData\n}\n\n/**\n * Renders a form for editing an entity's annotations. The component also supports supplying just a schema ID,\n * but work to support annotation flows without an entity (i.e. before creating entities) is not yet complete.\n */\nexport function SchemaDrivenAnnotationEditor(\n  props: SchemaDrivenAnnotationEditorProps,\n) {\n  const {\n    entityId,\n    schemaId,\n    validationSchema: validationSchemaFromProps,\n    liveValidate: liveValidateFromProps,\n    onSuccess = () => {\n      /* no-op */\n    },\n    onCancel,\n    formRef: formRefFromParent,\n    onChange = noop,\n    hideActions = false,\n  } = props\n  const localRef = useRef<RJSF>(null)\n  const ref = formRefFromParent ?? localRef\n\n  // Client-side validation errors\n  const [validationError, setValidationError] = useState<\n    RJSFValidationError[] | undefined\n  >(undefined)\n\n  // Errors from the backend response\n  const [submissionError, setSubmissionError] = useState<\n    SynapseClientError | undefined\n  >(undefined)\n  const [showSubmissionError, setShowSubmissionError] = useState(false)\n\n  const [showConfirmation, setShowConfirmation] = useState(false)\n\n  const { data } = useGetJson(\n    entityId!,\n    undefined,\n    // Derived annotations will be precomputed and displayed as placeholders in the form\n    false,\n    {\n      // Metadata is being edited, so don't refetch\n      staleTime: Infinity,\n      enabled: !!entityId,\n      throwOnError: true,\n    },\n  )\n\n  const entityJson = data?.entityMetadata\n  const annotations = data?.annotations\n\n  // Annotation fields fetched and modified via the form\n  const [formData, setFormData] = useState<Record<string, unknown> | undefined>(\n    undefined,\n  )\n\n  // Set initial form data when the entity or its annotations change\n  useEffect(() => {\n    if (data?.entity) {\n      const formData = data.entity\n      const hasAnnotations = annotations && Object.keys(annotations).length > 0\n\n      const newFormData = !hasAnnotations\n        ? { ...formData, newKey: [''] }\n        : formData\n\n      setFormData(newFormData)\n    }\n  }, [data?.entity, annotations])\n\n  const { data: schema, isLoading: isLoadingBinding } = useGetSchemaBinding(\n    entityId!,\n    {\n      enabled: !!entityId,\n      refetchOnWindowFocus: false,\n      throwOnError: true,\n    },\n  )\n\n  // The full schema which is bound to the entity\n  const { data: fetchedValidationSchema, isLoading: isLoadingSchema } =\n    useGetSchema(schemaId ?? schema?.jsonSchemaVersionInfo.$id ?? '', {\n      enabled: !!schemaId || !!schema,\n      throwOnError: true,\n    })\n  const validationSchema = validationSchemaFromProps || fetchedValidationSchema\n\n  const concreteTypeSchemaId = getSchemaIdForConcreteType(\n    entityJson?.concreteType ?? '',\n  )\n  // The schema for the entity type (e.g. FileEntity, TableEntity, etc.)\n  const { data: schemaForEntityType, isLoading: isLoadingEntityTypeSchema } =\n    useGetSchema(concreteTypeSchemaId ?? '', {\n      enabled: !!concreteTypeSchemaId,\n      throwOnError: true,\n    })\n\n  const entitySchemaBaseProperties: JSONSchema7['properties'] = useMemo(\n    () =>\n      getPossibleTopLevelPropertiesInObjectSchema(schemaForEntityType ?? {}),\n    [schemaForEntityType],\n  )\n\n  const formSchema = useMemo(\n    () => getJsonSchemaForForm(validationSchema, schemaForEntityType),\n    [validationSchema, schemaForEntityType],\n  )\n\n  const uiSchema = useMemo(\n    () => getUiSchemaForForm(entitySchemaBaseProperties),\n    [entitySchemaBaseProperties],\n  )\n\n  const isLoading =\n    isLoadingBinding || isLoadingSchema || isLoadingEntityTypeSchema\n\n  const { mutate, isPending: updateIsPending } = useUpdateViaJson({\n    onSuccess: () => {\n      onSuccess()\n    },\n    onError: error => {\n      setSubmissionError(error)\n      setShowSubmissionError(true)\n    },\n  })\n\n  function submitChangedEntity() {\n    mutate({\n      ...cleanFormData(formData, true),\n      ...entityJson,\n    } as EntityJson)\n  }\n\n  const liveValidate =\n    liveValidateFromProps ?? shouldLiveValidate(annotations, validationSchema)\n\n  const formDataHasNoAnnotations =\n    entityJson &&\n    isEmpty(\n      omitBy(formData, (_value, key) =>\n        Object.keys(entityJson).find(k => k === key),\n      ),\n    )\n\n  const showHasNoAnnotationsAlert = schema === null && formDataHasNoAnnotations\n\n  return (\n    <div className=\"JsonSchemaFormContainer\">\n      {isLoading ? (\n        <div className=\"LoadingPlaceholder\">\n          <SynapseSpinner size={30} />\n        </div>\n      ) : (\n        <>\n          {entityJson && schema && (\n            <Alert severity=\"info\" sx={{ mb: 2 }}>\n              <b>{entityJson.name}</b> requires scientific annotations specified\n              by <b>{schema.jsonSchemaVersionInfo.$id}</b>\n              {'. '}\n              <b>\n                <Link\n                  href={`${getEndpoint(\n                    BackendDestinationEnum.REPO_ENDPOINT,\n                  )}/repo/v1/schema/type/registered/${\n                    schema.jsonSchemaVersionInfo.$id\n                  }`}\n                  target=\"_blank\"\n                  rel=\"noopener noreferrer\"\n                >\n                  View required schema (JSON)\n                </Link>\n              </b>\n            </Alert>\n          )}\n          {showHasNoAnnotationsAlert && (\n            <Alert severity=\"info\">\n              <Box\n                sx={{\n                  display: 'flex',\n                  alignItems: 'center',\n                  gap: 0.5,\n                }}\n              >\n                <Typography variant={'smallText1'}>\n                  <b>{entityJson.name}</b> has no annotations. Click the{' '}\n                </Typography>\n                <AddToList />\n                <Typography variant={'smallText1'}>\n                  button to annotate.\n                </Typography>\n              </Box>\n            </Alert>\n          )}\n          <JsonSchemaForm\n            validator={validator}\n            liveValidate={liveValidate}\n            noHtml5Validate={true}\n            formRef={ref}\n            disabled={updateIsPending}\n            translateString={customTranslateString}\n            formContext={{\n              showDerivedAnnotationPlaceholder: true,\n              descriptionVariant: 'expand',\n              descriptionFormat: 'table',\n              allowFreeSoloEnum: true,\n            }}\n            experimental_defaultFormStateBehavior={{\n              emptyObjectFields: 'skipDefaults',\n            }}\n            fields={{\n              ObjectField: SynapseAnnotationsRJSFObjectField,\n            }}\n            templates={{\n              ObjectFieldTemplate: ObjectFieldTemplate,\n              WrapIfAdditionalTemplate:\n                SynapseAnnotationsWrapIfAdditionalTemplate,\n            }}\n            widgets={{\n              TextWidget: TextWidget,\n            }}\n            schema={formSchema}\n            uiSchema={uiSchema}\n            transformErrors={transformErrors}\n            formData={formData}\n            onChange={({ formData }) => {\n              onChange(formData)\n              setFormData(formData)\n              setValidationError(undefined)\n            }}\n            onBlur={() => {\n              setFormData(\n                // Clean the formData onBlur to remove null values that we will need to strip before submission\n                // This will ensure that the user gets accurate validation information since the data will match what the backend will receive\n                cleanFormData(\n                  formData,\n                  // Don't remove null values in arrays--the fields will disappear, which the user probably does not want\n                  false,\n                ),\n              )\n            }}\n            onSubmit={({ formData, errors }, event) => {\n              event.preventDefault()\n              if (errors && errors.length > 0) {\n                setValidationError(errors)\n              }\n              setShowSubmissionError(false)\n              setFormData(formData)\n              submitChangedEntity()\n            }}\n            onError={(errors: RJSFValidationError[]) => {\n              // invoked when submit is clicked and there are client-side validation errors\n              setValidationError(errors)\n              if ((validationError || liveValidate) && entityId) {\n                setShowConfirmation(true)\n              }\n            }}\n          >\n            {submissionError && showSubmissionError && (\n              <Alert severity=\"error\" sx={{ my: 2 }}>\n                Annotations could not be updated: {submissionError.reason}\n              </Alert>\n            )}\n            {!hideActions && (\n              <>\n                <Divider sx={{ my: 2 }} />\n                <Box\n                  sx={{\n                    display: 'flex',\n                    justifyContent: 'space-between',\n                    gridRowStart: 5,\n                  }}\n                >\n                  <ConfirmationButtons\n                    hasCancelButton={onCancel !== undefined}\n                    onCancel={() => {\n                      if (onCancel) {\n                        onCancel()\n                      }\n                    }}\n                    onConfirm={() => {\n                      ref.current!.formElement.current.requestSubmit()\n                    }}\n                    confirmButtonProps={{\n                      children: entityId ? 'Save' : 'Validate',\n                    }}\n                  />\n                </Box>\n              </>\n            )}\n          </JsonSchemaForm>\n          {showConfirmation && (\n            <ConfirmationDialog\n              open={true}\n              onConfirm={() => {\n                submitChangedEntity()\n                setShowConfirmation(false)\n              }}\n              onCancel={() => {\n                setShowConfirmation(false)\n              }}\n              title=\"Update Annotations\"\n              content={\n                <>\n                  <div>\n                    The following errors exist with the annotations you entered:\n                  </div>\n                  <div>\n                    <ul>\n                      {(validationError ?? []).map(\n                        (e: RJSFValidationError, index: number) => (\n                          <li key={index}>\n                            <b>{`${getFriendlyPropertyName(e)}: `}</b>{' '}\n                            {`${e.message}`}\n                          </li>\n                        ),\n                      )}\n                    </ul>\n                  </div>\n                  <div>\n                    Are you sure you want to save the invalid annotations?\n                  </div>\n                </>\n              }\n              confirmButtonProps={{\n                children: 'Save',\n              }}\n            />\n          )}\n        </>\n      )}\n    </div>\n  )\n}\n"],"mappings":"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"}
+{"version":3,"file":"SchemaDrivenAnnotationEditor.js","names":[],"sources":["../../../src/components/SchemaDrivenAnnotationEditor/SchemaDrivenAnnotationEditor.tsx"],"sourcesContent":["import AddToList from '@/assets/icons/AddToList'\nimport {\n  useGetJson,\n  useGetSchema,\n  useGetSchemaBinding,\n  useUpdateViaJson,\n} from '@/synapse-queries'\nimport {\n  BackendDestinationEnum,\n  getEndpoint,\n} from '@/utils/functions/getEndpoint'\nimport { Alert, Box, Divider, Link, Typography } from '@mui/material'\nimport RJSF from '@rjsf/core'\nimport { RJSFValidationError } from '@rjsf/utils'\nimport validator from '@rjsf/validator-ajv8'\nimport { SynapseClientError } from '@sage-bionetworks/synapse-client/util/SynapseClientError'\nimport { EntityJson } from '@sage-bionetworks/synapse-types'\nimport { JSONSchema7 } from 'json-schema'\nimport { omitBy } from 'lodash-es'\nimport isEmpty from 'lodash-es/isEmpty'\nimport noop from 'lodash-es/noop'\nimport { RefObject, useEffect, useMemo, useRef, useState } from 'react'\nimport {\n  ConfirmationButtons,\n  ConfirmationDialog,\n} from '../ConfirmationDialog/ConfirmationDialog'\nimport { JsonSchemaForm } from '../JsonSchemaForm/JsonSchemaForm'\nimport { SynapseSpinner } from '../LoadingScreen/LoadingScreen'\nimport { collectTopLevelProperties } from '@/utils/jsonschema/collectTopLevelProperties'\nimport {\n  dropNullishArrayValues,\n  dropNullValues,\n  getFriendlyPropertyName,\n  getJsonSchemaForForm,\n  getSchemaIdForConcreteType,\n  transformErrors,\n  getUiSchemaForForm,\n  shouldLiveValidate,\n  customTranslateString,\n} from './AnnotationEditorUtils'\nimport SynapseAnnotationsRJSFObjectField from './field/SynapseAnnotationsRJSFObjectField'\nimport { ObjectFieldTemplate } from './template/ObjectFieldTemplate'\nimport SynapseAnnotationsWrapIfAdditionalTemplate from './template/SynapseAnnotationsWrapIfAdditionalTemplate'\nimport TextWidget from './widget/TextWidget'\n\nexport type SchemaDrivenAnnotationEditorProps = {\n  /** The entity whose annotations should be edited with the form */\n  entityId?: string\n  /** If no entity ID is supplied, the schema to use for the form */\n  schemaId?: string\n  /** May be used to directly provide a JSON Schema to use for the form */\n  validationSchema?: JSONSchema7\n  /** Optionally supply a ref to the form to handle submission externally with `formRef.current.submit()`. */\n  formRef?: RefObject<RJSF | null>\n  /** Provide live input validation. This can cause performance degradation. By default, liveValidate will be true if an entity with a schema and existing annotations is being edited */\n  liveValidate?: boolean\n  /** Invoked after a successful form submission */\n  onSuccess?: () => void\n  /** If defined and formRef is not supplied, shows a 'Cancel' button and runs this effect on click */\n  onCancel?: () => void\n  /** Passes new form data upon each change to the form */\n  onChange?: (annotations: Record<string, unknown>) => void\n  /** If true, the editor will not render its own submit UI. */\n  hideActions?: boolean\n}\n\n/**\n * Cleans the formData to remove values that are invalid for Synapse Annotations\n * @param formData\n * @param dropNullishValuesInArrays\n */\nfunction cleanFormData(\n  formData: Record<string, unknown> | undefined,\n  dropNullishValuesInArrays: boolean,\n) {\n  let cleanedFormData = dropNullValues(formData)\n  if (dropNullishValuesInArrays) {\n    cleanedFormData = dropNullishArrayValues(cleanedFormData)\n  }\n  return cleanedFormData\n}\n\n/**\n * Renders a form for editing an entity's annotations. The component also supports supplying just a schema ID,\n * but work to support annotation flows without an entity (i.e. before creating entities) is not yet complete.\n */\nexport function SchemaDrivenAnnotationEditor(\n  props: SchemaDrivenAnnotationEditorProps,\n) {\n  const {\n    entityId,\n    schemaId,\n    validationSchema: validationSchemaFromProps,\n    liveValidate: liveValidateFromProps,\n    onSuccess = () => {\n      /* no-op */\n    },\n    onCancel,\n    formRef: formRefFromParent,\n    onChange = noop,\n    hideActions = false,\n  } = props\n  const localRef = useRef<RJSF>(null)\n  const ref = formRefFromParent ?? localRef\n\n  // Client-side validation errors\n  const [validationError, setValidationError] = useState<\n    RJSFValidationError[] | undefined\n  >(undefined)\n\n  // Errors from the backend response\n  const [submissionError, setSubmissionError] = useState<\n    SynapseClientError | undefined\n  >(undefined)\n  const [showSubmissionError, setShowSubmissionError] = useState(false)\n\n  const [showConfirmation, setShowConfirmation] = useState(false)\n\n  const { data } = useGetJson(\n    entityId!,\n    undefined,\n    // Derived annotations will be precomputed and displayed as placeholders in the form\n    false,\n    {\n      // Metadata is being edited, so don't refetch\n      staleTime: Infinity,\n      enabled: !!entityId,\n      throwOnError: true,\n    },\n  )\n\n  const entityJson = data?.entityMetadata\n  const annotations = data?.annotations\n\n  // Annotation fields fetched and modified via the form\n  const [formData, setFormData] = useState<Record<string, unknown> | undefined>(\n    undefined,\n  )\n\n  // Set initial form data when the entity or its annotations change\n  useEffect(() => {\n    if (data?.entity) {\n      const formData = data.entity\n      const hasAnnotations = annotations && Object.keys(annotations).length > 0\n\n      const newFormData = !hasAnnotations\n        ? { ...formData, newKey: [''] }\n        : formData\n\n      setFormData(newFormData)\n    }\n  }, [data?.entity, annotations])\n\n  const { data: schema, isLoading: isLoadingBinding } = useGetSchemaBinding(\n    entityId!,\n    {\n      enabled: !!entityId,\n      refetchOnWindowFocus: false,\n      throwOnError: true,\n    },\n  )\n\n  // The full schema which is bound to the entity\n  const { data: fetchedValidationSchema, isLoading: isLoadingSchema } =\n    useGetSchema(schemaId ?? schema?.jsonSchemaVersionInfo.$id ?? '', {\n      enabled: !!schemaId || !!schema,\n      throwOnError: true,\n    })\n  const validationSchema = validationSchemaFromProps || fetchedValidationSchema\n\n  const concreteTypeSchemaId = getSchemaIdForConcreteType(\n    entityJson?.concreteType ?? '',\n  )\n  // The schema for the entity type (e.g. FileEntity, TableEntity, etc.)\n  const { data: schemaForEntityType, isLoading: isLoadingEntityTypeSchema } =\n    useGetSchema(concreteTypeSchemaId ?? '', {\n      enabled: !!concreteTypeSchemaId,\n      throwOnError: true,\n    })\n\n  const entitySchemaBaseProperties: JSONSchema7['properties'] = useMemo(\n    () => collectTopLevelProperties(schemaForEntityType),\n    [schemaForEntityType],\n  )\n\n  const formSchema = useMemo(\n    () => getJsonSchemaForForm(validationSchema, schemaForEntityType),\n    [validationSchema, schemaForEntityType],\n  )\n\n  const uiSchema = useMemo(\n    () => getUiSchemaForForm(entitySchemaBaseProperties),\n    [entitySchemaBaseProperties],\n  )\n\n  const isLoading =\n    isLoadingBinding || isLoadingSchema || isLoadingEntityTypeSchema\n\n  const { mutate, isPending: updateIsPending } = useUpdateViaJson({\n    onSuccess: () => {\n      onSuccess()\n    },\n    onError: error => {\n      setSubmissionError(error)\n      setShowSubmissionError(true)\n    },\n  })\n\n  function submitChangedEntity() {\n    mutate({\n      ...cleanFormData(formData, true),\n      ...entityJson,\n    } as EntityJson)\n  }\n\n  const liveValidate =\n    liveValidateFromProps ?? shouldLiveValidate(annotations, validationSchema)\n\n  const formDataHasNoAnnotations =\n    entityJson &&\n    isEmpty(\n      omitBy(formData, (_value, key) =>\n        Object.keys(entityJson).find(k => k === key),\n      ),\n    )\n\n  const showHasNoAnnotationsAlert = schema === null && formDataHasNoAnnotations\n\n  return (\n    <>\n      {isLoading ? (\n        <Box sx={{ display: 'flex', margin: '60px auto' }}>\n          <SynapseSpinner size={30} />\n        </Box>\n      ) : (\n        <>\n          {entityJson && schema && (\n            <Alert severity=\"info\" sx={{ mb: 2 }}>\n              <b>{entityJson.name}</b> requires scientific annotations specified\n              by <b>{schema.jsonSchemaVersionInfo.$id}</b>\n              {'. '}\n              <b>\n                <Link\n                  href={`${getEndpoint(\n                    BackendDestinationEnum.REPO_ENDPOINT,\n                  )}/repo/v1/schema/type/registered/${\n                    schema.jsonSchemaVersionInfo.$id\n                  }`}\n                  target=\"_blank\"\n                  rel=\"noopener noreferrer\"\n                >\n                  View required schema (JSON)\n                </Link>\n              </b>\n            </Alert>\n          )}\n          {showHasNoAnnotationsAlert && (\n            <Alert severity=\"info\">\n              <Box\n                sx={{\n                  display: 'flex',\n                  alignItems: 'center',\n                  gap: 0.5,\n                }}\n              >\n                <Typography variant={'smallText1'}>\n                  <b>{entityJson.name}</b> has no annotations. Click the{' '}\n                </Typography>\n                <AddToList />\n                <Typography variant={'smallText1'}>\n                  button to annotate.\n                </Typography>\n              </Box>\n            </Alert>\n          )}\n          <JsonSchemaForm\n            validator={validator}\n            liveValidate={liveValidate}\n            noHtml5Validate={true}\n            formRef={ref}\n            disabled={updateIsPending}\n            translateString={customTranslateString}\n            formContext={{\n              showDerivedAnnotationPlaceholder: true,\n              descriptionVariant: 'expand',\n              descriptionFormat: 'table',\n              allowFreeSoloEnum: true,\n            }}\n            experimental_defaultFormStateBehavior={{\n              emptyObjectFields: 'skipDefaults',\n            }}\n            fields={{\n              ObjectField: SynapseAnnotationsRJSFObjectField,\n            }}\n            templates={{\n              ObjectFieldTemplate: ObjectFieldTemplate,\n              WrapIfAdditionalTemplate:\n                SynapseAnnotationsWrapIfAdditionalTemplate,\n            }}\n            widgets={{\n              TextWidget: TextWidget,\n            }}\n            schema={formSchema}\n            uiSchema={uiSchema}\n            transformErrors={transformErrors}\n            formData={formData}\n            onChange={({ formData }) => {\n              onChange(formData)\n              setFormData(formData)\n              setValidationError(undefined)\n            }}\n            onBlur={() => {\n              setFormData(\n                // Clean the formData onBlur to remove null values that we will need to strip before submission\n                // This will ensure that the user gets accurate validation information since the data will match what the backend will receive\n                cleanFormData(\n                  formData,\n                  // Don't remove null values in arrays--the fields will disappear, which the user probably does not want\n                  false,\n                ),\n              )\n            }}\n            onSubmit={({ formData, errors }, event) => {\n              event.preventDefault()\n              if (errors && errors.length > 0) {\n                setValidationError(errors)\n              }\n              setShowSubmissionError(false)\n              setFormData(formData)\n              submitChangedEntity()\n            }}\n            onError={(errors: RJSFValidationError[]) => {\n              // invoked when submit is clicked and there are client-side validation errors\n              setValidationError(errors)\n              if ((validationError || liveValidate) && entityId) {\n                setShowConfirmation(true)\n              }\n            }}\n          >\n            {submissionError && showSubmissionError && (\n              <Alert severity=\"error\" sx={{ my: 2 }}>\n                Annotations could not be updated: {submissionError.reason}\n              </Alert>\n            )}\n            {!hideActions && (\n              <>\n                <Divider sx={{ my: 2 }} />\n                <Box\n                  sx={{\n                    display: 'flex',\n                    justifyContent: 'space-between',\n                    gridRowStart: 5,\n                  }}\n                >\n                  <ConfirmationButtons\n                    hasCancelButton={onCancel !== undefined}\n                    onCancel={() => {\n                      if (onCancel) {\n                        onCancel()\n                      }\n                    }}\n                    onConfirm={() => {\n                      ref.current!.formElement.current.requestSubmit()\n                    }}\n                    confirmButtonProps={{\n                      children: entityId ? 'Save' : 'Validate',\n                    }}\n                  />\n                </Box>\n              </>\n            )}\n          </JsonSchemaForm>\n          {showConfirmation && (\n            <ConfirmationDialog\n              open={true}\n              onConfirm={() => {\n                submitChangedEntity()\n                setShowConfirmation(false)\n              }}\n              onCancel={() => {\n                setShowConfirmation(false)\n              }}\n              title=\"Update Annotations\"\n              content={\n                <>\n                  <div>\n                    The following errors exist with the annotations you entered:\n                  </div>\n                  <div>\n                    <ul>\n                      {(validationError ?? []).map(\n                        (e: RJSFValidationError, index: number) => (\n                          <li key={index}>\n                            <b>{`${getFriendlyPropertyName(e)}: `}</b>{' '}\n                            {`${e.message}`}\n                          </li>\n                        ),\n                      )}\n                    </ul>\n                  </div>\n                  <div>\n                    Are you sure you want to save the invalid annotations?\n                  </div>\n                </>\n              }\n              confirmButtonProps={{\n                children: 'Save',\n              }}\n            />\n          )}\n        </>\n      )}\n    </>\n  )\n}\n"],"mappings":"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"}

package/dist/components/SchemaDrivenAnnotationEditor/field/SynapseAnnotationsRJSFObjectField.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SynapseAnnotationsRJSFObjectField.d.ts","sourceRoot":"","sources":["../../../../src/components/SchemaDrivenAnnotationEditor/field/SynapseAnnotationsRJSFObjectField.tsx"],"names":[],"mappings":"AACA,OAAO,EAGL,UAAU,EACV,eAAe,EACf,UAAU,EACV,gBAAgB,EACjB,MAAM,aAAa,CAAA;AAQpB;;GAEG;AACH,wBAAgB,iCAAiC,CAC/C,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACtE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EACvC,CAAC,SAAS,eAAe,GAAG,GAAG,EAC/B,KAAK,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,2CAwD3B;AAED,eAAe,iCAAiC,CAAA"}
+{"version":3,"file":"SynapseAnnotationsRJSFObjectField.d.ts","sourceRoot":"","sources":["../../../../src/components/SchemaDrivenAnnotationEditor/field/SynapseAnnotationsRJSFObjectField.tsx"],"names":[],"mappings":"AACA,OAAO,EAGL,UAAU,EACV,eAAe,EACf,UAAU,EACV,gBAAgB,EACjB,MAAM,aAAa,CAAA;AAMpB;;GAEG;AACH,wBAAgB,iCAAiC,CAC/C,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACtE,CAAC,SAAS,gBAAgB,GAAG,UAAU,EACvC,CAAC,SAAS,eAAe,GAAG,GAAG,EAC/B,KAAK,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,2CAwD3B;AAED,eAAe,iCAAiC,CAAA"}

package/dist/components/SchemaDrivenAnnotationEditor/field/SynapseAnnotationsRJSFObjectField.js

@@ -1,4 +1,5 @@
-import { convertToArray as e, getPossibleTopLevelPropertiesInObjectSchema as t } from "../AnnotationEditorUtils.js";
+import { collectTopLevelProperties as e } from "../../../utils/jsonschema/collectTopLevelProperties.js";
+import { convertToArray as t } from "../AnnotationEditorUtils.js";
 import { useEffect as n } from "react";
 import { jsx as r } from "react/jsx-runtime";
 import { ADDITIONAL_PROPERTY_FLAG as i, deepEquals as a } from "@rjsf/utils";
@@ -7,10 +8,10 @@ import { getDefaultRegistry as o } from "@rjsf/core";
 function s(s) {
 	let { schema: c, formData: l, onChange: u } = s, { fields: { ObjectField: d } } = o();
 	return n(() => {
-		let n = { ...l }, r = t(c);
-		r && (Object.entries(r).forEach(([t, r]) => {
-			let a = n[t];
-			r[i] ? Array.isArray(a) || (n[t] = e(a)) : typeof r == "object" && "type" in r && r.type !== "array" && Array.isArray(a) && (n[t] = a.map((e) => `${e}`).join(", "));
+		let n = { ...l }, r = e(c);
+		r && (Object.entries(r).forEach(([e, r]) => {
+			let a = n[e];
+			r[i] ? Array.isArray(a) || (n[e] = t(a)) : typeof r == "object" && "type" in r && r.type !== "array" && Array.isArray(a) && (n[e] = a.map((e) => `${e}`).join(", "));
 		}), a(l, n) || u(n));
 	}, [
 		c,

package/dist/components/SchemaDrivenAnnotationEditor/field/SynapseAnnotationsRJSFObjectField.js.map

@@ -1 +1 @@
-{"version":3,"file":"SynapseAnnotationsRJSFObjectField.js","names":[],"sources":["../../../../src/components/SchemaDrivenAnnotationEditor/field/SynapseAnnotationsRJSFObjectField.tsx"],"sourcesContent":["import { getDefaultRegistry } from '@rjsf/core'\nimport {\n  ADDITIONAL_PROPERTY_FLAG,\n  deepEquals,\n  FieldProps,\n  FormContextType,\n  RJSFSchema,\n  StrictRJSFSchema,\n} from '@rjsf/utils'\nimport { JSONSchema7Definition } from 'json-schema'\nimport { useEffect } from 'react'\nimport {\n  convertToArray,\n  getPossibleTopLevelPropertiesInObjectSchema,\n} from '../AnnotationEditorUtils'\n\n/**\n * Extends the @rjsf/core `ObjectField` and just adds a custom hook for Synapse annotation business logic\n */\nexport function SynapseAnnotationsRJSFObjectField<\n  T extends Record<string, any> | null | undefined = Record<string, any>,\n  S extends StrictRJSFSchema = RJSFSchema,\n  F extends FormContextType = any,\n>(props: FieldProps<T, S, F>) {\n  const { schema, formData, onChange } = props\n  const {\n    fields: { ObjectField },\n  } = getDefaultRegistry<T, S, F>()\n  /**\n   * For an object, this will\n   * - convert additionalProperties formData to arrays\n   * - convert schema-defined formData from an array to a non-array if the schema type is not an array\n   * @param props\n   */\n  useEffect(() => {\n    const newFormData: Record<string, any> = { ...formData }\n    const allProperties = getPossibleTopLevelPropertiesInObjectSchema(schema)\n    if (allProperties) {\n      Object.entries(allProperties).forEach(([key, propertySchema]) => {\n        // Since the annotations object is flat, we can safely use the property name as the key (no nested properties)\n        const data = newFormData[key]\n        if (\n          (\n            propertySchema as JSONSchema7Definition &\n              Record<typeof ADDITIONAL_PROPERTY_FLAG, any>\n          )[ADDITIONAL_PROPERTY_FLAG]\n        ) {\n          /**\n           * All additional properties should be converted to arrays.\n           *\n           * We need to convert it right away because the order of items is not stable, and seems to depend on if the item is an array or not\n           */\n          if (!Array.isArray(data)) {\n            newFormData[key] = convertToArray(data)\n          }\n        } else {\n          /**\n           * If the schema does not call for an array, but the formData is an array, then this will coerce it to a string.\n           *\n           * This can occur when a formData value is an additionalProperty, which we always treat as an array, then the key\n           * is added to the schema (e.g. conditionally).\n           */\n          if (\n            typeof propertySchema === 'object' &&\n            'type' in propertySchema &&\n            propertySchema.type !== 'array' &&\n            Array.isArray(data)\n          ) {\n            newFormData[key] = data.map(v => `${v}`).join(', ')\n          }\n        }\n      })\n      if (!deepEquals(formData, newFormData)) {\n        onChange(newFormData as T)\n      }\n    }\n  }, [schema, formData, onChange])\n\n  return <ObjectField {...props} />\n}\n\nexport default SynapseAnnotationsRJSFObjectField\n"],"mappings":";;;;;;AAmBA,SAAgB,EAId,GAA4B;CAC5B,IAAM,EAAE,WAAQ,aAAU,gBAAa,GACjC,EACJ,QAAQ,EAAE,qBACR,EAA4B;CAmDhC,OA5CA,QAAgB;EACd,IAAM,IAAmC,EAAE,GAAG,EAAS,GACjD,IAAgB,EAA4C,CAAM;EACxE,AAAI,MACF,OAAO,QAAQ,CAAa,EAAE,SAAS,CAAC,GAAK,OAAoB;GAE/D,IAAM,IAAO,EAAY;GACzB,AAEI,EAEA,KAOG,MAAM,QAAQ,CAAI,MACrB,EAAY,KAAO,EAAe,CAAI,KAUtC,OAAO,KAAmB,YAC1B,UAAU,KACV,EAAe,SAAS,WACxB,MAAM,QAAQ,CAAI,MAElB,EAAY,KAAO,EAAK,KAAI,MAAK,GAAG,GAAG,EAAE,KAAK,IAAI;EAGxD,CAAC,GACI,EAAW,GAAU,CAAW,KACnC,EAAS,CAAgB;CAG/B,GAAG;EAAC;EAAQ;EAAU;CAAQ,CAAC,GAExB,kBAAC,GAAD,EAAa,GAAI,EAAQ,CAAA;AAClC"}
+{"version":3,"file":"SynapseAnnotationsRJSFObjectField.js","names":[],"sources":["../../../../src/components/SchemaDrivenAnnotationEditor/field/SynapseAnnotationsRJSFObjectField.tsx"],"sourcesContent":["import { getDefaultRegistry } from '@rjsf/core'\nimport {\n  ADDITIONAL_PROPERTY_FLAG,\n  deepEquals,\n  FieldProps,\n  FormContextType,\n  RJSFSchema,\n  StrictRJSFSchema,\n} from '@rjsf/utils'\nimport { collectTopLevelProperties } from '@/utils/jsonschema/collectTopLevelProperties'\nimport { JSONSchema7Definition } from 'json-schema'\nimport { useEffect } from 'react'\nimport { convertToArray } from '../AnnotationEditorUtils'\n\n/**\n * Extends the @rjsf/core `ObjectField` and just adds a custom hook for Synapse annotation business logic\n */\nexport function SynapseAnnotationsRJSFObjectField<\n  T extends Record<string, any> | null | undefined = Record<string, any>,\n  S extends StrictRJSFSchema = RJSFSchema,\n  F extends FormContextType = any,\n>(props: FieldProps<T, S, F>) {\n  const { schema, formData, onChange } = props\n  const {\n    fields: { ObjectField },\n  } = getDefaultRegistry<T, S, F>()\n  /**\n   * For an object, this will\n   * - convert additionalProperties formData to arrays\n   * - convert schema-defined formData from an array to a non-array if the schema type is not an array\n   * @param props\n   */\n  useEffect(() => {\n    const newFormData: Record<string, any> = { ...formData }\n    const allProperties = collectTopLevelProperties(schema)\n    if (allProperties) {\n      Object.entries(allProperties).forEach(([key, propertySchema]) => {\n        // Since the annotations object is flat, we can safely use the property name as the key (no nested properties)\n        const data = newFormData[key]\n        if (\n          (\n            propertySchema as JSONSchema7Definition &\n              Record<typeof ADDITIONAL_PROPERTY_FLAG, any>\n          )[ADDITIONAL_PROPERTY_FLAG]\n        ) {\n          /**\n           * All additional properties should be converted to arrays.\n           *\n           * We need to convert it right away because the order of items is not stable, and seems to depend on if the item is an array or not\n           */\n          if (!Array.isArray(data)) {\n            newFormData[key] = convertToArray(data)\n          }\n        } else {\n          /**\n           * If the schema does not call for an array, but the formData is an array, then this will coerce it to a string.\n           *\n           * This can occur when a formData value is an additionalProperty, which we always treat as an array, then the key\n           * is added to the schema (e.g. conditionally).\n           */\n          if (\n            typeof propertySchema === 'object' &&\n            'type' in propertySchema &&\n            propertySchema.type !== 'array' &&\n            Array.isArray(data)\n          ) {\n            newFormData[key] = data.map(v => `${v}`).join(', ')\n          }\n        }\n      })\n      if (!deepEquals(formData, newFormData)) {\n        onChange(newFormData as T)\n      }\n    }\n  }, [schema, formData, onChange])\n\n  return <ObjectField {...props} />\n}\n\nexport default SynapseAnnotationsRJSFObjectField\n"],"mappings":";;;;;;;AAiBA,SAAgB,EAId,GAA4B;CAC5B,IAAM,EAAE,WAAQ,aAAU,gBAAa,GACjC,EACJ,QAAQ,EAAE,qBACR,EAA4B;CAmDhC,OA5CA,QAAgB;EACd,IAAM,IAAmC,EAAE,GAAG,EAAS,GACjD,IAAgB,EAA0B,CAAM;EACtD,AAAI,MACF,OAAO,QAAQ,CAAa,EAAE,SAAS,CAAC,GAAK,OAAoB;GAE/D,IAAM,IAAO,EAAY;GACzB,AAEI,EAEA,KAOG,MAAM,QAAQ,CAAI,MACrB,EAAY,KAAO,EAAe,CAAI,KAUtC,OAAO,KAAmB,YAC1B,UAAU,KACV,EAAe,SAAS,WACxB,MAAM,QAAQ,CAAI,MAElB,EAAY,KAAO,EAAK,KAAI,MAAK,GAAG,GAAG,EAAE,KAAK,IAAI;EAGxD,CAAC,GACI,EAAW,GAAU,CAAW,KACnC,EAAS,CAAgB;CAG/B,GAAG;EAAC;EAAQ;EAAU;CAAQ,CAAC,GAExB,kBAAC,GAAD,EAAa,GAAI,EAAQ,CAAA;AAClC"}

package/dist/components/SearchQueryWrapper/SearchQueryUseQueryOptions.d.ts

@@ -15,6 +15,8 @@ export type SearchQueryConfig = {
      * queried at equal weight.
      */
     fieldBoosts?: Record<string, number>;
+    /** Whether to append `*` to fieldBoosts at neutral weight. Defaults to true. */
+    includeUnlistedFields?: boolean;
     /**
      * Fuzziness override. Overrides the per-strategy default. Leave undefined to
      * use each strategy's natural default (AUTO for MULTI_MATCH/BOOSTED_FUZZY,

package/dist/components/SearchQueryWrapper/SearchQueryUseQueryOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SearchQueryUseQueryOptions.d.ts","sourceRoot":"","sources":["../../../src/components/SearchQueryWrapper/SearchQueryUseQueryOptions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SearchQueryUseQueryOptions.d.ts","sourceRoot":"","sources":["../../../src/components/SearchQueryWrapper/SearchQueryUseQueryOptions.ts"],"names":[],"mappings":"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"}

package/dist/components/SearchQueryWrapper/SearchQueryUseQueryOptions.js

@@ -10,8 +10,13 @@ import { omit as s } from "lodash-es";
 import { FACET_COLUMN_RANGE_REQUEST_CONCRETE_TYPE_VALUE as c, FACET_COLUMN_VALUES_REQUEST_CONCRETE_TYPE_VALUE as l, TEXT_MATCHES_QUERY_FILTER_CONCRETE_TYPE_VALUE as u } from "@sage-bionetworks/synapse-types";
 import d from "dayjs";
 //#region src/components/SearchQueryWrapper/SearchQueryUseQueryOptions.ts
-function f(e) {
-	if (e) return Object.entries(e).map(([e, t]) => t === 1 ? e : `${e}^${t}`);
+function f(e, t) {
+	if (!e) return;
+	let n = t && !("*" in e) ? {
+		...e,
+		"*": 1
+	} : e;
+	return Object.entries(n).map(([e, t]) => t === 1 ? e : `${e}^${t}`);
 }
 function p(e) {
 	return /"[^"]+"/u.test(e);
@@ -20,41 +25,41 @@ function m(e) {
 	return t.test(e);
 }
 function h(e, t = {}) {
-	let { queryStrategy: n = "MULTI_MATCH", fieldBoosts: r, fuzziness: i } = t, a = f(r);
+	let { queryStrategy: n = "MULTI_MATCH", fieldBoosts: r, includeUnlistedFields: i = !0, fuzziness: a } = t, o = f(r, i);
 	if (p(e) || m(e)) return { simple_query_string: {
 		query: e,
-		...a ? { fields: a } : {}
+		...o ? { fields: o } : {}
 	} };
 	switch (n) {
 		case "SIMPLE_QUERY_STRING": return { simple_query_string: {
 			query: e,
-			...a ? { fields: a } : {}
+			...o ? { fields: o } : {}
 		} };
 		case "MULTI_MATCH_BEST_FIELDS": return { multi_match: {
 			query: e,
 			type: "best_fields",
-			...a ? { fields: a } : {},
-			...i ? { fuzziness: i } : {}
+			...o ? { fields: o } : {},
+			...a ? { fuzziness: a } : {}
 		} };
 		case "MULTI_MATCH_CROSS_FIELDS": return { multi_match: {
 			query: e,
 			type: "cross_fields",
-			...a ? { fields: a } : {},
-			...i ? { fuzziness: i } : {}
+			...o ? { fields: o } : {},
+			...a ? { fuzziness: a } : {}
 		} };
 		case "PHRASE_PREFIX": return { multi_match: {
 			query: e,
 			type: "phrase_prefix",
-			...a ? { fields: a } : {}
+			...o ? { fields: o } : {}
 		} };
 		case "BOOSTED_FUZZY": return { multi_match: {
 			query: e,
-			...a ? { fields: a } : {},
-			fuzziness: i ?? "AUTO"
+			...o ? { fields: o } : {},
+			fuzziness: a ?? "AUTO"
 		} };
 		default: return { multi_match: {
 			query: e,
-			fuzziness: i ?? "AUTO"
+			fuzziness: a ?? "AUTO"
 		} };
 	}
 }