Merge branch 'main' into 3924-node-params-in-compound-container-typings

SAP · Sep 23, 2024 · eb9fbad · eb9fbad
2 parents 94ef4de + 6894f9b
commit eb9fbad
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 76 deletions.
diff --git a/container/src/LuigiCompoundContainer.svelte b/container/src/LuigiCompoundContainer.svelte
@@ -3,36 +3,36 @@
     tag: null,
     shadow: 'none',
     props: {
-      viewurl: { type: 'String', reflect: false, attribute: 'viewurl' },
-      deferInit: { type: 'Boolean', attribute: 'defer-init' },
-      context: { type: 'String', reflect: false, attribute: 'context' },
-      noShadow: { type: 'Boolean', attribute: 'no-shadow', reflect: false },
-      compoundConfig: {
+      anchor: { type: 'String', reflect: false, attribute: 'anchor' },
+      clientPermissions: {
         type: 'Object',
         reflect: false,
-        attribute: 'compound-config',
+        attribute: 'client-permissions',
       },
-      nodeParams: { type: 'Object', reflect: false, attribute: 'node-params' },
-      userSettings: {
+      compoundConfig: {
         type: 'Object',
         reflect: false,
-        attribute: 'user-settings',
+        attribute: 'compound-config',
       },
-      anchor: { type: 'String', reflect: false, attribute: 'anchor' },
+      context: { type: 'String', reflect: false, attribute: 'context' },
+      deferInit: { type: 'Boolean', attribute: 'defer-init' },
+      dirtyStatus: { type: 'Boolean', reflect: false, attribute: 'dirty-status'},
+      documentTitle: {type: 'String', reflect: false, attribute: 'document-title'},
+      hasBack: { type: 'Boolean', reflect: false, attribute: 'has-back'},
+      noShadow: { type: 'Boolean', attribute: 'no-shadow', reflect: false },
+      nodeParams: { type: 'Object', reflect: false, attribute: 'node-params' },
+      pathParams: { type: 'Object', reflect: false, attribute: 'path-params' },
       searchParams: {
         type: 'Object',
         reflect: false,
         attribute: 'search-params',
       },
-      pathParams: { type: 'Object', reflect: false, attribute: 'path-params' },
-      clientPermissions: {
+      userSettings: {
         type: 'Object',
         reflect: false,
-        attribute: 'client-permissions',
+        attribute: 'user-settings',
       },
-      dirtyStatus: { type: 'Boolean', reflect: false, attribute: 'dirty-status'},
-      hasBack: { type: 'Boolean', reflect: false, attribute: 'has-back'},
-      documentTitle: {type: 'String', reflect: false, attribute: 'document-title'},
+      viewurl: { type: 'String', reflect: false, attribute: 'viewurl' }
     },
     extend: (customElementConstructor) => {
       let notInitFn = (name) => {
@@ -64,21 +64,21 @@
   import { Events } from './constants/communication';
   import { GenericHelperFunctions } from './utilities/helpers';
 
-  export let viewurl: string;
-  export let webcomponent: any;
+  export let anchor: string;
+  export let clientPermissions: any;
+  export let compoundConfig: any;
   export let context: string;
   export let deferInit: boolean;
+  export let dirtyStatus: boolean;
+  export let documentTitle: string;
+  export let hasBack: boolean;
   export let noShadow: boolean;
-  export let compoundConfig: any;
   export let nodeParams: any;
-  export let searchParams: any;
   export let pathParams: any;
-  export let clientPermissions: any;
+  export let searchParams: any;
   export let userSettings: any;
-  export let anchor: string;
-  export let dirtyStatus: boolean;
-  export let hasBack: boolean;
-  export let documentTitle: string;
+  export let viewurl: string;
+  export let webcomponent: any;
 
   let containerInitialized = false;
   let mainComponent: HTMLElement;
@@ -90,16 +90,16 @@
   // Only needed for get rid of "unused export property" svelte compiler warnings
   export const unwarn = () => {
     return (
-      nodeParams &&
-      searchParams &&
-      pathParams &&
-      clientPermissions &&
-      userSettings &&
       anchor &&
+      clientPermissions &&
       dirtyStatus &&
-      hasBack &&
       documentTitle &&
-      noShadow
+      hasBack &&
+      noShadow &&
+      nodeParams &&
+      pathParams &&
+      searchParams &&
+      userSettings
     );
   };
 
@@ -175,4 +175,4 @@
     height: 100%;
     border: none;
   }
-</style>
+</style>
diff --git a/container/src/LuigiContainer.svelte b/container/src/LuigiContainer.svelte
@@ -3,28 +3,28 @@
     tag: null,
     shadow: 'none',
     props: {
-      viewurl: { type: 'String', reflect: false, attribute: 'viewurl' },
-      deferInit: { type: 'Boolean', attribute: 'defer-init' },
-      noShadow: { type: 'Boolean', attribute: 'no-shadow' },
-      context: { type: 'String', reflect: false, attribute: 'context' },
-      label: { type: 'String', reflect: false, attribute: 'label' },
-      webcomponent: { type: 'String', reflect: false, attribute: 'webcomponent' },
-      locale: { type: 'String', reflect: false, attribute: 'locale' },
-      theme: { type: 'String', reflect: false, attribute: 'theme' },
       activeFeatureToggleList: { type: 'Array', reflect: false, attribute: 'active-feature-toggle-list' },
-      skipInitCheck: { type: 'Boolean', reflect: false, attribute: 'skip-init-check' },
-      nodeParams: { type: 'Object', reflect: false, attribute: 'node-params' },
-      userSettings: { type: 'Object', reflect: false, attribute: 'user-settings' },
+      allowRules: { type: 'Array', reflect: false, attribute: 'allow-rules' },
       anchor: { type: 'String', reflect: false, attribute: 'anchor' },
-      searchParams: { type: 'Object', reflect: false, attribute: 'search-params' },
-      pathParams: { type: 'Object', reflect: false, attribute: 'path-params' },
+      authData: { type: 'Object', reflect: false, attribute: 'auth-data' },
       clientPermissions: { type: 'Object', reflect: false, attribute: 'client-permissions' },
+      context: { type: 'String', reflect: false, attribute: 'context' },
+      deferInit: { type: 'Boolean', attribute: 'defer-init' },
       dirtyStatus: { type: 'Boolean', reflect: false, attribute: 'dirty-status' },
-      hasBack: { type: 'Boolean', reflect: false, attribute: 'has-back' },
       documentTitle: { type: 'String', reflect: false, attribute: 'document-title' },
-      allowRules: { type: 'Array', reflect: false, attribute: 'allow-rules' },
+      hasBack: { type: 'Boolean', reflect: false, attribute: 'has-back' },
+      label: { type: 'String', reflect: false, attribute: 'label' },
+      locale: { type: 'String', reflect: false, attribute: 'locale' },
+      noShadow: { type: 'Boolean', attribute: 'no-shadow' },
+      nodeParams: { type: 'Object', reflect: false, attribute: 'node-params' },
+      pathParams: { type: 'Object', reflect: false, attribute: 'path-params' },
       sandboxRules: { type: 'Array', reflect: false, attribute: 'sandbox-rules' },
-      authData: { type: 'Object', reflect: false, attribute: 'auth-data' }
+      searchParams: { type: 'Object', reflect: false, attribute: 'search-params' },
+      skipInitCheck: { type: 'Boolean', reflect: false, attribute: 'skip-init-check' },
+      theme: { type: 'String', reflect: false, attribute: 'theme' },
+      userSettings: { type: 'Object', reflect: false, attribute: 'user-settings' },
+      viewurl: { type: 'String', reflect: false, attribute: 'viewurl' },
+      webcomponent: { type: 'String', reflect: false, attribute: 'webcomponent' }
     },
     extend: customElementConstructor => {
       let notInitFn = name => {
@@ -62,29 +62,28 @@
   import { GenericHelperFunctions } from './utilities/helpers';
   import { getAllowRules } from './services/iframe-helpers';
 
-  export let viewurl: string;
+  export let activeFeatureToggleList: string[];
+  export let allowRules: string[];
+  export let anchor: string;
+  export let authData: any;
+  export let clientPermissions: any;
   export let context: string;
-  export let label: string;
-  export let webcomponent: any;
   export let deferInit: boolean;
-  export let noShadow: Boolean;
+  export let dirtyStatus: boolean;
+  export let documentTitle: string;
+  export let hasBack: boolean;
+  export let label: string;
   export let locale: string;
-  export let theme: string;
-  export let activeFeatureToggleList: string[];
-  export let skipInitCheck: boolean;
+  export let noShadow: Boolean;
   export let nodeParams: any;
-  export let searchParams: any;
   export let pathParams: any;
-  export let clientPermissions: any;
-  export let dirtyStatus: boolean;
-  export let hasBack: boolean;
-  export let documentTitle: string;
-  export let allowRules: string[];
   export let sandboxRules: string[];
-
+  export let searchParams: any;
+  export let skipInitCheck: boolean;
+  export let theme: string;
   export let userSettings: any;
-  export let anchor: string;
-  export let authData: any;
+  export let viewurl: string;
+  export let webcomponent: any;
 
   const iframeHandle:
     | {
@@ -100,22 +99,23 @@
   // Only needed for get rid of "unused export property" svelte compiler warnings
   export const unwarn = () => {
     return (
-      locale &&
-      theme &&
       activeFeatureToggleList &&
-      nodeParams &&
-      searchParams &&
-      pathParams &&
-      clientPermissions &&
-      userSettings &&
+      allowRules &&
       anchor &&
       authData &&
+      clientPermissions &&
       dirtyStatus &&
-      hasBack &&
       documentTitle &&
-      allowRules &&
+      hasBack &&
+      locale &&
+      noShadow &&
+      nodeParams &&
+      pathParams &&
       sandboxRules &&
-      noShadow
+      searchParams &&
+      skipInitCheck &&
+      theme &&
+      userSettings
     );
   };
 
@@ -213,7 +213,7 @@
         height: 100%;
         border: none;
       }
-    
+
       main.lui-isolated {
         line-height: 0;
       }