fix: config editor cleanup - update schemas (#1377)

Esri · Jan 24, 2024 · f531ee5 · f531ee5
1 parent 9e4a44b
commit f531ee5
Show file tree

Hide file tree

Showing 14 changed files with 121 additions and 32 deletions.
diff --git a/packages/common/src/core/schemas/internal/metrics/StatCardUiSchema.ts b/packages/common/src/core/schemas/internal/metrics/StatCardUiSchema.ts
@@ -59,6 +59,7 @@ export const buildUiSchema = (
             scope: "/properties/allowUnitFormatting",
             options: {
               section: "subblock",
+              scale: "m",
               toggleDisplay: "switch",
               scope: "/properties/unit",
             },
@@ -94,6 +95,7 @@ export const buildUiSchema = (
             labelKey: `advancedConfig.label`,
             options: {
               section: "subblock",
+              scale: "m",
             },
             rule: SHOW_FOR_DYNAMIC_RULE,
             elements: [
@@ -163,6 +165,7 @@ export const buildUiSchema = (
             scope: "/properties/allowLink",
             options: {
               section: "subblock",
+              scale: "m",
               toggleDisplay: "switch",
             },
             rule: SHOW_FOR_STATIC_RULE,

diff --git a/packages/common/src/core/schemas/types.ts b/packages/common/src/core/schemas/types.ts
@@ -65,18 +65,18 @@ export enum UiSchemaRuleEffects {
 }
 
 export enum UiSchemaElementTypes {
-  accordionItem = "AccordionItem",
   section = "Section",
-  step = "Step",
   control = "Control",
   layout = "Layout",
   slot = "Slot",
 }
 
 export enum UiSchemaSectionTypes {
   accordion = "accordion",
+  accordionItem = "accordionItem",
   block = "block",
   stepper = "stepper",
+  step = "step",
   subblock = "subblock",
   card = "card",
 }

diff --git a/packages/common/src/groups/_internal/GroupUiSchemaCreateFollowers.ts b/packages/common/src/groups/_internal/GroupUiSchemaCreateFollowers.ts
@@ -21,8 +21,11 @@ export const buildUiSchema = async (
         options: { section: "stepper", scale: "l" },
         elements: [
           {
-            type: "Step",
+            type: "Section",
             labelKey: `${i18nScope}.sections.details.label`,
+            options: {
+              section: "step",
+            },
             elements: [
               {
                 labelKey: `${i18nScope}.fields.name.label`,
@@ -66,8 +69,11 @@ export const buildUiSchema = async (
             ],
           },
           {
-            type: "Step",
+            type: "Section",
             labelKey: `${i18nScope}.sections.membershipAccess.label`,
+            options: {
+              section: "step",
+            },
             rule: {
               effect: UiSchemaRuleEffects.DISABLE,
               condition: {

diff --git a/packages/common/src/initiatives/_internal/InitiativeUiSchemaCreate.ts b/packages/common/src/initiatives/_internal/InitiativeUiSchemaCreate.ts
@@ -26,8 +26,11 @@ export const buildUiSchema = async (
         options: { section: "stepper", scale: "l" },
         elements: [
           {
-            type: "Step",
+            type: "Section",
             labelKey: `${i18nScope}.sections.details.label`,
+            options: {
+              section: "step",
+            },
             elements: [
               {
                 type: "Section",
@@ -101,8 +104,11 @@ export const buildUiSchema = async (
             ],
           },
           {
-            type: "Step",
+            type: "Section",
             labelKey: `${i18nScope}.sections.hero.label`,
+            options: {
+              section: "step",
+            },
             rule: {
               effect: UiSchemaRuleEffects.DISABLE,
               condition: {
@@ -190,8 +196,11 @@ export const buildUiSchema = async (
             ],
           },
           {
-            type: "Step",
+            type: "Section",
             labelKey: `${i18nScope}.sections.sharing.label`,
+            options: {
+              section: "step",
+            },
             rule: {
               effect: UiSchemaRuleEffects.DISABLE,
               condition: {

diff --git a/packages/common/src/projects/_internal/ProjectUiSchemaCreate.ts b/packages/common/src/projects/_internal/ProjectUiSchemaCreate.ts
@@ -25,8 +25,11 @@ export const buildUiSchema = async (
         options: { section: "stepper", scale: "l" },
         elements: [
           {
-            type: "Step",
+            type: "Section",
             labelKey: `${i18nScope}.sections.details.label`,
+            options: {
+              section: "step",
+            },
             elements: [
               {
                 type: "Section",
@@ -90,8 +93,11 @@ export const buildUiSchema = async (
             ],
           },
           {
-            type: "Step",
+            type: "Section",
             labelKey: `${i18nScope}.sections.location.label`,
+            options: {
+              section: "step",
+            },
             rule: {
               effect: UiSchemaRuleEffects.DISABLE,
               condition: {
@@ -132,8 +138,11 @@ export const buildUiSchema = async (
             ],
           },
           {
-            type: "Step",
+            type: "Section",
             labelKey: `${i18nScope}.sections.sharing.label`,
+            options: {
+              section: "step",
+            },
             rule: {
               effect: UiSchemaRuleEffects.DISABLE,
               condition: {

diff --git a/packages/common/src/sites/_internal/SiteUiSchemaCreate.ts b/packages/common/src/sites/_internal/SiteUiSchemaCreate.ts
@@ -28,8 +28,11 @@ export const buildUiSchema = async (
         options: { section: "stepper", scale: "l" },
         elements: [
           {
-            type: "Step",
+            type: "Section",
             labelKey: `${i18nScope}.sections.details.label`,
+            options: {
+              section: "step",
+            },
             elements: [
               {
                 type: "Section",
@@ -82,8 +85,11 @@ export const buildUiSchema = async (
             ],
           },
           {
-            type: "Step",
+            type: "Section",
             labelKey: `${i18nScope}.sections.location.label`,
+            options: {
+              section: "step",
+            },
             rule: {
               effect: UiSchemaRuleEffects.DISABLE,
               condition: {
@@ -124,8 +130,11 @@ export const buildUiSchema = async (
             ],
           },
           {
-            type: "Step",
+            type: "Section",
             labelKey: `${i18nScope}.sections.sharing.label`,
+            options: {
+              section: "step",
+            },
             rule: {
               effect: UiSchemaRuleEffects.DISABLE,
               condition: {

diff --git a/packages/common/test/core/schemas/internal/filterSchemaToUiSchema.test.ts b/packages/common/test/core/schemas/internal/filterSchemaToUiSchema.test.ts
@@ -31,8 +31,7 @@ describe("filterSchemaToUiSchema util:", () => {
           type: "Section",
           labelKey: "section1.label.key",
           options: {
-            section: "stepper",
-            open: true,
+            section: "stepper"
           },
           elements: [
             {

diff --git a/packages/common/test/core/schemas/internal/getUiSchemaProps.test.ts b/packages/common/test/core/schemas/internal/getUiSchemaProps.test.ts
@@ -129,8 +129,11 @@ const SteppedUiSchema: IUiSchema = {
       },
       elements: [
         {
-          type: "Step",
+          type: "Section",
           labelKey: "step1.label.key",
+          options: {
+            section: "step",
+          },
           elements: [
             {
               labelKey: "property1.label.key",
@@ -145,8 +148,11 @@ const SteppedUiSchema: IUiSchema = {
           ],
         },
         {
-          type: "Step",
+          type: "Section",
           labelKey: "step2.label.key",
+          options: {
+            section: "step",
+          },
           elements: [
             {
               labelKey: "property3.label.key",

diff --git a/packages/common/test/core/schemas/internal/metrics/StatCardUiSchema.test.ts b/packages/common/test/core/schemas/internal/metrics/StatCardUiSchema.test.ts
@@ -68,6 +68,7 @@ describe("buildUiSchema: stat", () => {
               scope: "/properties/allowUnitFormatting",
               options: {
                 section: "subblock",
+                scale: "m",
                 toggleDisplay: "switch",
                 scope: "/properties/unit",
               },
@@ -115,6 +116,7 @@ describe("buildUiSchema: stat", () => {
               labelKey: `advancedConfig.label`,
               options: {
                 section: "subblock",
+                scale: "m",
               },
               rule: {
                 condition: {
@@ -196,6 +198,7 @@ describe("buildUiSchema: stat", () => {
               scope: "/properties/allowLink",
               options: {
                 section: "subblock",
+                scale: "m",
                 toggleDisplay: "switch",
               },
               rule: {

diff --git a/packages/common/test/core/schemas/internal/subsetSchema.test.ts b/packages/common/test/core/schemas/internal/subsetSchema.test.ts
@@ -45,8 +45,11 @@ const SteppedUiSchema: IUiSchema = {
       },
       elements: [
         {
-          type: "Step",
+          type: "Section",
           labelKey: "step1.label.key",
+          options: {
+            section: "step",
+          },
           elements: [
             {
               labelKey: "property1.label.key",

diff --git a/packages/common/test/groups/_internal/GroupUiSchemaCreateFollowers.test.ts b/packages/common/test/groups/_internal/GroupUiSchemaCreateFollowers.test.ts
@@ -17,8 +17,11 @@ describe("buildUiSchema: create followers group", () => {
           options: { section: "stepper", scale: "l" },
           elements: [
             {
-              type: "Step",
+              type: "Section",
               labelKey: "some.scope.sections.details.label",
+              options: {
+                section: "step",
+              },
               elements: [
                 {
                   labelKey: "some.scope.fields.name.label",
@@ -62,8 +65,11 @@ describe("buildUiSchema: create followers group", () => {
               ],
             },
             {
-              type: "Step",
+              type: "Section",
               labelKey: "some.scope.sections.membershipAccess.label",
+              options: {
+                section: "step",
+              },
               rule: {
                 effect: UiSchemaRuleEffects.DISABLE,
                 condition: {

diff --git a/packages/common/test/initiatives/_internal/InitiativeUiSchemaCreate.test.ts b/packages/common/test/initiatives/_internal/InitiativeUiSchemaCreate.test.ts
@@ -33,8 +33,11 @@ describe("buildUiSchema: initiative create", () => {
           options: { section: "stepper", scale: "l" },
           elements: [
             {
-              type: "Step",
+              type: "Section",
               labelKey: "some.scope.sections.details.label",
+              options: {
+                section: "step",
+              },
               elements: [
                 {
                   type: "Section",
@@ -108,8 +111,11 @@ describe("buildUiSchema: initiative create", () => {
               ],
             },
             {
-              type: "Step",
+              type: "Section",
               labelKey: "some.scope.sections.hero.label",
+              options: {
+                section: "step",
+              },
               rule: {
                 effect: UiSchemaRuleEffects.DISABLE,
                 condition: {
@@ -187,8 +193,11 @@ describe("buildUiSchema: initiative create", () => {
               ],
             },
             {
-              type: "Step",
+              type: "Section",
               labelKey: "some.scope.sections.sharing.label",
+              options: {
+                section: "step",
+              },
               rule: {
                 effect: UiSchemaRuleEffects.DISABLE,
                 condition: {
@@ -258,8 +267,11 @@ describe("buildUiSchema: initiative create", () => {
           options: { section: "stepper", scale: "l" },
           elements: [
             {
-              type: "Step",
+              type: "Section",
               labelKey: "some.scope.sections.details.label",
+              options: {
+                section: "step",
+              },
               elements: [
                 {
                   type: "Section",
@@ -333,8 +345,11 @@ describe("buildUiSchema: initiative create", () => {
               ],
             },
             {
-              type: "Step",
+              type: "Section",
               labelKey: "some.scope.sections.hero.label",
+              options: {
+                section: "step",
+              },
               rule: {
                 effect: UiSchemaRuleEffects.DISABLE,
                 condition: {
@@ -412,8 +427,11 @@ describe("buildUiSchema: initiative create", () => {
               ],
             },
             {
-              type: "Step",
+              type: "Section",
               labelKey: "some.scope.sections.sharing.label",
+              options: {
+                section: "step",
+              },
               rule: {
                 effect: UiSchemaRuleEffects.DISABLE,
                 condition: {