diff --git a/container/cypress/e2e/test-app/compound/wc-compound-container.cy.js b/container/cypress/e2e/test-app/compound/wc-compound-container.cy.js index e29eacd24f..c732dcc761 100644 --- a/container/cypress/e2e/test-app/compound/wc-compound-container.cy.js +++ b/container/cypress/e2e/test-app/compound/wc-compound-container.cy.js @@ -106,15 +106,9 @@ describe('Compound Container Tests', () => { }); it('LuigiClient API - getSkipInitCheck', () => { - cy.on('window:alert', stub); - cy.get(containerSelector) - .shadow() - .contains('getSkipInitCheck') - .click() - .then(() => { - expect(stub.getCall(0)).to.be.calledWith('LuigiClient.getSkipInitCheck()=true'); - }); + .invoke('attr', 'skip-init-check') + .should('eq', 'true'); }); it('LuigiClient API - getActiveFeatureToggles', () => { diff --git a/container/src/LuigiCompoundContainer.svelte b/container/src/LuigiCompoundContainer.svelte index d900f970aa..c6f36304b1 100644 --- a/container/src/LuigiCompoundContainer.svelte +++ b/container/src/LuigiCompoundContainer.svelte @@ -147,7 +147,7 @@ } webcomponentService.renderWebComponentCompound(node, thisComponent.getNoShadow() ? thisComponent : mainComponent, ctx).then(compCnt => { eventBusElement = compCnt as HTMLElement; - if (thisComponent.hasAttribute('skip-init-check') || !node.viewUrl) { + if (skipInitCheck || !node.viewUrl) { thisComponent.initialized = true; setTimeout(() => { webcomponentService.dispatchLuigiEvent(Events.INITIALIZED, {}); diff --git a/container/src/services/webcomponents.service.ts b/container/src/services/webcomponents.service.ts index e285274d30..0461c1f6b6 100644 --- a/container/src/services/webcomponents.service.ts +++ b/container/src/services/webcomponents.service.ts @@ -332,9 +332,6 @@ export class WebComponentService { getUserSettings: (): Object => { return this.thisComponent.userSettings || {}; }, - getSkipInitCheck: (): boolean => { - return !!this.thisComponent.skipInitCheck; - }, setViewGroupData: data => { this.dispatchLuigiEvent(Events.SET_VIEW_GROUP_DATA_REQUEST, data); } diff --git a/container/test-app/compound/helloWorldWC.js b/container/test-app/compound/helloWorldWC.js index b5e7dc5050..0598bdd4df 100644 --- a/container/test-app/compound/helloWorldWC.js +++ b/container/test-app/compound/helloWorldWC.js @@ -43,9 +43,6 @@ export default class extends HTMLElement { const getAnchorBtn = document.createElement('template'); getAnchorBtn.innerHTML = ''; - const getSkipInitCheckBtn = document.createElement('template'); - getSkipInitCheckBtn.innerHTML = ''; - const getFeatureToggleListBtn = document.createElement('template'); getFeatureToggleListBtn.innerHTML = ''; @@ -106,7 +103,6 @@ export default class extends HTMLElement { this._shadowRoot.appendChild(getClientPermissionsBtn.content.cloneNode(true)); this._shadowRoot.appendChild(getUserSettingsBtn.content.cloneNode(true)); this._shadowRoot.appendChild(getAnchorBtn.content.cloneNode(true)); - this._shadowRoot.appendChild(getSkipInitCheckBtn.content.cloneNode(true)); this._shadowRoot.appendChild(getFeatureToggleListBtn.content.cloneNode(true)); this._shadowRoot.appendChild(getThemeBtn.content.cloneNode(true)); this._shadowRoot.appendChild(getDirtyStatusBtn.content.cloneNode(true)); @@ -210,16 +206,6 @@ export default class extends HTMLElement { }); }); - this.$getSkipInitCheckBtn = this._shadowRoot.querySelector('#getSkipInitCheck'); - this.$getSkipInitCheckBtn.addEventListener('click', () => { - const skipInitCheck = this.LuigiClient.getSkipInitCheck(); - - this.LuigiClient.uxManager().showAlert({ - text: 'LuigiClient.getSkipInitCheck()=' + JSON.stringify(skipInitCheck), - type: 'info' - }); - }); - this.$getFeatureToggleListBtn = this._shadowRoot.querySelector('#getFeatureToggleList'); this.$getFeatureToggleListBtn.addEventListener('click', () => { const activeFeatureToggleList = this.LuigiClient.getActiveFeatureToggles(); diff --git a/container/test/services/webcomponents.service.spec.ts b/container/test/services/webcomponents.service.spec.ts index 58223ee9fe..8f68f146e4 100644 --- a/container/test/services/webcomponents.service.spec.ts +++ b/container/test/services/webcomponents.service.spec.ts @@ -1144,19 +1144,6 @@ describe('createClientAPI', () => { // assert expect(result).toEqual({}); }); - - it.each([true, false])('test getSkipInitCheck attribute', value => { - // mock and spy on data/functions - service.thisComponent = document.createElement('div'); - service.thisComponent.skipInitCheck = value; - - // act - const clientAPI = service.createClientAPI(undefined, 'nodeId', 'wc_id', 'component', false); - const result = clientAPI.getSkipInitCheck(); - - // assert - expect(result).toBe(value); - }); }); describe('initWC', () => {