@forge/manifest 3.3.0-next.3 → 3.3.0-next.6

package/out/schema/manifest.d.ts

@@ -764,6 +764,20 @@ export interface Modules {
       name: string;
       description: string;
       function?: string;
+      expression?: string;
+      errorMessage?: string;
+      view?: {
+        resource: string;
+        [k: string]: unknown;
+      };
+      edit?: {
+        resource: string;
+        [k: string]: unknown;
+      };
+      create?: {
+        resource: string;
+        [k: string]: unknown;
+      };
       key: ModuleKeySchema;
       [k: string]: unknown;
     },
@@ -771,6 +785,20 @@ export interface Modules {
       name: string;
       description: string;
       function?: string;
+      expression?: string;
+      errorMessage?: string;
+      view?: {
+        resource: string;
+        [k: string]: unknown;
+      };
+      edit?: {
+        resource: string;
+        [k: string]: unknown;
+      };
+      create?: {
+        resource: string;
+        [k: string]: unknown;
+      };
       key: ModuleKeySchema;
       [k: string]: unknown;
     }[]
@@ -808,6 +836,15 @@ export interface Modules {
             function: string;
             [k: string]: unknown;
           };
+          searchSuggestions?:
+            | {
+                function: string;
+                [k: string]: unknown;
+              }
+            | {
+                expression: string;
+                [k: string]: unknown;
+              };
           displayConditions?: {
             [k: string]: unknown;
           };
@@ -848,6 +885,15 @@ export interface Modules {
             function: string;
             [k: string]: unknown;
           };
+          searchSuggestions?:
+            | {
+                function: string;
+                [k: string]: unknown;
+              }
+            | {
+                expression: string;
+                [k: string]: unknown;
+              };
           displayConditions?: {
             [k: string]: unknown;
           };
@@ -887,6 +933,15 @@ export interface Modules {
             function: string;
             [k: string]: unknown;
           };
+          searchSuggestions?:
+            | {
+                function: string;
+                [k: string]: unknown;
+              }
+            | {
+                expression: string;
+                [k: string]: unknown;
+              };
           displayConditions?: {
             [k: string]: unknown;
           };
@@ -927,6 +982,15 @@ export interface Modules {
             function: string;
             [k: string]: unknown;
           };
+          searchSuggestions?:
+            | {
+                function: string;
+                [k: string]: unknown;
+              }
+            | {
+                expression: string;
+                [k: string]: unknown;
+              };
           displayConditions?: {
             [k: string]: unknown;
           };
@@ -965,6 +1029,15 @@ export interface Modules {
             function: string;
             [k: string]: unknown;
           };
+          searchSuggestions?:
+            | {
+                function: string;
+                [k: string]: unknown;
+              }
+            | {
+                expression: string;
+                [k: string]: unknown;
+              };
           icon?: string;
           resolver?: {
             function: string;
@@ -1017,6 +1090,15 @@ export interface Modules {
             function: string;
             [k: string]: unknown;
           };
+          searchSuggestions?:
+            | {
+                function: string;
+                [k: string]: unknown;
+              }
+            | {
+                expression: string;
+                [k: string]: unknown;
+              };
           icon?: string;
           resolver?: {
             function: string;
@@ -1068,6 +1150,15 @@ export interface Modules {
             function: string;
             [k: string]: unknown;
           };
+          searchSuggestions?:
+            | {
+                function: string;
+                [k: string]: unknown;
+              }
+            | {
+                expression: string;
+                [k: string]: unknown;
+              };
           icon?: string;
           resolver?: {
             function: string;
@@ -1120,6 +1211,15 @@ export interface Modules {
             function: string;
             [k: string]: unknown;
           };
+          searchSuggestions?:
+            | {
+                function: string;
+                [k: string]: unknown;
+              }
+            | {
+                expression: string;
+                [k: string]: unknown;
+              };
           icon?: string;
           resolver?: {
             function: string;
@@ -2075,6 +2175,468 @@ export interface Modules {
         }
     )[]
   ];
+  'jiraServiceManagement:queuePage'?: [
+    (
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          function: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+    ),
+    ...(
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          function: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+    )[]
+  ];
+  'jiraServiceManagement:portalRequestDetail'?: [
+    (
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          viewportSize?: 'small' | 'medium' | 'large' | 'xlarge';
+          function: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+    ),
+    ...(
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          viewportSize?: 'small' | 'medium' | 'large' | 'xlarge';
+          function: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+    )[]
+  ];
+  'jiraServiceManagement:portalRequestDetailPanel'?: [
+    (
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          viewportSize?: 'small' | 'medium' | 'large' | 'xlarge';
+          function: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+    ),
+    ...(
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          viewportSize?: 'small' | 'medium' | 'large' | 'xlarge';
+          function: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+    )[]
+  ];
+  'jiraServiceManagement:organizationPanel'?: [
+    (
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          function: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          viewportSize?: 'small' | 'medium' | 'large' | 'xlarge';
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+    ),
+    ...(
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          function: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          viewportSize?: 'small' | 'medium' | 'large' | 'xlarge';
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+    )[]
+  ];
+  'jiraServiceManagement:portalFooter'?: [
+    (
+      | {
+          layout?: 'native' | 'basic';
+          pages?: (
+            | 'help_center'
+            | 'portal'
+            | 'create_request'
+            | 'view_request'
+            | 'my_requests'
+            | 'approvals'
+            | 'profile'
+          )[];
+          viewportSize?: 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge';
+          function: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+      | {
+          pages?: (
+            | 'help_center'
+            | 'portal'
+            | 'create_request'
+            | 'view_request'
+            | 'my_requests'
+            | 'approvals'
+            | 'profile'
+          )[];
+          viewportSize?: 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge';
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+    ),
+    ...(
+      | {
+          layout?: 'native' | 'basic';
+          pages?: (
+            | 'help_center'
+            | 'portal'
+            | 'create_request'
+            | 'view_request'
+            | 'my_requests'
+            | 'approvals'
+            | 'profile'
+          )[];
+          viewportSize?: 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge';
+          function: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+      | {
+          pages?: (
+            | 'help_center'
+            | 'portal'
+            | 'create_request'
+            | 'view_request'
+            | 'my_requests'
+            | 'approvals'
+            | 'profile'
+          )[];
+          viewportSize?: 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge';
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+    )[]
+  ];
+  'jiraServiceManagement:portalHeader'?: [
+    (
+      | {
+          pages?: (
+            | 'help_center'
+            | 'portal'
+            | 'create_request'
+            | 'view_request'
+            | 'my_requests'
+            | 'approvals'
+            | 'profile'
+          )[];
+          viewportSize?: 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge';
+          function: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+      | {
+          pages?: (
+            | 'help_center'
+            | 'portal'
+            | 'create_request'
+            | 'view_request'
+            | 'my_requests'
+            | 'approvals'
+            | 'profile'
+          )[];
+          viewportSize?: 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge';
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+    ),
+    ...(
+      | {
+          pages?: (
+            | 'help_center'
+            | 'portal'
+            | 'create_request'
+            | 'view_request'
+            | 'my_requests'
+            | 'approvals'
+            | 'profile'
+          )[];
+          viewportSize?: 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge';
+          function: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+      | {
+          pages?: (
+            | 'help_center'
+            | 'portal'
+            | 'create_request'
+            | 'view_request'
+            | 'my_requests'
+            | 'approvals'
+            | 'profile'
+          )[];
+          viewportSize?: 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge';
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+    )[]
+  ];
+  'jiraServiceManagement:portalSubheader'?: [
+    (
+      | {
+          pages?: (
+            | 'help_center'
+            | 'portal'
+            | 'create_request'
+            | 'view_request'
+            | 'my_requests'
+            | 'approvals'
+            | 'profile'
+          )[];
+          viewportSize?: 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge';
+          function: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+      | {
+          pages?: (
+            | 'help_center'
+            | 'portal'
+            | 'create_request'
+            | 'view_request'
+            | 'my_requests'
+            | 'approvals'
+            | 'profile'
+          )[];
+          viewportSize?: 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge';
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+    ),
+    ...(
+      | {
+          pages?: (
+            | 'help_center'
+            | 'portal'
+            | 'create_request'
+            | 'view_request'
+            | 'my_requests'
+            | 'approvals'
+            | 'profile'
+          )[];
+          viewportSize?: 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge';
+          function: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+      | {
+          pages?: (
+            | 'help_center'
+            | 'portal'
+            | 'create_request'
+            | 'view_request'
+            | 'my_requests'
+            | 'approvals'
+            | 'profile'
+          )[];
+          viewportSize?: 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge';
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+    )[]
+  ];
+  'jiraServiceManagement:portalProfilePanel'?: [
+    (
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          function: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          viewportSize?: 'small' | 'medium' | 'large' | 'xlarge';
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+    ),
+    ...(
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          function: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+      | {
+          title: string;
+          icon?: string;
+          layout?: 'native' | 'basic';
+          viewportSize?: 'small' | 'medium' | 'large' | 'xlarge';
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          key: ModuleKeySchema;
+          [k: string]: unknown;
+        }
+    )[]
+  ];
   'connect-jira:keyboardShortcuts'?: [
     {
       shortcut?: string;
@@ -3078,7 +3640,7 @@ export interface Modules {
       location?: string;
       cacheable?: boolean;
       supportsNative?: boolean;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3094,7 +3656,7 @@ export interface Modules {
       location?: string;
       cacheable?: boolean;
       supportsNative?: boolean;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3132,7 +3694,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3146,7 +3708,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3161,7 +3723,7 @@ export interface Modules {
       name?: I18NProperty55;
       weight?: number;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3173,7 +3735,7 @@ export interface Modules {
       name?: I18NProperty55;
       weight?: number;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3188,7 +3750,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3202,7 +3764,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3765,7 +4327,7 @@ export interface I18NProperty1 {
  *
  */
 export interface CompositeCondition {
-  conditions?: (SingleCondition | ManifestSchema)[];
+  conditions?: (ManifestSchema | SingleCondition)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
@@ -6324,7 +6886,83 @@ export interface I18NProperty55 {
  *
  *
  */
-export interface Icon9 {
+export interface Icon9 {
+  width?: number;
+  url: string;
+  height?: number;
+  [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 I18NProperty56 {
+  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.
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "value": "My text"
+ *     }
+ *
+ *
+ *
+ */
+export interface I18NProperty57 {
+  value: string;
+  i18n?: string;
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Defines an icon to display.
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "icon": {
+ *         "width": 16,
+ *         "height": 16,
+ *         "url": "/my-icon.png"
+ *       }
+ *     }
+ *
+ *
+ *
+ */
+export interface Icon10 {
   width?: number;
   url: string;
   height?: number;
@@ -6333,85 +6971,80 @@ export interface Icon9 {
 /**
  *
  *
- * 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.
+ * Defines the way a <a href="../web-item/">web item</a> link is opened in the browser, such as in a modal or inline dialog.
  *
- *  <h3>Example</h3>
+ *  <h2>Inline Dialog Example</h2>
  *
  *
  *
  *
  *
  *     {
- *       "value": "My text"
+ *       "target": {
+ *         "type": "inlinedialog",
+ *         "options": {
+ *           "onHover": true,
+ *           "offsetX": "30px",
+ *           "offsetY": "20px"
+ *         }
+ *       }
  *     }
  *
  *
  *
- */
-export interface I18NProperty56 {
-  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.
  *
- *  <h3>Example</h3>
+ *  <h2>Dialog Example</h2>
  *
  *
  *
  *
  *
  *     {
- *       "value": "My text"
+ *       "target": {
+ *         "type": "dialog",
+ *         "options": {
+ *           "height": "100px",
+ *           "width": "200px"
+ *         }
+ *       }
  *     }
  *
  *
  *
- */
-export interface I18NProperty57 {
-  value: string;
-  i18n?: string;
-  [k: string]: unknown;
-}
-/**
- *
- *
- * Defines an icon to display.
  *
- *  <h3>Example</h3>
+ *  <h2>Common Dialog Module Example</h2>
  *
  *
  *
  *
  *
  *     {
- *       "icon": {
- *         "width": 16,
- *         "height": 16,
- *         "url": "/my-icon.png"
+ *       "target": {
+ *         "type": "dialogmodule",
+ *         "options": {
+ *           "key": "dialog-module-key"
+ *         }
  *       }
  *     }
  *
  *
  *
+ *
+ *  <p>More details for this use-case can be found on the <a href="../dialog/">Dialog Module</a> page.</p>
+ *
+ *
  */
-export interface Icon10 {
-  width?: number;
-  url: string;
-  height?: number;
+export interface WebItemTarget1 {
+  options?: DialogModuleOptions1 | InlineDialogOptions1 | DialogOptions2;
+  type?: 'page' | 'PAGE' | 'dialog' | 'DIALOG' | 'inlinedialog' | 'INLINEDIALOG' | 'dialogmodule' | 'DIALOGMODULE';
   [k: string]: unknown;
 }
 /**
  *
  *
- * Defines the way a <a href="../web-item/">web item</a> link is opened in the browser, such as in a modal or inline dialog.
+ * Options for a web-item targeting a common <a href="../dialog/">dialog module</a>.
  *
- *  <h2>Inline Dialog Example</h2>
+ *  <h3>Example</h3>
  *
  *
  *
@@ -6419,38 +7052,26 @@ export interface Icon10 {
  *
  *     {
  *       "target": {
- *         "type": "inlinedialog",
+ *         "type": "dialogmodule",
  *         "options": {
- *           "onHover": true,
- *           "offsetX": "30px",
- *           "offsetY": "20px"
+ *           "key": "dialog-module-key"
  *         }
  *       }
  *     }
  *
  *
  *
- *
- *  <h2>Dialog Example</h2>
- *
- *
- *
- *
- *
- *     {
- *       "target": {
- *         "type": "dialog",
- *         "options": {
- *           "height": "100px",
- *           "width": "200px"
- *         }
- *       }
- *     }
- *
+ */
+export interface DialogModuleOptions1 {
+  key: string;
+  [k: string]: unknown;
+}
+/**
  *
  *
+ * Options for an inline dialog target
  *
- *  <h2>Common Dialog Module Example</h2>
+ *  <h3>Example</h3>
  *
  *
  *
@@ -6458,23 +7079,28 @@ export interface Icon10 {
  *
  *     {
  *       "target": {
- *         "type": "dialogmodule",
+ *         "type": "inlinedialog",
  *         "options": {
- *           "key": "dialog-module-key"
+ *           "onHover": true,
+ *           "offsetX": "30px",
+ *           "offsetY": "20px"
  *         }
  *       }
  *     }
  *
  *
  *
- *
- *  <p>More details for this use-case can be found on the <a href="../dialog/">Dialog Module</a> page.</p>
- *
- *
  */
-export interface WebItemTarget1 {
-  options?: DialogOptions2 | DialogModuleOptions1 | InlineDialogOptions1;
-  type?: 'page' | 'PAGE' | 'dialog' | 'DIALOG' | 'inlinedialog' | 'INLINEDIALOG' | 'dialogmodule' | 'DIALOGMODULE';
+export interface InlineDialogOptions1 {
+  offsetX?: string;
+  offsetY?: string;
+  width?: string;
+  onTop?: boolean;
+  showDelay?: number;
+  closeOthers?: boolean;
+  persistent?: boolean;
+  onHover?: boolean;
+  isRelativeToMouse?: boolean;
   [k: string]: unknown;
 }
 /**
@@ -6575,70 +7201,6 @@ export interface I18NProperty58 {
   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 DialogModuleOptions1 {
-  key: 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 InlineDialogOptions1 {
-  offsetX?: string;
-  offsetY?: string;
-  width?: string;
-  onTop?: boolean;
-  showDelay?: number;
-  closeOthers?: boolean;
-  persistent?: boolean;
-  onHover?: boolean;
-  isRelativeToMouse?: boolean;
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -7157,7 +7719,7 @@ export interface SingleCondition5 {
  *
  */
 export interface CompositeCondition7 {
-  conditions?: (SingleCondition | ManifestSchema)[];
+  conditions?: (ManifestSchema | SingleCondition)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
@@ -8580,7 +9142,7 @@ export interface I18NProperty74 {
  *
  */
 export interface MacroPropertyPanel {
-  controls?: (TextControl | ButtonControl | ToggleGroup | ControlGroup)[];
+  controls?: (ButtonControl | ToggleGroup | ControlGroup | TextControl)[];
   cacheable?: boolean;
   url: string;
   [k: string]: unknown;
@@ -8588,7 +9150,7 @@ export interface MacroPropertyPanel {
 /**
  *
  *
- * Defines a text field which may appear in control extension points such as the property panel
+ * Defines a button which may appear in control extension points such as the property panel
  *
  *  <p><b>Example</b></p>
  *
@@ -8607,16 +9169,85 @@ export interface MacroPropertyPanel {
  *
  *
  */
-export interface TextControl {
-  macroParameter: string;
-  type: 'text' | 'TEXT';
+export interface ButtonControl {
+  label: I18NProperty75;
+  type: 'button' | 'BUTTON';
   key: string;
   [k: string]: unknown;
 }
 /**
  *
  *
- * Defines a button which may appear in control extension points such as the property panel
+ * 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 I18NProperty75 {
+  value: string;
+  i18n?: string;
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * 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 ToggleGroup {
+  controls: ToggleButtonControl[];
+  macroParameter: string;
+  type: 'togglegroup' | 'TOGGLEGROUP';
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Defines a toggle button which appears inside a ToggleGroup
  *
  *  <p><b>Example</b></p>
  *
@@ -8625,19 +9256,21 @@ export interface TextControl {
  *
  *
  *     {
- *       "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 {
-  label: I18NProperty75;
-  type: 'button' | 'BUTTON';
+export interface ToggleButtonControl {
+  macroParameterValue: string;
+  label: I18NProperty76;
+  type: 'togglebutton' | 'TOGGLEBUTTON';
   key: string;
   [k: string]: unknown;
 }
@@ -8660,7 +9293,7 @@ export interface ButtonControl {
  *
  *
  */
-export interface I18NProperty75 {
+export interface I18NProperty76 {
   value: string;
   i18n?: string;
   [k: string]: unknown;
@@ -8668,7 +9301,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>
  *
@@ -8678,24 +9311,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"
  *           }
  *         ]
  *       }
@@ -8704,16 +9334,15 @@ export interface I18NProperty75 {
  *
  *
  */
-export interface ToggleGroup {
-  controls: ToggleButtonControl[];
-  macroParameter: string;
-  type: 'togglegroup' | 'TOGGLEGROUP';
+export interface ControlGroup {
+  controls: ButtonControl1[];
+  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>
  *
@@ -8722,21 +9351,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;
-  label: I18NProperty76;
-  type: 'togglebutton' | 'TOGGLEBUTTON';
+export interface ButtonControl1 {
+  label: I18NProperty77;
+  type: 'button' | 'BUTTON';
   key: string;
   [k: string]: unknown;
 }
@@ -8759,7 +9386,7 @@ export interface ToggleButtonControl {
  *
  *
  */
-export interface I18NProperty76 {
+export interface I18NProperty77 {
   value: string;
   i18n?: string;
   [k: string]: unknown;
@@ -8767,48 +9394,7 @@ export interface I18NProperty76 {
 /**
  *
  *
- * 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 ControlGroup {
-  controls: ButtonControl1[];
-  type: 'group' | 'GROUP';
-  [k: string]: unknown;
-}
-/**
- *
- *
- * Defines a button 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>
  *
@@ -8827,36 +9413,12 @@ export interface ControlGroup {
  *
  *
  */
-export interface ButtonControl1 {
-  label: I18NProperty77;
-  type: 'button' | 'BUTTON';
+export interface TextControl {
+  macroParameter: string;
+  type: 'text' | 'TEXT';
   key: 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.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "value": "My text"
- *     }
- *
- *
- *
- */
-export interface I18NProperty77 {
-  value: string;
-  i18n?: string;
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -29825,52 +30387,11 @@ export interface I18NProperty83 {
  *
  */
 export interface MacroPropertyPanel1 {
-  controls?: (ControlGroup1 | ToggleGroup1 | ButtonControl3 | TextControl1)[];
+  controls?: (ButtonControl2 | ToggleGroup1 | ControlGroup1 | TextControl1)[];
   cacheable?: boolean;
   url: 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: ButtonControl2[];
-  type: 'group' | 'GROUP';
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -30022,6 +30543,47 @@ export interface I18NProperty85 {
   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;
+}
 /**
  *
  *
@@ -50951,10 +51513,47 @@ export interface I18NProperty91 {
  *
  */
 export interface WebItemTarget2 {
-  options?: DialogOptions4 | DialogModuleOptions2 | InlineDialogOptions2;
+  options?: InlineDialogOptions2 | DialogOptions4 | 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;
+}
 /**
  *
  *
@@ -51080,43 +51679,6 @@ export interface DialogModuleOptions2 {
   key: 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;
-}
 /**
  *
  *