@osdk/maker 0.12.0-beta.8 → 0.12.0-rc.23

package/build/browser/api/defineOntology.js

@@ -17,8 +17,8 @@
 import * as fs from "fs";
 import * as path from "path";
 import invariant from "tiny-invariant";
-import { isExotic } from "./defineObject.js";
-import { convertActionParameterConditionalOverride, convertActionVisibility } from "./ontologyUtils.js";
+import { convertToDisplayName, isExotic } from "./defineObject.js";
+import { convertActionParameterConditionalOverride, convertActionVisibility, convertSectionConditionalOverride, getFormContentOrdering } from "./ontologyUtils.js";
 import { convertNullabilityToDataConstraint, convertType, convertValueType, convertValueTypeDataConstraints, defaultTypeClasses, getPropertyTypeName, hasRenderHints, shouldNotHaveRenderHints } from "./propertyConversionUtils.js";
 import { OntologyEntityTypeEnum } from "./types.js";
 
@@ -176,7 +176,11 @@ function convertToWireImportedTypes(importedTypes) {
       apiName: spt.sharedPropertyType.apiName,
       displayName: spt.sharedPropertyType.displayMetadata.displayName,
       description: spt.sharedPropertyType.displayMetadata.description,
-      type: spt.sharedPropertyType.type
+      type: spt.sharedPropertyType.type,
+      valueType: spt.sharedPropertyType.valueType === undefined ? undefined : {
+        apiName: spt.sharedPropertyType.valueType.apiName,
+        version: spt.sharedPropertyType.valueType.version
+      }
     })),
     objectTypes: Object.values(asBlockData.objectTypes).map(ot => ({
       apiName: ot.objectType.apiName,
@@ -569,7 +573,7 @@ function convertLink(linkType) {
               apiName: linkType.toMany.object.primaryKeyPropertyApiName,
               object: linkType.toMany.object.apiName
             },
-            column: linkType.many.object.primaryKeyPropertyApiName
+            column: linkType.toMany.object.primaryKeyPropertyApiName
           }]
         }
       },
@@ -666,7 +670,10 @@ function convertSpt({
     gothamMapping: gothamMapping,
     indexedForSearch: true,
     typeClasses: typeClasses ?? [],
-    valueType: valueType
+    valueType: valueType === undefined ? undefined : {
+      apiName: valueType.apiName,
+      version: valueType.version
+    }
   };
 }
 function convertObjectStatus(status) {
@@ -704,6 +711,7 @@ function convertAction(action) {
   const actionValidation = convertActionValidation(action);
   const actionParameters = convertActionParameters(action);
   const actionSections = convertActionSections(action);
+  const parameterOrdering = action.parameterOrdering ?? (action.parameters ?? []).map(p => p.id);
   return {
     actionType: {
       actionTypeLogic: {
@@ -716,8 +724,8 @@ function convertAction(action) {
         apiName: action.apiName,
         displayMetadata: {
           configuration: {
-            defaultLayout: "FORM",
-            displayAndFormat: {
+            defaultLayout: action.defaultFormat ?? "FORM",
+            displayAndFormat: action.displayAndFormat ?? {
               table: {
                 columnWidthByParameterRid: {},
                 enableFileImport: true,
@@ -726,7 +734,7 @@ function convertAction(action) {
                 rowHeightInLines: 1
               }
             },
-            enableLayoutUserSwitch: false
+            enableLayoutUserSwitch: action.enableLayoutSwitch ?? false
           },
           description: action.description ?? "",
           displayName: action.displayName,
@@ -737,11 +745,20 @@ function convertAction(action) {
               color: "#000000"
             }
           },
-          successMessage: [],
-          typeClasses: action.typeClasses ?? []
+          successMessage: action.submissionMetadata?.successMessage ? [{
+            type: "message",
+            message: action.submissionMetadata.successMessage
+          }] : [],
+          typeClasses: action.typeClasses ?? [],
+          ...(action.submissionMetadata?.submitButtonDisplayMetadata && {
+            submitButtonDisplayMetadata: action.submissionMetadata.submitButtonDisplayMetadata
+          }),
+          ...(action.submissionMetadata?.undoButtonConfiguration && {
+            undoButtonConfiguration: action.submissionMetadata.undoButtonConfiguration
+          })
         },
-        formContentOrdering: action.formContentOrdering ?? [],
-        parameterOrdering: (action.parameters ?? []).map(p => p.id),
+        parameterOrdering: parameterOrdering,
+        formContentOrdering: getFormContentOrdering(action, parameterOrdering),
         parameters: actionParameters,
         sections: actionSections,
         status: typeof action.status === "string" ? {
@@ -772,16 +789,35 @@ function convertActionValidation(action) {
         defaultValidation: {
           display: {
             renderHint: renderHintFromBaseType(p),
-            visibility: convertActionVisibility(p.validation.defaultVisibility)
+            visibility: convertActionVisibility(p.validation.defaultVisibility),
+            ...(p.defaultValue && {
+              prefill: p.defaultValue
+            })
           },
           validation: {
-            allowedValues: extractAllowedValues(p),
+            allowedValues: extractAllowedValues(p.validation.allowedValues),
             required: convertParameterRequirementConstraint(p.validation.required)
           }
         },
         conditionalOverrides: p.validation.conditionalOverrides?.map(override => convertActionParameterConditionalOverride(override, p.validation)) ?? []
       }];
-    }))
+    })),
+    sectionValidations: {
+      ...Object.fromEntries(Object.entries(action.sections ?? {}).map(([sectionId, section]) => [section.id, {
+        defaultDisplayMetadata: section.defaultVisibility === "hidden" ? {
+          visibility: {
+            type: "hidden",
+            hidden: {}
+          }
+        } : {
+          visibility: {
+            type: "visible",
+            visible: {}
+          }
+        },
+        conditionalOverrides: section.conditionalOverrides?.map(override => convertSectionConditionalOverride(override, section.defaultVisibility ?? "visible")) ?? []
+      }]))
+    }
   };
 }
 function convertActionParameters(action) {
@@ -799,32 +835,41 @@ function convertActionParameters(action) {
   }]));
 }
 function convertActionSections(action) {
-  return Object.fromEntries(Object.entries(action.sections ?? {}).map(([sectionId, parameterIds]) => [sectionId, {
+  return Object.fromEntries(Object.entries(action.sections ?? {}).map(([sectionId, section]) => [sectionId, {
     id: sectionId,
-    content: parameterIds.map(p => ({
+    content: section.parameters.map(p => ({
       type: "parameterId",
       parameterId: p
     })),
     displayMetadata: {
-      collapsedByDefault: false,
-      columnCount: 1,
-      description: "",
-      displayName: sectionId,
-      showTitleBar: true
+      collapsedByDefault: section.collapsedByDefault ?? false,
+      columnCount: section.columnCount ?? 1,
+      description: section.description ?? "",
+      displayName: section.displayName ?? convertToDisplayName(sectionId),
+      showTitleBar: section.showTitleBar ?? true,
+      ...(section.style && {
+        style: section.style === "box" ? {
+          type: "box",
+          box: {}
+        } : {
+          type: "minimal",
+          minimal: {}
+        }
+      })
     }
   }]));
 }
-function extractAllowedValues(parameter) {
-  switch (parameter.validation.allowedValues.type) {
+export function extractAllowedValues(allowedValues) {
+  switch (allowedValues.type) {
     case "oneOf":
       return {
         type: "oneOf",
         oneOf: {
           type: "oneOf",
           oneOf: {
-            labelledValues: parameter.validation.allowedValues.oneOf,
+            labelledValues: allowedValues.oneOf,
             otherValueAllowed: {
-              allowed: false
+              allowed: allowedValues.otherValueAllowed ?? false
             }
           }
         }
@@ -833,7 +878,7 @@ function extractAllowedValues(parameter) {
       const {
         min,
         max
-      } = parameter.validation.allowedValues;
+      } = allowedValues;
       return {
         type: "range",
         range: {
@@ -859,17 +904,17 @@ function extractAllowedValues(parameter) {
         minLength,
         maxLength,
         regex
-      } = parameter.validation.allowedValues;
+      } = allowedValues;
       return {
         type: "text",
         text: {
           type: "text",
           text: {
             ...(minLength === undefined ? {} : {
-              minimumLength: minLength
+              minLength: minLength
             }),
             ...(maxLength === undefined ? {} : {
-              maximumLength: maxLength
+              maxLength: maxLength
             }),
             ...(regex === undefined ? {} : {
               regex: {
@@ -884,7 +929,7 @@ function extractAllowedValues(parameter) {
       const {
         minimum,
         maximum
-      } = parameter.validation.allowedValues;
+      } = allowedValues;
       return {
         type: "datetime",
         datetime: {
@@ -901,7 +946,7 @@ function extractAllowedValues(parameter) {
         objectTypeReference: {
           type: "objectTypeReference",
           objectTypeReference: {
-            interfaceTypeRids: parameter.validation.allowedValues.interfaceTypes
+            interfaceTypeRids: allowedValues.interfaceTypes
           }
         }
       };
@@ -919,7 +964,7 @@ function extractAllowedValues(parameter) {
         }
       };
     default:
-      const k = parameter.validation.allowedValues.type;
+      const k = allowedValues.type;
       return {
         type: k,
         [k]: {
@@ -979,12 +1024,12 @@ function renderHintFromBaseType(parameter) {
       };
     case "marking":
     case "markingList":
-      if (parameter.validation.allowedValues.type === "mandatoryMarking") {
+      if (parameter.validation.allowedValues?.type === "mandatoryMarking") {
         return {
           type: "mandatoryMarkingPicker",
           mandatoryMarkingPicker: {}
         };
-      } else if (parameter.validation.allowedValues.type === "cbacMarking") {
+      } else if (parameter.validation.allowedValues?.type === "cbacMarking") {
         return {
           type: "cbacMarkingPicker",
           cbacMarkingPicker: {}