Resolves conflicts

SAP · Sep 23, 2024 · a7aa7bf · a7aa7bf
2 parents b7a257d + 6894f9b
commit a7aa7bf
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/container/src/LuigiCompoundContainer.svelte b/container/src/LuigiCompoundContainer.svelte
@@ -65,22 +65,22 @@
   import { Events } from './constants/communication';
   import { GenericHelperFunctions } from './utilities/helpers';
 
-  export let viewurl: string;
-  export let webcomponent: any;
+  export let anchor: string;
+  export let authData: any;
+  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 authData: any;
+  export let viewurl: string;
+  export let webcomponent: any;
 
   let containerInitialized = false;
   let mainComponent: HTMLElement;
@@ -178,4 +178,4 @@
     height: 100%;
     border: none;
   }
-</style>
+</style>
diff --git a/container/src/LuigiContainer.svelte b/container/src/LuigiContainer.svelte
@@ -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:
     | {
@@ -114,6 +113,7 @@
       pathParams &&
       sandboxRules &&
       searchParams &&
+      skipInitCheck &&
       theme &&
       userSettings
     );
@@ -213,7 +213,7 @@
         height: 100%;
         border: none;
       }
-    
+
       main.lui-isolated {
         line-height: 0;
       }