From bd60858c965bedaf05a16ca0bf4ed1fc6b5e42cc Mon Sep 17 00:00:00 2001 From: RubirajAccenture <122974571+RubirajAccenture@users.noreply.github.com> Date: Thu, 8 Feb 2024 15:20:32 +0100 Subject: [PATCH] fix(884): loading status property remocal from loader component (#887) --- .../actions/buttons/icon-button/index.stories.ts | 6 ------ .../components/actions/buttons/icon-button/index.test.ts | 1 - .../src/components/actions/buttons/icon-button/index.ts | 2 -- .../actions/buttons/text-button/index.stories.ts | 6 ------ .../components/actions/buttons/text-button/index.test.ts | 1 - .../src/components/actions/buttons/text-button/index.ts | 2 -- .../src/components/feedback/loader/index.stories.ts | 8 -------- .../src/components/feedback/loader/index.test.ts | 1 - .../ui-library/src/components/feedback/loader/index.ts | 4 +--- .../slider-single-value/range-legend-slider/index.ts | 1 - .../slider/slider-single-value/range-slider/index.ts | 1 - .../range-legend-min-max-slider/index.ts | 1 - .../slider-two-values/range-min-max-slider/index.ts | 1 - .../src/components/ui/button-group/index.stories.ts | 3 --- .../src/components/ui/button-group/index.test.ts | 1 - .../src/components/ui/icon/icon-link/index.stories.ts | 1 - .../src/components/ui/icon/icon-link/index.test.ts | 1 - .../ui-library/src/components/ui/icon/icon-link/index.ts | 3 --- packages/ui-library/src/globals/types.ts | 1 - 19 files changed, 1 insertion(+), 44 deletions(-) diff --git a/packages/ui-library/src/components/actions/buttons/icon-button/index.stories.ts b/packages/ui-library/src/components/actions/buttons/icon-button/index.stories.ts index 304a0a6b4..d41bf4fe1 100644 --- a/packages/ui-library/src/components/actions/buttons/icon-button/index.stories.ts +++ b/packages/ui-library/src/components/actions/buttons/icon-button/index.stories.ts @@ -156,11 +156,6 @@ export default { disable: true, }, }, - loadingStatus: { - table: { - disable: true, - }, - }, }, parameters: { design: { @@ -201,7 +196,6 @@ const defaultParams: BlrIconButtonType = { loading: false, arialabel: 'Icon Button', buttonId: 'iconButtonId', - loadingStatus: 'Loading', }; BlrIconButton.args = defaultParams; diff --git a/packages/ui-library/src/components/actions/buttons/icon-button/index.test.ts b/packages/ui-library/src/components/actions/buttons/icon-button/index.test.ts index 3c60eb9b8..8953cfda3 100644 --- a/packages/ui-library/src/components/actions/buttons/icon-button/index.test.ts +++ b/packages/ui-library/src/components/actions/buttons/icon-button/index.test.ts @@ -13,7 +13,6 @@ const sampleParams: BlrIconButtonType = { disabled: false, buttonId: 'button-id', variant: 'cta', - loadingStatus: 'Loading', theme: 'Light', }; diff --git a/packages/ui-library/src/components/actions/buttons/icon-button/index.ts b/packages/ui-library/src/components/actions/buttons/icon-button/index.ts index cd3e776a6..0dc9d2031 100644 --- a/packages/ui-library/src/components/actions/buttons/icon-button/index.ts +++ b/packages/ui-library/src/components/actions/buttons/icon-button/index.ts @@ -26,7 +26,6 @@ export class BlrIconButton extends LitElement { @property() buttonId?: string; @property() variant: ActionVariantType = 'primary'; @property() size?: ActionSizesType = 'md'; - @property() loadingStatus!: string; @property() theme: ThemeType = 'Light'; @@ -120,7 +119,6 @@ export class BlrIconButton extends LitElement { ? BlrLoaderRenderFunction({ size: loaderSizeVariant, variant: loaderVariant, - loadingStatus: this.loadingStatus, theme: this.theme, }) : nothing} diff --git a/packages/ui-library/src/components/actions/buttons/text-button/index.stories.ts b/packages/ui-library/src/components/actions/buttons/text-button/index.stories.ts index 84cc7df9f..1d3f5e307 100644 --- a/packages/ui-library/src/components/actions/buttons/text-button/index.stories.ts +++ b/packages/ui-library/src/components/actions/buttons/text-button/index.stories.ts @@ -37,7 +37,6 @@ const defaultParams: BlrTextButtonType = { loading: false, buttonId: 'buttonId', buttonDisplay: 'inline-block', - loadingStatus: '', }; export default { @@ -179,11 +178,6 @@ export default { category: 'Events', }, }, - loadingStatus: { - table: { - disable: true, - }, - }, }, parameters: { design: { diff --git a/packages/ui-library/src/components/actions/buttons/text-button/index.test.ts b/packages/ui-library/src/components/actions/buttons/text-button/index.test.ts index 9208be73b..f2e46d18a 100644 --- a/packages/ui-library/src/components/actions/buttons/text-button/index.test.ts +++ b/packages/ui-library/src/components/actions/buttons/text-button/index.test.ts @@ -15,7 +15,6 @@ const sampleParams: BlrTextButtonType = { disabled: false, buttonId: 'button-id', variant: 'cta', - loadingStatus: 'Loading', theme: 'Light', buttonDisplay: 'inline-block', }; diff --git a/packages/ui-library/src/components/actions/buttons/text-button/index.ts b/packages/ui-library/src/components/actions/buttons/text-button/index.ts index b0fc113d3..9763cab86 100644 --- a/packages/ui-library/src/components/actions/buttons/text-button/index.ts +++ b/packages/ui-library/src/components/actions/buttons/text-button/index.ts @@ -35,7 +35,6 @@ export class BlrTextButton extends LitElement { @property() buttonId?: string; @property() variant: ActionVariantType = 'primary'; @property() size?: ActionSizesType = 'md'; - @property() loadingStatus!: string; @property() buttonDisplay?: ButtonDisplayType = 'inline-block'; // these are not triggered directly but allows us to map it internally and bve typesafe @@ -167,7 +166,6 @@ export class BlrTextButton extends LitElement { ${BlrLoaderRenderFunction({ size: loaderSizeVariant, variant: loaderVariant, - loadingStatus: this.loadingStatus, theme: this.theme, })} ${labelAndIconGroup} diff --git a/packages/ui-library/src/components/feedback/loader/index.stories.ts b/packages/ui-library/src/components/feedback/loader/index.stories.ts index e6436a0c5..51c470148 100644 --- a/packages/ui-library/src/components/feedback/loader/index.stories.ts +++ b/packages/ui-library/src/components/feedback/loader/index.stories.ts @@ -24,7 +24,6 @@ const defaultParams: BlrLoaderType = { theme: 'Light', variant: 'default', size: 'md', - loadingStatus: 'Loading', }; export default { @@ -55,11 +54,6 @@ export default { category: 'Appearance', }, }, - loadingStatus: { - table: { - disable: true, - }, - }, }, parameters: { design: { @@ -101,7 +95,6 @@ export const Variant = () => { theme: 'Light', variant: 'default', size: 'md', - loadingStatus: 'Loading', })} `; }; @@ -116,7 +109,6 @@ export const Inverted = () => { ...defaultParams, variant: 'default', size: 'md', - loadingStatus: 'Loading', })} `; diff --git a/packages/ui-library/src/components/feedback/loader/index.test.ts b/packages/ui-library/src/components/feedback/loader/index.test.ts index 034429d76..83d06c8fb 100644 --- a/packages/ui-library/src/components/feedback/loader/index.test.ts +++ b/packages/ui-library/src/components/feedback/loader/index.test.ts @@ -8,7 +8,6 @@ import { querySelectorDeep } from 'query-selector-shadow-dom'; const sampleParams: BlrLoaderType = { variant: 'default', - loadingStatus: 'Loading', theme: 'Light', }; diff --git a/packages/ui-library/src/components/feedback/loader/index.ts b/packages/ui-library/src/components/feedback/loader/index.ts index 375d96599..70a510656 100644 --- a/packages/ui-library/src/components/feedback/loader/index.ts +++ b/packages/ui-library/src/components/feedback/loader/index.ts @@ -13,8 +13,6 @@ export class BlrLoader extends LitElement { @property() size?: ActionSizesType = 'md'; @property() variant?: FeedbackVariantType; - @property() loadingStatus!: string; - @property() theme: ThemeType = 'Light'; protected render() { @@ -31,7 +29,7 @@ export class BlrLoader extends LitElement { ${dynamicStyles.map((style) => style)}
-
+
`; } } diff --git a/packages/ui-library/src/components/forms/slider/slider-single-value/range-legend-slider/index.ts b/packages/ui-library/src/components/forms/slider/slider-single-value/range-legend-slider/index.ts index cbc2b5ae5..05ad5e241 100644 --- a/packages/ui-library/src/components/forms/slider/slider-single-value/range-legend-slider/index.ts +++ b/packages/ui-library/src/components/forms/slider/slider-single-value/range-legend-slider/index.ts @@ -61,7 +61,6 @@ export class BlrRangeLegendSlider extends LitElement { buttonId: btnId, variant: this.btnVariant, size: this.size, - loadingStatus: 'Loading', theme: this.theme, })}`; diff --git a/packages/ui-library/src/components/forms/slider/slider-single-value/range-slider/index.ts b/packages/ui-library/src/components/forms/slider/slider-single-value/range-slider/index.ts index 6c7d1b2dc..10af7ac4e 100644 --- a/packages/ui-library/src/components/forms/slider/slider-single-value/range-slider/index.ts +++ b/packages/ui-library/src/components/forms/slider/slider-single-value/range-slider/index.ts @@ -66,7 +66,6 @@ export class BlrRangeSlider extends LitElement { buttonId: btnId, variant: this.btnVariant, size: this.size, - loadingStatus: 'Loading', theme: this.theme, })}`; diff --git a/packages/ui-library/src/components/forms/slider/slider-two-values/range-legend-min-max-slider/index.ts b/packages/ui-library/src/components/forms/slider/slider-two-values/range-legend-min-max-slider/index.ts index 6d5d270c3..b921ab95a 100644 --- a/packages/ui-library/src/components/forms/slider/slider-two-values/range-legend-min-max-slider/index.ts +++ b/packages/ui-library/src/components/forms/slider/slider-two-values/range-legend-min-max-slider/index.ts @@ -63,7 +63,6 @@ export class BlrRangeLegendMinMaxSlider extends LitElement { buttonId: btnId, variant: this.btnVariant, size: this.size, - loadingStatus: 'Loading', theme: this.theme, }); diff --git a/packages/ui-library/src/components/forms/slider/slider-two-values/range-min-max-slider/index.ts b/packages/ui-library/src/components/forms/slider/slider-two-values/range-min-max-slider/index.ts index b79fa9c1d..10f1170f9 100644 --- a/packages/ui-library/src/components/forms/slider/slider-two-values/range-min-max-slider/index.ts +++ b/packages/ui-library/src/components/forms/slider/slider-two-values/range-min-max-slider/index.ts @@ -69,7 +69,6 @@ export class BlrRangeMinMaxSlider extends LitElement { buttonId: btnId, variant: this.btnVariant, size: this.size, - loadingStatus: 'Loading', theme: this.theme, })}`; diff --git a/packages/ui-library/src/components/ui/button-group/index.stories.ts b/packages/ui-library/src/components/ui/button-group/index.stories.ts index b9720dc53..c60edee5a 100644 --- a/packages/ui-library/src/components/ui/button-group/index.stories.ts +++ b/packages/ui-library/src/components/ui/button-group/index.stories.ts @@ -84,7 +84,6 @@ export const ButtonGroup = ( theme: 'Light', loading: false, variant: 'primary', - loadingStatus: 'Loading', disabled: false, buttonDisplay: 'inline-block', })} @@ -94,7 +93,6 @@ export const ButtonGroup = ( theme: 'Light', loading: false, variant: 'secondary', - loadingStatus: 'Loading', disabled: false, buttonDisplay: 'inline-block', })} @@ -103,7 +101,6 @@ export const ButtonGroup = ( theme: 'Light', loading: false, variant: 'silent', - loadingStatus: 'Loading', disabled: false, arialabel: 'button_1', icon: 'blr360', diff --git a/packages/ui-library/src/components/ui/button-group/index.test.ts b/packages/ui-library/src/components/ui/button-group/index.test.ts index ef6380059..2e4a6a919 100644 --- a/packages/ui-library/src/components/ui/button-group/index.test.ts +++ b/packages/ui-library/src/components/ui/button-group/index.test.ts @@ -18,7 +18,6 @@ const testContent = BlrTextButtonRenderFunction({ theme: 'Light', loading: false, variant: 'primary', - loadingStatus: 'Loading', disabled: false, }); diff --git a/packages/ui-library/src/components/ui/icon/icon-link/index.stories.ts b/packages/ui-library/src/components/ui/icon/icon-link/index.stories.ts index 9bfa0d9f6..cc6b37fb3 100644 --- a/packages/ui-library/src/components/ui/icon/icon-link/index.stories.ts +++ b/packages/ui-library/src/components/ui/icon/icon-link/index.stories.ts @@ -53,7 +53,6 @@ const args: BlrIconLinkType = { size: 'md', href: '#', target: '_self', - loadingStatus: 'Loading', }; BlrIconLink.args = args; diff --git a/packages/ui-library/src/components/ui/icon/icon-link/index.test.ts b/packages/ui-library/src/components/ui/icon/icon-link/index.test.ts index 35def2c60..429c94a82 100644 --- a/packages/ui-library/src/components/ui/icon/icon-link/index.test.ts +++ b/packages/ui-library/src/components/ui/icon/icon-link/index.test.ts @@ -14,7 +14,6 @@ const sampleParams: BlrIconLinkType = { variant: 'cta', href: '#', target: '_self', - loadingStatus: 'Loading', theme: 'Light', }; diff --git a/packages/ui-library/src/components/ui/icon/icon-link/index.ts b/packages/ui-library/src/components/ui/icon/icon-link/index.ts index d6aabb907..47c17addf 100644 --- a/packages/ui-library/src/components/ui/icon/icon-link/index.ts +++ b/packages/ui-library/src/components/ui/icon/icon-link/index.ts @@ -30,8 +30,6 @@ export class BlrIconLink extends LitElement { @property() variant: ActionVariantType = 'primary'; @property() size?: ActionSizesType = 'md'; @property() loading!: boolean; - @property() loadingStatus!: string; - @property() theme: ThemeType = 'Light'; protected render() { @@ -76,7 +74,6 @@ export class BlrIconLink extends LitElement { ? BlrLoaderRenderFunction({ size: loaderSize, variant: loaderVariant, - loadingStatus: this.loadingStatus, theme: this.theme, }) : BlrIconRenderFunction( diff --git a/packages/ui-library/src/globals/types.ts b/packages/ui-library/src/globals/types.ts index 637d03ef7..d9f3d2da6 100644 --- a/packages/ui-library/src/globals/types.ts +++ b/packages/ui-library/src/globals/types.ts @@ -66,7 +66,6 @@ export type ButtonOption = { label: string; variant: string; size: FormSizesType; - loadingStatus: string; disabled: boolean; buttonId: string; trailingIcon: string;