@forge/manifest 2.5.1-next.3 → 2.6.0-next.12

package/out/schema/manifest.d.ts

@@ -607,6 +607,48 @@ export interface Modules {
         }
     )[]
   ];
+  'confluence:globalPage'?: [
+    (
+      | {
+          title: string;
+          icon?: string;
+          route: string;
+          function: string;
+          key: ModuleKeySchema;
+        }
+      | {
+          title: string;
+          icon?: string;
+          route: string;
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          key: ModuleKeySchema;
+        }
+    ),
+    ...(
+      | {
+          title: string;
+          icon?: string;
+          route: string;
+          function: string;
+          key: ModuleKeySchema;
+        }
+      | {
+          title: string;
+          icon?: string;
+          route: string;
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          key: ModuleKeySchema;
+        }
+    )[]
+  ];
   'jira:workflowValidator'?: [
     {
       name: string;
@@ -652,6 +694,10 @@ export interface Modules {
                 resource: string;
                 [k: string]: unknown;
               };
+          value?: {
+            function: string;
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -685,6 +731,10 @@ export interface Modules {
                 resource: string;
                 [k: string]: unknown;
               };
+          value?: {
+            function: string;
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -717,6 +767,10 @@ export interface Modules {
                 resource: string;
                 [k: string]: unknown;
               };
+          value?: {
+            function: string;
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -750,6 +804,10 @@ export interface Modules {
                 resource: string;
                 [k: string]: unknown;
               };
+          value?: {
+            function: string;
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -781,6 +839,10 @@ export interface Modules {
                 resource: string;
                 [k: string]: unknown;
               };
+          value?: {
+            function: string;
+            [k: string]: unknown;
+          };
           icon?: string;
           resolver?: {
             function: string;
@@ -826,6 +888,10 @@ export interface Modules {
                 resource: string;
                 [k: string]: unknown;
               };
+          value?: {
+            function: string;
+            [k: string]: unknown;
+          };
           icon?: string;
           resolver?: {
             function: string;
@@ -870,6 +936,10 @@ export interface Modules {
                 resource: string;
                 [k: string]: unknown;
               };
+          value?: {
+            function: string;
+            [k: string]: unknown;
+          };
           icon?: string;
           resolver?: {
             function: string;
@@ -915,6 +985,10 @@ export interface Modules {
                 resource: string;
                 [k: string]: unknown;
               };
+          value?: {
+            function: string;
+            [k: string]: unknown;
+          };
           icon?: string;
           resolver?: {
             function: string;
@@ -978,76 +1052,82 @@ export interface Modules {
   'jira:issueGlance'?: [
     (
       | {
+          function: string;
           title: string;
           label: string;
           status?: {
+            type: 'badge' | 'icon' | 'lozenge';
             value: {
               label: string;
+              url?: string;
               type?: 'default' | 'inprogress' | 'moved' | 'new' | 'removed' | 'success';
               [k: string]: unknown;
             };
-            type: 'badge' | 'lozenge';
             [k: string]: unknown;
           };
-          function: string;
+          icon?: string;
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
       | {
+          resource: string;
+          resolver?: {
+            function: string;
+          };
           title: string;
           label: string;
           status?: {
+            type: 'badge' | 'icon' | 'lozenge';
             value: {
               label: string;
+              url?: string;
               type?: 'default' | 'inprogress' | 'moved' | 'new' | 'removed' | 'success';
               [k: string]: unknown;
             };
-            type: 'badge' | 'lozenge';
             [k: string]: unknown;
           };
-          resolver?: {
-            function: string;
-          };
-          resource: string;
-          resourceUploadId?: string;
+          icon?: string;
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
     ),
     ...(
       | {
+          function: string;
           title: string;
           label: string;
           status?: {
+            type: 'badge' | 'icon' | 'lozenge';
             value: {
               label: string;
+              url?: string;
               type?: 'default' | 'inprogress' | 'moved' | 'new' | 'removed' | 'success';
               [k: string]: unknown;
             };
-            type: 'badge' | 'lozenge';
             [k: string]: unknown;
           };
-          function: string;
+          icon?: string;
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
       | {
+          resource: string;
+          resolver?: {
+            function: string;
+          };
           title: string;
           label: string;
           status?: {
+            type: 'badge' | 'icon' | 'lozenge';
             value: {
               label: string;
+              url?: string;
               type?: 'default' | 'inprogress' | 'moved' | 'new' | 'removed' | 'success';
               [k: string]: unknown;
             };
-            type: 'badge' | 'lozenge';
             [k: string]: unknown;
           };
-          resolver?: {
-            function: string;
-          };
-          resource: string;
-          resourceUploadId?: string;
+          icon?: string;
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -1547,7 +1627,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1562,7 +1642,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1580,7 +1660,7 @@ export interface Modules {
       location?: string;
       cacheable?: boolean;
       supportsNative?: boolean;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1596,7 +1676,7 @@ export interface Modules {
       location?: string;
       cacheable?: boolean;
       supportsNative?: boolean;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1610,7 +1690,7 @@ export interface Modules {
       filter?: string;
       excludeBody?: boolean;
       event?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       propertyKeys?: string[];
       url?: string;
       key: ModuleKeySchema;
@@ -1620,7 +1700,7 @@ export interface Modules {
       filter?: string;
       excludeBody?: boolean;
       event?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       propertyKeys?: string[];
       url?: string;
       key: ModuleKeySchema;
@@ -1634,7 +1714,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1648,7 +1728,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1690,7 +1770,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1704,7 +1784,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1728,7 +1808,7 @@ export interface Modules {
       name?: I18NProperty10;
       location?: string;
       cacheable?: boolean;
-      conditions?: (CompositeCondition1 | SingleCondition1)[];
+      conditions?: (SingleCondition1 | CompositeCondition1)[];
       key: ModuleKeySchema;
       [k: string]: unknown;
     },
@@ -1746,7 +1826,7 @@ export interface Modules {
       name?: I18NProperty10;
       location?: string;
       cacheable?: boolean;
-      conditions?: (CompositeCondition1 | SingleCondition1)[];
+      conditions?: (SingleCondition1 | CompositeCondition1)[];
       key: ModuleKeySchema;
       [k: string]: unknown;
     }[]
@@ -1759,7 +1839,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1774,7 +1854,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1854,7 +1934,7 @@ export interface Modules {
         | 'TIME_TRACKING'
         | 'other'
         | 'OTHER';
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       key: ModuleKeySchema;
       [k: string]: unknown;
     },
@@ -1876,7 +1956,7 @@ export interface Modules {
         | 'TIME_TRACKING'
         | 'other'
         | 'OTHER';
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       key: ModuleKeySchema;
       [k: string]: unknown;
     }[]
@@ -2073,7 +2153,7 @@ export interface Modules {
     {
       icon?: Icon5;
       name?: I18NProperty27;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       content?: IssueGlanceContentLabel;
       target?: IssueGlanceTargetWebPanel;
       jiraNativeAppsEnabled?: boolean;
@@ -2083,7 +2163,7 @@ export interface Modules {
     ...{
       icon?: Icon5;
       name?: I18NProperty27;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       content?: IssueGlanceContentLabel;
       target?: IssueGlanceTargetWebPanel;
       jiraNativeAppsEnabled?: boolean;
@@ -2098,7 +2178,7 @@ export interface Modules {
       name?: I18NProperty30;
       conditions?: (SingleCondition | CompositeCondition)[];
       target?: IssuePageTargetWebPanel;
-      contentPresentConditions?: (SingleCondition | CompositeCondition)[];
+      contentPresentConditions?: (CompositeCondition | SingleCondition)[];
       jiraNativeAppsEnabled?: boolean;
       key: ModuleKeySchema;
       [k: string]: unknown;
@@ -2109,7 +2189,7 @@ export interface Modules {
       name?: I18NProperty30;
       conditions?: (SingleCondition | CompositeCondition)[];
       target?: IssuePageTargetWebPanel;
-      contentPresentConditions?: (SingleCondition | CompositeCondition)[];
+      contentPresentConditions?: (CompositeCondition | SingleCondition)[];
       jiraNativeAppsEnabled?: boolean;
       key: ModuleKeySchema;
       [k: string]: unknown;
@@ -2141,7 +2221,7 @@ export interface Modules {
     {
       name?: I18NProperty33;
       weight?: number;
-      conditions?: (CompositeCondition2 | SingleCondition2)[];
+      conditions?: (SingleCondition2 | CompositeCondition2)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2152,7 +2232,7 @@ export interface Modules {
     ...{
       name?: I18NProperty33;
       weight?: number;
-      conditions?: (CompositeCondition2 | SingleCondition2)[];
+      conditions?: (SingleCondition2 | CompositeCondition2)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2233,7 +2313,7 @@ export interface Modules {
     {
       name?: I18NProperty38;
       weight?: number;
-      conditions?: (CompositeCondition4 | SingleCondition3)[];
+      conditions?: (SingleCondition3 | CompositeCondition4)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2244,7 +2324,7 @@ export interface Modules {
     ...{
       name?: I18NProperty38;
       weight?: number;
-      conditions?: (CompositeCondition4 | SingleCondition3)[];
+      conditions?: (SingleCondition3 | CompositeCondition4)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2417,6 +2497,7 @@ export interface Modules {
     {
       installed?: string;
       disabled?: string;
+      'dare-migration'?: string;
       uninstalled?: string;
       enabled?: string;
       key: ModuleKeySchema;
@@ -2425,6 +2506,7 @@ export interface Modules {
     ...{
       installed?: string;
       disabled?: string;
+      'dare-migration'?: string;
       uninstalled?: string;
       enabled?: string;
       key: ModuleKeySchema;
@@ -2473,7 +2555,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2488,7 +2570,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2654,7 +2736,7 @@ export interface Modules {
       name?: I18NProperty59;
       location?: string;
       cacheable?: boolean;
-      conditions?: (SingleCondition4 | CompositeCondition6)[];
+      conditions?: (CompositeCondition6 | SingleCondition4)[];
       key: ModuleKeySchema;
       [k: string]: unknown;
     },
@@ -2672,7 +2754,7 @@ export interface Modules {
       name?: I18NProperty59;
       location?: string;
       cacheable?: boolean;
-      conditions?: (SingleCondition4 | CompositeCondition6)[];
+      conditions?: (CompositeCondition6 | SingleCondition4)[];
       key: ModuleKeySchema;
       [k: string]: unknown;
     }[]
@@ -2685,7 +2767,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2700,7 +2782,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3156,37 +3238,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;
-}
 /**
  *
  *
@@ -3224,10 +3275,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;
+}
 /**
  *
  *
@@ -3571,7 +3653,7 @@ export interface Icon3 {
  *
  */
 export interface WebItemTarget {
-  options?: DialogOptions | InlineDialogOptions | DialogModuleOptions;
+  options?: DialogOptions | DialogModuleOptions | InlineDialogOptions;
   type?: 'page' | 'PAGE' | 'dialog' | 'DIALOG' | 'inlinedialog' | 'INLINEDIALOG' | 'dialogmodule' | 'DIALOGMODULE';
   [k: string]: unknown;
 }
@@ -3673,6 +3755,33 @@ export interface I18NProperty9 {
   i18n?: string;
   [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;
+}
 /**
  *
  *
@@ -3713,7 +3822,8 @@ export interface InlineDialogOptions {
 /**
  *
  *
- * Options for a web-item targeting a common <a href="../dialog/">dialog module</a>.
+ * Represents a string that can be resolved via a localization properties file. You can use the same `i18n Property` key
+ *  and value in multiple places if you like, but identical keys must have identical values.
  *
  *  <h3>Example</h3>
  *
@@ -3722,26 +3832,25 @@ export interface InlineDialogOptions {
  *
  *
  *     {
- *       "target": {
- *         "type": "dialogmodule",
- *         "options": {
- *           "key": "dialog-module-key"
- *         }
- *       }
+ *       "value": "My text"
  *     }
  *
  *
  *
  */
-export interface DialogModuleOptions {
-  key: string;
+export interface I18NProperty10 {
+  value: string;
+  i18n?: string;
   [k: string]: unknown;
 }
 /**
  *
  *
- * Represents a string that can be resolved via a localization properties file. You can use the same `i18n Property` key
- *  and value in multiple places if you like, but identical keys must have identical values.
+ * 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>
  *
@@ -3750,15 +3859,19 @@ export interface DialogModuleOptions {
  *
  *
  *     {
- *       "value": "My text"
+ *       "condition": "user_is_logged_in",
+ *       "invert": false
  *     }
  *
  *
  *
  */
-export interface I18NProperty10 {
-  value: string;
-  i18n?: string;
+export interface SingleCondition1 {
+  condition: string;
+  invert?: boolean;
+  params?: {
+    [k: string]: unknown;
+  };
   [k: string]: unknown;
 }
 /**
@@ -3802,37 +3915,6 @@ export interface CompositeCondition1 {
   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 SingleCondition1 {
-  condition: string;
-  invert?: boolean;
-  params?: {
-    [k: string]: unknown;
-  };
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -4735,6 +4817,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;
+}
 /**
  *
  *
@@ -4772,7 +4885,7 @@ export interface I18NProperty33 {
  *
  */
 export interface CompositeCondition2 {
-  conditions?: (SingleCondition | CompositeCondition3)[];
+  conditions?: (CompositeCondition3 | SingleCondition)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
@@ -4817,37 +4930,6 @@ export interface CompositeCondition3 {
   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;
-}
 /**
  *
  *
@@ -5040,6 +5122,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;
+}
 /**
  *
  *
@@ -5077,7 +5190,7 @@ export interface I18NProperty38 {
  *
  */
 export interface CompositeCondition4 {
-  conditions?: (SingleCondition | CompositeCondition5)[];
+  conditions?: (CompositeCondition5 | SingleCondition)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
@@ -5122,37 +5235,6 @@ export interface CompositeCondition5 {
   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;
-}
 /**
  *
  *
@@ -5901,14 +5983,14 @@ export interface Icon10 {
  *
  */
 export interface WebItemTarget1 {
-  options?: InlineDialogOptions1 | DialogOptions2 | DialogModuleOptions1;
+  options?: DialogModuleOptions1 | DialogOptions2 | InlineDialogOptions1;
   type?: 'page' | 'PAGE' | 'dialog' | 'DIALOG' | 'inlinedialog' | 'INLINEDIALOG' | 'dialogmodule' | 'DIALOGMODULE';
   [k: string]: unknown;
 }
 /**
  *
  *
- * Options for an inline dialog target
+ * Options for a web-item targeting a common <a href="../dialog/">dialog module</a>.
  *
  *  <h3>Example</h3>
  *
@@ -5918,11 +6000,9 @@ export interface WebItemTarget1 {
  *
  *     {
  *       "target": {
- *         "type": "inlinedialog",
+ *         "type": "dialogmodule",
  *         "options": {
- *           "onHover": true,
- *           "offsetX": "30px",
- *           "offsetY": "20px"
+ *           "key": "dialog-module-key"
  *         }
  *       }
  *     }
@@ -5930,16 +6010,8 @@ export interface WebItemTarget1 {
  *
  *
  */
-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;
 }
 /**
@@ -6043,7 +6115,7 @@ export interface I18NProperty58 {
 /**
  *
  *
- * Options for a web-item targeting a common <a href="../dialog/">dialog module</a>.
+ * Options for an inline dialog target
  *
  *  <h3>Example</h3>
  *
@@ -6053,9 +6125,11 @@ export interface I18NProperty58 {
  *
  *     {
  *       "target": {
- *         "type": "dialogmodule",
+ *         "type": "inlinedialog",
  *         "options": {
- *           "key": "dialog-module-key"
+ *           "onHover": true,
+ *           "offsetX": "30px",
+ *           "offsetY": "20px"
  *         }
  *       }
  *     }
@@ -6063,42 +6137,23 @@ export interface I18NProperty58 {
  *
  *
  */
-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;
 }
 /**
  *
  *
  * Represents a string that can be resolved via a localization properties file. You can use the same `i18n Property` key
- *  and value in multiple places if you like, but identical keys must have identical values.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "value": "My text"
- *     }
- *
- *
- *
- */
-export interface I18NProperty59 {
-  value: string;
-  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.
+ *  and value in multiple places if you like, but identical keys must have identical values.
  *
  *  <h3>Example</h3>
  *
@@ -6107,19 +6162,15 @@ export interface I18NProperty59 {
  *
  *
  *     {
- *       "condition": "user_is_logged_in",
- *       "invert": false
+ *       "value": "My text"
  *     }
  *
  *
  *
  */
-export interface SingleCondition4 {
-  condition: string;
-  invert?: boolean;
-  params?: {
-    [k: string]: unknown;
-  };
+export interface I18NProperty59 {
+  value: string;
+  i18n?: string;
   [k: string]: unknown;
 }
 /**
@@ -6163,6 +6214,37 @@ export interface CompositeCondition6 {
   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 SingleCondition4 {
+  condition: string;
+  invert?: boolean;
+  params?: {
+    [k: string]: unknown;
+  };
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -6585,7 +6667,7 @@ export interface SingleCondition5 {
  *
  */
 export interface CompositeCondition7 {
-  conditions?: (SingleCondition | ManifestSchema)[];
+  conditions?: (ManifestSchema | SingleCondition)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
@@ -8008,7 +8090,7 @@ export interface I18NProperty74 {
  *
  */
 export interface MacroPropertyPanel {
-  controls?: (ButtonControl | ControlGroup | ToggleGroup | TextControl)[];
+  controls?: (ButtonControl | ControlGroup | TextControl | ToggleGroup)[];
   cacheable?: boolean;
   url: string;
   [k: string]: unknown;
@@ -8158,6 +8240,34 @@ export interface I18NProperty76 {
   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 TextControl {
+  macroParameter: string;
+  type: 'text' | 'TEXT';
+  key: string;
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -8257,34 +8367,6 @@ export interface I18NProperty77 {
   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 TextControl {
-  macroParameter: string;
-  type: 'text' | 'TEXT';
-  key: string;
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -29253,7 +29335,7 @@ export interface I18NProperty83 {
  *
  */
 export interface MacroPropertyPanel1 {
-  controls?: (ControlGroup1 | TextControl1 | ToggleGroup1 | ButtonControl3)[];
+  controls?: (TextControl1 | ButtonControl2 | ControlGroup1 | ToggleGroup1)[];
   cacheable?: boolean;
   url: string;
   [k: string]: unknown;
@@ -29261,7 +29343,7 @@ export interface MacroPropertyPanel1 {
 /**
  *
  *
- * Defines a ControlGroup 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>
  *
@@ -29269,34 +29351,21 @@ export interface MacroPropertyPanel1 {
  *
  *
  *
- *     [
- *       {
- *         "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"
- *           }
- *         ]
- *       }
- *     ]
+ *     {
+ *       "type": "button",
+ *       "label": {
+ *         "value": "My Custom Control 0"
+ *       },
+ *       "key": "my-custom-control-0"
+ *     }
  *
  *
  *
  */
-export interface ControlGroup1 {
-  controls: ButtonControl2[];
-  type: 'group' | 'GROUP';
+export interface TextControl1 {
+  macroParameter: string;
+  type: 'text' | 'TEXT';
+  key: string;
   [k: string]: unknown;
 }
 /**
@@ -29354,35 +29423,7 @@ export interface I18NProperty84 {
 /**
  *
  *
- * 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;
-}
-/**
- *
- *
- * 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>
  *
@@ -29392,24 +29433,21 @@ export interface TextControl1 {
  *
  *     [
  *       {
- *         "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"
  *           }
  *         ]
  *       }
@@ -29418,16 +29456,15 @@ export interface TextControl1 {
  *
  *
  */
-export interface ToggleGroup1 {
-  controls: ToggleButtonControl1[];
-  macroParameter: string;
-  type: 'togglegroup' | 'TOGGLEGROUP';
+export interface ControlGroup1 {
+  controls: ButtonControl3[];
+  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>
  *
@@ -29436,21 +29473,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 ButtonControl3 {
   label: I18NProperty85;
-  type: 'togglebutton' | 'TOGGLEBUTTON';
+  type: 'button' | 'BUTTON';
   key: string;
   [k: string]: unknown;
 }
@@ -29481,7 +29516,52 @@ export interface I18NProperty85 {
 /**
  *
  *
- * Defines a button 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>
+ *
+ *
+ *
+ *
+ *
+ *     [
+ *       {
+ *         "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"
+ *           }
+ *         ]
+ *       }
+ *     ]
+ *
+ *
+ *
+ */
+export interface ToggleGroup1 {
+  controls: ToggleButtonControl1[];
+  macroParameter: string;
+  type: 'togglegroup' | 'TOGGLEGROUP';
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Defines a toggle button which appears inside a ToggleGroup
  *
  *  <p><b>Example</b></p>
  *
@@ -29490,19 +29570,21 @@ export interface I18NProperty85 {
  *
  *
  *     {
- *       "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;
 }