@forge/manifest 3.4.0-next.6 → 3.4.0-next.9

package/out/schema/manifest.d.ts

@@ -2131,6 +2131,22 @@ export interface Modules {
         }
     )[]
   ];
+  'jira:workflowCondition'?: [
+    {
+      name: string;
+      description: string;
+      expression: string;
+      key: ModuleKeySchema;
+      [k: string]: unknown;
+    },
+    ...{
+      name: string;
+      description: string;
+      expression: string;
+      key: ModuleKeySchema;
+      [k: string]: unknown;
+    }[]
+  ];
   'compass:adminPage'?: [
     (
       | {
@@ -2799,7 +2815,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2814,7 +2830,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2832,7 +2848,7 @@ export interface Modules {
       location?: string;
       cacheable?: boolean;
       supportsNative?: boolean;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2848,7 +2864,7 @@ export interface Modules {
       location?: string;
       cacheable?: boolean;
       supportsNative?: boolean;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2886,7 +2902,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2900,7 +2916,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2915,7 +2931,7 @@ export interface Modules {
       name?: I18NProperty6;
       weight?: number;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2927,7 +2943,7 @@ export interface Modules {
       name?: I18NProperty6;
       weight?: number;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2942,7 +2958,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2956,7 +2972,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3011,7 +3027,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3026,7 +3042,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3106,7 +3122,7 @@ export interface Modules {
         | 'TIME_TRACKING'
         | 'other'
         | 'OTHER';
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       key: ModuleKeySchema;
       [k: string]: unknown;
     },
@@ -3128,7 +3144,7 @@ export interface Modules {
         | 'TIME_TRACKING'
         | 'other'
         | 'OTHER';
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       key: ModuleKeySchema;
       [k: string]: unknown;
     }[]
@@ -3236,7 +3252,7 @@ export interface Modules {
       name?: I18NProperty20;
       weight?: number;
       iconUrl?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       url?: string;
       key: ModuleKeySchema;
       [k: string]: unknown;
@@ -3245,7 +3261,7 @@ export interface Modules {
       name?: I18NProperty20;
       weight?: number;
       iconUrl?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       url?: string;
       key: ModuleKeySchema;
       [k: string]: unknown;
@@ -3348,9 +3364,9 @@ export interface Modules {
       icon?: Icon6;
       tooltip?: I18NProperty29;
       name?: I18NProperty30;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       target?: IssuePageTargetWebPanel;
-      contentPresentConditions?: (SingleCondition | CompositeCondition)[];
+      contentPresentConditions?: (CompositeCondition | SingleCondition)[];
       jiraNativeAppsEnabled?: boolean;
       key: ModuleKeySchema;
       [k: string]: unknown;
@@ -3359,9 +3375,9 @@ export interface Modules {
       icon?: Icon6;
       tooltip?: I18NProperty29;
       name?: I18NProperty30;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       target?: IssuePageTargetWebPanel;
-      contentPresentConditions?: (SingleCondition | CompositeCondition)[];
+      contentPresentConditions?: (CompositeCondition | SingleCondition)[];
       jiraNativeAppsEnabled?: boolean;
       key: ModuleKeySchema;
       [k: string]: unknown;
@@ -3393,7 +3409,7 @@ export interface Modules {
     {
       name?: I18NProperty33;
       weight?: number;
-      conditions?: (CompositeCondition2 | SingleCondition2)[];
+      conditions?: (SingleCondition2 | CompositeCondition2)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3404,7 +3420,7 @@ export interface Modules {
     ...{
       name?: I18NProperty33;
       weight?: number;
-      conditions?: (CompositeCondition2 | SingleCondition2)[];
+      conditions?: (SingleCondition2 | CompositeCondition2)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3485,7 +3501,7 @@ export interface Modules {
     {
       name?: I18NProperty38;
       weight?: number;
-      conditions?: (CompositeCondition4 | SingleCondition3)[];
+      conditions?: (SingleCondition3 | CompositeCondition4)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3496,7 +3512,7 @@ export interface Modules {
     ...{
       name?: I18NProperty38;
       weight?: number;
-      conditions?: (CompositeCondition4 | SingleCondition3)[];
+      conditions?: (SingleCondition3 | CompositeCondition4)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3617,7 +3633,7 @@ export interface Modules {
       expression?: string;
       edit?: URL8;
       evaluationContext?: 'user' | 'USER' | 'app' | 'APP';
-      errorMessage?: JiraExpressionErrorMessage | I18NProperty45;
+      errorMessage?: I18NProperty45 | JiraExpressionErrorMessage;
       name?: I18NProperty46;
       description?: I18NProperty47;
       create?: URL9;
@@ -3629,7 +3645,7 @@ export interface Modules {
       expression?: string;
       edit?: URL8;
       evaluationContext?: 'user' | 'USER' | 'app' | 'APP';
-      errorMessage?: JiraExpressionErrorMessage | I18NProperty45;
+      errorMessage?: I18NProperty45 | JiraExpressionErrorMessage;
       name?: I18NProperty46;
       description?: I18NProperty47;
       create?: URL9;
@@ -3760,7 +3776,7 @@ export interface Modules {
       location?: string;
       cacheable?: boolean;
       supportsNative?: boolean;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3776,7 +3792,7 @@ export interface Modules {
       location?: string;
       cacheable?: boolean;
       supportsNative?: boolean;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3790,7 +3806,7 @@ export interface Modules {
       filter?: string;
       excludeBody?: boolean;
       event?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       propertyKeys?: string[];
       url?: string;
       key: ModuleKeySchema;
@@ -3800,7 +3816,7 @@ export interface Modules {
       filter?: string;
       excludeBody?: boolean;
       event?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       propertyKeys?: string[];
       url?: string;
       key: ModuleKeySchema;
@@ -4212,7 +4228,7 @@ export interface Modules {
       icon?: Icon18;
       name?: I18NProperty91;
       cacheable?: boolean;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -4228,7 +4244,7 @@ export interface Modules {
       icon?: Icon18;
       name?: I18NProperty91;
       cacheable?: boolean;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -4410,37 +4426,6 @@ export interface I18NProperty1 {
   i18n?: string;
   [k: string]: unknown;
 }
-/**
- *
- *
- * Single Conditions are either provided by the host application. See the complete documentation of
- *  [Conditions](../../conditions/) for more information.
- *
- *  To invert a condition, add the attribute ``invert="true"`` to the condition element.
- *  This is useful where you want to show the section if a certain condition is not satisfied.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "condition": "user_is_logged_in",
- *       "invert": false
- *     }
- *
- *
- *
- */
-export interface SingleCondition {
-  condition: string;
-  invert?: boolean;
-  params?: {
-    [k: string]: unknown;
-  };
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -4478,10 +4463,41 @@ export interface SingleCondition {
  *
  */
 export interface CompositeCondition {
-  conditions?: (SingleCondition | ManifestSchema)[];
+  conditions?: (ManifestSchema | SingleCondition)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * Single Conditions are either provided by the host application. See the complete documentation of
+ *  [Conditions](../../conditions/) for more information.
+ *
+ *  To invert a condition, add the attribute ``invert="true"`` to the condition element.
+ *  This is useful where you want to show the section if a certain condition is not satisfied.
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "condition": "user_is_logged_in",
+ *       "invert": false
+ *     }
+ *
+ *
+ *
+ */
+export interface SingleCondition {
+  condition: string;
+  invert?: boolean;
+  params?: {
+    [k: string]: unknown;
+  };
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -4825,10 +4841,74 @@ export interface Icon3 {
  *
  */
 export interface WebItemTarget {
-  options?: DialogOptions | InlineDialogOptions | DialogModuleOptions;
+  options?: InlineDialogOptions | DialogModuleOptions | DialogOptions;
   type?: 'page' | 'PAGE' | 'dialog' | 'DIALOG' | 'inlinedialog' | 'INLINEDIALOG' | 'dialogmodule' | 'DIALOGMODULE';
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * Options for an inline dialog target
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "target": {
+ *         "type": "inlinedialog",
+ *         "options": {
+ *           "onHover": true,
+ *           "offsetX": "30px",
+ *           "offsetY": "20px"
+ *         }
+ *       }
+ *     }
+ *
+ *
+ *
+ */
+export interface InlineDialogOptions {
+  offsetX?: string;
+  offsetY?: string;
+  width?: string;
+  onTop?: boolean;
+  showDelay?: number;
+  closeOthers?: boolean;
+  persistent?: boolean;
+  onHover?: boolean;
+  isRelativeToMouse?: boolean;
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Options for a web-item targeting a common <a href="../dialog/">dialog module</a>.
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "target": {
+ *         "type": "dialogmodule",
+ *         "options": {
+ *           "key": "dialog-module-key"
+ *         }
+ *       }
+ *     }
+ *
+ *
+ *
+ */
+export interface DialogModuleOptions {
+  key: string;
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -4927,70 +5007,6 @@ export interface I18NProperty9 {
   i18n?: string;
   [k: string]: unknown;
 }
-/**
- *
- *
- * Options for an inline dialog target
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "target": {
- *         "type": "inlinedialog",
- *         "options": {
- *           "onHover": true,
- *           "offsetX": "30px",
- *           "offsetY": "20px"
- *         }
- *       }
- *     }
- *
- *
- *
- */
-export interface InlineDialogOptions {
-  offsetX?: string;
-  offsetY?: string;
-  width?: string;
-  onTop?: boolean;
-  showDelay?: number;
-  closeOthers?: boolean;
-  persistent?: boolean;
-  onHover?: boolean;
-  isRelativeToMouse?: boolean;
-  [k: string]: unknown;
-}
-/**
- *
- *
- * Options for a web-item targeting a common <a href="../dialog/">dialog module</a>.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "target": {
- *         "type": "dialogmodule",
- *         "options": {
- *           "key": "dialog-module-key"
- *         }
- *       }
- *     }
- *
- *
- *
- */
-export interface DialogModuleOptions {
-  key: string;
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -5989,6 +6005,37 @@ export interface I18NProperty33 {
   i18n?: string;
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * Single Conditions are either provided by the host application. See the complete documentation of
+ *  [Conditions](../../conditions/) for more information.
+ *
+ *  To invert a condition, add the attribute ``invert="true"`` to the condition element.
+ *  This is useful where you want to show the section if a certain condition is not satisfied.
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "condition": "user_is_logged_in",
+ *       "invert": false
+ *     }
+ *
+ *
+ *
+ */
+export interface SingleCondition2 {
+  condition: string;
+  invert?: boolean;
+  params?: {
+    [k: string]: unknown;
+  };
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -6026,7 +6073,7 @@ export interface I18NProperty33 {
  *
  */
 export interface CompositeCondition2 {
-  conditions?: (CompositeCondition3 | SingleCondition)[];
+  conditions?: (SingleCondition | CompositeCondition3)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
@@ -6067,41 +6114,10 @@ export interface CompositeCondition2 {
  *
  */
 export interface CompositeCondition3 {
-  conditions?: (ManifestSchema | SingleCondition)[];
+  conditions?: (SingleCondition | ManifestSchema)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
-/**
- *
- *
- * Single Conditions are either provided by the host application. See the complete documentation of
- *  [Conditions](../../conditions/) for more information.
- *
- *  To invert a condition, add the attribute ``invert="true"`` to the condition element.
- *  This is useful where you want to show the section if a certain condition is not satisfied.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "condition": "user_is_logged_in",
- *       "invert": false
- *     }
- *
- *
- *
- */
-export interface SingleCondition2 {
-  condition: string;
-  invert?: boolean;
-  params?: {
-    [k: string]: unknown;
-  };
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -6294,6 +6310,37 @@ export interface I18NProperty38 {
   i18n?: string;
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * Single Conditions are either provided by the host application. See the complete documentation of
+ *  [Conditions](../../conditions/) for more information.
+ *
+ *  To invert a condition, add the attribute ``invert="true"`` to the condition element.
+ *  This is useful where you want to show the section if a certain condition is not satisfied.
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "condition": "user_is_logged_in",
+ *       "invert": false
+ *     }
+ *
+ *
+ *
+ */
+export interface SingleCondition3 {
+  condition: string;
+  invert?: boolean;
+  params?: {
+    [k: string]: unknown;
+  };
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -6331,7 +6378,7 @@ export interface I18NProperty38 {
  *
  */
 export interface CompositeCondition4 {
-  conditions?: (CompositeCondition5 | SingleCondition)[];
+  conditions?: (SingleCondition | CompositeCondition5)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
@@ -6372,41 +6419,10 @@ export interface CompositeCondition4 {
  *
  */
 export interface CompositeCondition5 {
-  conditions?: (ManifestSchema | SingleCondition)[];
+  conditions?: (SingleCondition | ManifestSchema)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
-/**
- *
- *
- * Single Conditions are either provided by the host application. See the complete documentation of
- *  [Conditions](../../conditions/) for more information.
- *
- *  To invert a condition, add the attribute ``invert="true"`` to the condition element.
- *  This is useful where you want to show the section if a certain condition is not satisfied.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "condition": "user_is_logged_in",
- *       "invert": false
- *     }
- *
- *
- *
- */
-export interface SingleCondition3 {
-  condition: string;
-  invert?: boolean;
-  params?: {
-    [k: string]: unknown;
-  };
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -6596,18 +6612,6 @@ export interface URL8 {
   url: string;
   [k: string]: unknown;
 }
-/**
- *
- *
- * A Jira expression that will be evaluated if the workflow validator fails.
- *  The string returned by the Jira expression will be displayed as the error message for the failed transition.
- *
- *
- */
-export interface JiraExpressionErrorMessage {
-  expression: string;
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -6632,6 +6636,18 @@ export interface I18NProperty45 {
   i18n?: string;
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * A Jira expression that will be evaluated if the workflow validator fails.
+ *  The string returned by the Jira expression will be displayed as the error message for the failed transition.
+ *
+ *
+ */
+export interface JiraExpressionErrorMessage {
+  expression: string;
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -7155,7 +7171,7 @@ export interface Icon10 {
  *
  */
 export interface WebItemTarget1 {
-  options?: DialogOptions2 | InlineDialogOptions1 | DialogModuleOptions1;
+  options?: DialogOptions2 | DialogModuleOptions1 | InlineDialogOptions1;
   type?: 'page' | 'PAGE' | 'dialog' | 'DIALOG' | 'inlinedialog' | 'INLINEDIALOG' | 'dialogmodule' | 'DIALOGMODULE';
   [k: string]: unknown;
 }
@@ -7260,7 +7276,7 @@ export interface I18NProperty58 {
 /**
  *
  *
- * Options for an inline dialog target
+ * Options for a web-item targeting a common <a href="../dialog/">dialog module</a>.
  *
  *  <h3>Example</h3>
  *
@@ -7270,11 +7286,9 @@ export interface I18NProperty58 {
  *
  *     {
  *       "target": {
- *         "type": "inlinedialog",
+ *         "type": "dialogmodule",
  *         "options": {
- *           "onHover": true,
- *           "offsetX": "30px",
- *           "offsetY": "20px"
+ *           "key": "dialog-module-key"
  *         }
  *       }
  *     }
@@ -7282,22 +7296,14 @@ export interface I18NProperty58 {
  *
  *
  */
-export interface InlineDialogOptions1 {
-  offsetX?: string;
-  offsetY?: string;
-  width?: string;
-  onTop?: boolean;
-  showDelay?: number;
-  closeOthers?: boolean;
-  persistent?: boolean;
-  onHover?: boolean;
-  isRelativeToMouse?: boolean;
+export interface DialogModuleOptions1 {
+  key: string;
   [k: string]: unknown;
 }
 /**
  *
  *
- * Options for a web-item targeting a common <a href="../dialog/">dialog module</a>.
+ * Options for an inline dialog target
  *
  *  <h3>Example</h3>
  *
@@ -7307,9 +7313,11 @@ export interface InlineDialogOptions1 {
  *
  *     {
  *       "target": {
- *         "type": "dialogmodule",
+ *         "type": "inlinedialog",
  *         "options": {
- *           "key": "dialog-module-key"
+ *           "onHover": true,
+ *           "offsetX": "30px",
+ *           "offsetY": "20px"
  *         }
  *       }
  *     }
@@ -7317,8 +7325,16 @@ export interface InlineDialogOptions1 {
  *
  *
  */
-export interface DialogModuleOptions1 {
-  key: string;
+export interface InlineDialogOptions1 {
+  offsetX?: string;
+  offsetY?: string;
+  width?: string;
+  onTop?: boolean;
+  showDelay?: number;
+  closeOthers?: boolean;
+  persistent?: boolean;
+  onHover?: boolean;
+  isRelativeToMouse?: boolean;
   [k: string]: unknown;
 }
 /**
@@ -7839,7 +7855,7 @@ export interface SingleCondition5 {
  *
  */
 export interface CompositeCondition7 {
-  conditions?: (SingleCondition | ManifestSchema)[];
+  conditions?: (ManifestSchema | SingleCondition)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
@@ -9262,7 +9278,7 @@ export interface I18NProperty74 {
  *
  */
 export interface MacroPropertyPanel {
-  controls?: (ControlGroup | ToggleGroup | TextControl | ButtonControl1)[];
+  controls?: (ToggleGroup | ControlGroup | TextControl | ButtonControl1)[];
   cacheable?: boolean;
   url: string;
   [k: string]: unknown;
@@ -9270,7 +9286,7 @@ export interface MacroPropertyPanel {
 /**
  *
  *
- * Defines a ControlGroup which may appear in control extension points such as the property panel
+ * Defines a ToggleGroup which may appear in control extension points such as the property panel
  *
  *  <p><b>Example</b></p>
  *
@@ -9280,21 +9296,24 @@ export interface MacroPropertyPanel {
  *
  *     [
  *       {
- *         "type": "group",
+ *         "type": "togglegroup",
+ *         "macroParameter": "toggleGroupMacroParameter",
  *         "controls": [
  *           {
- *             "type": "button",
+ *             "type": "togglebutton",
+ *             "macroParameterValue": "macroParameterValue 0",
  *             "label": {
  *               "value": "My Custom Control 0"
  *             },
- *             "key": "my-custom-control-0"
+ *             "key": "my-custom-toggle-button-0"
  *           },
  *           {
- *             "type": "button",
+ *             "type": "togglebutton",
+ *             "macroParameterValue": "macroParameterValue 1",
  *             "label": {
  *               "value": "My Custom Control 1"
  *             },
- *             "key": "my-custom-control-1"
+ *             "key": "my-custom-toggle-button-1"
  *           }
  *         ]
  *       }
@@ -9303,15 +9322,16 @@ export interface MacroPropertyPanel {
  *
  *
  */
-export interface ControlGroup {
-  controls: ButtonControl[];
-  type: 'group' | 'GROUP';
+export interface ToggleGroup {
+  controls: ToggleButtonControl[];
+  macroParameter: string;
+  type: 'togglegroup' | 'TOGGLEGROUP';
   [k: string]: unknown;
 }
 /**
  *
  *
- * Defines a button which may appear in control extension points such as the property panel
+ * Defines a toggle button which appears inside a ToggleGroup
  *
  *  <p><b>Example</b></p>
  *
@@ -9320,19 +9340,21 @@ export interface ControlGroup {
  *
  *
  *     {
- *       "type": "button",
+ *       "type": "togglebutton",
+ *       "macroParameterValue": "macroParameterValue 0",
  *       "label": {
  *         "value": "My Custom Control 0"
  *       },
- *       "key": "my-custom-control-0"
+ *       "key": "my-custom-toggle-button-0"
  *     }
  *
  *
  *
  */
-export interface ButtonControl {
+export interface ToggleButtonControl {
+  macroParameterValue: string;
   label: I18NProperty75;
-  type: 'button' | 'BUTTON';
+  type: 'togglebutton' | 'TOGGLEBUTTON';
   key: string;
   [k: string]: unknown;
 }
@@ -9363,7 +9385,7 @@ export interface I18NProperty75 {
 /**
  *
  *
- * Defines a ToggleGroup which may appear in control extension points such as the property panel
+ * Defines a ControlGroup which may appear in control extension points such as the property panel
  *
  *  <p><b>Example</b></p>
  *
@@ -9373,24 +9395,21 @@ export interface I18NProperty75 {
  *
  *     [
  *       {
- *         "type": "togglegroup",
- *         "macroParameter": "toggleGroupMacroParameter",
+ *         "type": "group",
  *         "controls": [
  *           {
- *             "type": "togglebutton",
- *             "macroParameterValue": "macroParameterValue 0",
+ *             "type": "button",
  *             "label": {
  *               "value": "My Custom Control 0"
  *             },
- *             "key": "my-custom-toggle-button-0"
+ *             "key": "my-custom-control-0"
  *           },
  *           {
- *             "type": "togglebutton",
- *             "macroParameterValue": "macroParameterValue 1",
+ *             "type": "button",
  *             "label": {
  *               "value": "My Custom Control 1"
  *             },
- *             "key": "my-custom-toggle-button-1"
+ *             "key": "my-custom-control-1"
  *           }
  *         ]
  *       }
@@ -9399,16 +9418,15 @@ export interface I18NProperty75 {
  *
  *
  */
-export interface ToggleGroup {
-  controls: ToggleButtonControl[];
-  macroParameter: string;
-  type: 'togglegroup' | 'TOGGLEGROUP';
+export interface ControlGroup {
+  controls: ButtonControl[];
+  type: 'group' | 'GROUP';
   [k: string]: unknown;
 }
 /**
  *
  *
- * Defines a toggle button which appears inside a ToggleGroup
+ * Defines a button which may appear in control extension points such as the property panel
  *
  *  <p><b>Example</b></p>
  *
@@ -9417,21 +9435,19 @@ export interface ToggleGroup {
  *
  *
  *     {
- *       "type": "togglebutton",
- *       "macroParameterValue": "macroParameterValue 0",
+ *       "type": "button",
  *       "label": {
  *         "value": "My Custom Control 0"
  *       },
- *       "key": "my-custom-toggle-button-0"
+ *       "key": "my-custom-control-0"
  *     }
  *
  *
  *
  */
-export interface ToggleButtonControl {
-  macroParameterValue: string;
+export interface ButtonControl {
   label: I18NProperty76;
-  type: 'togglebutton' | 'TOGGLEBUTTON';
+  type: 'button' | 'BUTTON';
   key: string;
   [k: string]: unknown;
 }
@@ -30507,7 +30523,7 @@ export interface I18NProperty83 {
  *
  */
 export interface MacroPropertyPanel1 {
-  controls?: (ToggleGroup1 | ButtonControl2 | ControlGroup1 | TextControl1)[];
+  controls?: (TextControl1 | ButtonControl2 | ControlGroup1 | ToggleGroup1)[];
   cacheable?: boolean;
   url: string;
   [k: string]: unknown;
@@ -30515,7 +30531,7 @@ export interface MacroPropertyPanel1 {
 /**
  *
  *
- * Defines a ToggleGroup which may appear in control extension points such as the property panel
+ * Defines a text field which may appear in control extension points such as the property panel
  *
  *  <p><b>Example</b></p>
  *
@@ -30523,44 +30539,27 @@ export interface MacroPropertyPanel1 {
  *
  *
  *
- *     [
- *       {
- *         "type": "togglegroup",
- *         "macroParameter": "toggleGroupMacroParameter",
- *         "controls": [
- *           {
- *             "type": "togglebutton",
- *             "macroParameterValue": "macroParameterValue 0",
- *             "label": {
- *               "value": "My Custom Control 0"
- *             },
- *             "key": "my-custom-toggle-button-0"
- *           },
- *           {
- *             "type": "togglebutton",
- *             "macroParameterValue": "macroParameterValue 1",
- *             "label": {
- *               "value": "My Custom Control 1"
- *             },
- *             "key": "my-custom-toggle-button-1"
- *           }
- *         ]
- *       }
- *     ]
+ *     {
+ *       "type": "button",
+ *       "label": {
+ *         "value": "My Custom Control 0"
+ *       },
+ *       "key": "my-custom-control-0"
+ *     }
  *
  *
  *
  */
-export interface ToggleGroup1 {
-  controls: ToggleButtonControl1[];
+export interface TextControl1 {
   macroParameter: string;
-  type: 'togglegroup' | 'TOGGLEGROUP';
+  type: 'text' | 'TEXT';
+  key: string;
   [k: string]: unknown;
 }
 /**
  *
  *
- * Defines a toggle button which appears inside a ToggleGroup
+ * Defines a button which may appear in control extension points such as the property panel
  *
  *  <p><b>Example</b></p>
  *
@@ -30569,21 +30568,19 @@ export interface ToggleGroup1 {
  *
  *
  *     {
- *       "type": "togglebutton",
- *       "macroParameterValue": "macroParameterValue 0",
+ *       "type": "button",
  *       "label": {
  *         "value": "My Custom Control 0"
  *       },
- *       "key": "my-custom-toggle-button-0"
+ *       "key": "my-custom-control-0"
  *     }
  *
  *
  *
  */
-export interface ToggleButtonControl1 {
-  macroParameterValue: string;
+export interface ButtonControl2 {
   label: I18NProperty84;
-  type: 'togglebutton' | 'TOGGLEBUTTON';
+  type: 'button' | 'BUTTON';
   key: string;
   [k: string]: unknown;
 }
@@ -30611,6 +30608,47 @@ export interface I18NProperty84 {
   i18n?: string;
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * Defines a ControlGroup which may appear in control extension points such as the property panel
+ *
+ *  <p><b>Example</b></p>
+ *
+ *
+ *
+ *
+ *
+ *     [
+ *       {
+ *         "type": "group",
+ *         "controls": [
+ *           {
+ *             "type": "button",
+ *             "label": {
+ *               "value": "My Custom Control 0"
+ *             },
+ *             "key": "my-custom-control-0"
+ *           },
+ *           {
+ *             "type": "button",
+ *             "label": {
+ *               "value": "My Custom Control 1"
+ *             },
+ *             "key": "my-custom-control-1"
+ *           }
+ *         ]
+ *       }
+ *     ]
+ *
+ *
+ *
+ */
+export interface ControlGroup1 {
+  controls: ButtonControl3[];
+  type: 'group' | 'GROUP';
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -30633,7 +30671,7 @@ export interface I18NProperty84 {
  *
  *
  */
-export interface ButtonControl2 {
+export interface ButtonControl3 {
   label: I18NProperty85;
   type: 'button' | 'BUTTON';
   key: string;
@@ -30666,7 +30704,7 @@ export interface I18NProperty85 {
 /**
  *
  *
- * Defines a ControlGroup which may appear in control extension points such as the property panel
+ * Defines a ToggleGroup which may appear in control extension points such as the property panel
  *
  *  <p><b>Example</b></p>
  *
@@ -30676,21 +30714,24 @@ export interface I18NProperty85 {
  *
  *     [
  *       {
- *         "type": "group",
+ *         "type": "togglegroup",
+ *         "macroParameter": "toggleGroupMacroParameter",
  *         "controls": [
  *           {
- *             "type": "button",
+ *             "type": "togglebutton",
+ *             "macroParameterValue": "macroParameterValue 0",
  *             "label": {
  *               "value": "My Custom Control 0"
  *             },
- *             "key": "my-custom-control-0"
+ *             "key": "my-custom-toggle-button-0"
  *           },
  *           {
- *             "type": "button",
+ *             "type": "togglebutton",
+ *             "macroParameterValue": "macroParameterValue 1",
  *             "label": {
  *               "value": "My Custom Control 1"
  *             },
- *             "key": "my-custom-control-1"
+ *             "key": "my-custom-toggle-button-1"
  *           }
  *         ]
  *       }
@@ -30699,15 +30740,16 @@ export interface I18NProperty85 {
  *
  *
  */
-export interface ControlGroup1 {
-  controls: ButtonControl3[];
-  type: 'group' | 'GROUP';
+export interface ToggleGroup1 {
+  controls: ToggleButtonControl1[];
+  macroParameter: string;
+  type: 'togglegroup' | 'TOGGLEGROUP';
   [k: string]: unknown;
 }
 /**
  *
  *
- * Defines a button which may appear in control extension points such as the property panel
+ * Defines a toggle button which appears inside a ToggleGroup
  *
  *  <p><b>Example</b></p>
  *
@@ -30716,19 +30758,21 @@ export interface ControlGroup1 {
  *
  *
  *     {
- *       "type": "button",
+ *       "type": "togglebutton",
+ *       "macroParameterValue": "macroParameterValue 0",
  *       "label": {
  *         "value": "My Custom Control 0"
  *       },
- *       "key": "my-custom-control-0"
+ *       "key": "my-custom-toggle-button-0"
  *     }
  *
  *
  *
  */
-export interface ButtonControl3 {
+export interface ToggleButtonControl1 {
+  macroParameterValue: string;
   label: I18NProperty86;
-  type: 'button' | 'BUTTON';
+  type: 'togglebutton' | 'TOGGLEBUTTON';
   key: string;
   [k: string]: unknown;
 }
@@ -30756,34 +30800,6 @@ export interface I18NProperty86 {
   i18n?: string;
   [k: string]: unknown;
 }
-/**
- *
- *
- * Defines a text field which may appear in control extension points such as the property panel
- *
- *  <p><b>Example</b></p>
- *
- *
- *
- *
- *
- *     {
- *       "type": "button",
- *       "label": {
- *         "value": "My Custom Control 0"
- *       },
- *       "key": "my-custom-control-0"
- *     }
- *
- *
- *
- */
-export interface TextControl1 {
-  macroParameter: string;
-  type: 'text' | 'TEXT';
-  key: string;
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -51633,74 +51649,10 @@ export interface I18NProperty91 {
  *
  */
 export interface WebItemTarget2 {
-  options?: InlineDialogOptions2 | DialogModuleOptions2 | DialogOptions4;
+  options?: DialogOptions4 | InlineDialogOptions2 | DialogModuleOptions2;
   type?: 'page' | 'PAGE' | 'dialog' | 'DIALOG' | 'inlinedialog' | 'INLINEDIALOG' | 'dialogmodule' | 'DIALOGMODULE';
   [k: string]: unknown;
 }
-/**
- *
- *
- * Options for an inline dialog target
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "target": {
- *         "type": "inlinedialog",
- *         "options": {
- *           "onHover": true,
- *           "offsetX": "30px",
- *           "offsetY": "20px"
- *         }
- *       }
- *     }
- *
- *
- *
- */
-export interface InlineDialogOptions2 {
-  offsetX?: string;
-  offsetY?: string;
-  width?: string;
-  onTop?: boolean;
-  showDelay?: number;
-  closeOthers?: boolean;
-  persistent?: boolean;
-  onHover?: boolean;
-  isRelativeToMouse?: boolean;
-  [k: string]: unknown;
-}
-/**
- *
- *
- * Options for a web-item targeting a common <a href="../dialog/">dialog module</a>.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "target": {
- *         "type": "dialogmodule",
- *         "options": {
- *           "key": "dialog-module-key"
- *         }
- *       }
- *     }
- *
- *
- *
- */
-export interface DialogModuleOptions2 {
-  key: string;
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -51799,6 +51751,70 @@ export interface I18NProperty92 {
   i18n?: string;
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * Options for an inline dialog target
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "target": {
+ *         "type": "inlinedialog",
+ *         "options": {
+ *           "onHover": true,
+ *           "offsetX": "30px",
+ *           "offsetY": "20px"
+ *         }
+ *       }
+ *     }
+ *
+ *
+ *
+ */
+export interface InlineDialogOptions2 {
+  offsetX?: string;
+  offsetY?: string;
+  width?: string;
+  onTop?: boolean;
+  showDelay?: number;
+  closeOthers?: boolean;
+  persistent?: boolean;
+  onHover?: boolean;
+  isRelativeToMouse?: boolean;
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Options for a web-item targeting a common <a href="../dialog/">dialog module</a>.
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "target": {
+ *         "type": "dialogmodule",
+ *         "options": {
+ *           "key": "dialog-module-key"
+ *         }
+ *       }
+ *     }
+ *
+ *
+ *
+ */
+export interface DialogModuleOptions2 {
+  key: string;
+  [k: string]: unknown;
+}
 /**
  *
  *