From 3f66667a81564a2fae48ccd5cf04306ea43febcc Mon Sep 17 00:00:00 2001 From: Nils Petter Fremming Date: Sat, 17 Aug 2024 10:53:02 +0200 Subject: [PATCH] Make static --- .../base/commands/BaseFilterCommand.ts | 38 +++++++++---------- .../components/Architecture/FilterButton.tsx | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/react-components/src/architecture/base/commands/BaseFilterCommand.ts b/react-components/src/architecture/base/commands/BaseFilterCommand.ts index 2079acb1a16..97fa3f8553c 100644 --- a/react-components/src/architecture/base/commands/BaseFilterCommand.ts +++ b/react-components/src/architecture/base/commands/BaseFilterCommand.ts @@ -91,40 +91,40 @@ export abstract class BaseFilterCommand extends RenderTargetCommand { public getSelectedLabel(translate: TranslateDelegate): string { if (this._children === undefined) { - return getNoneLabel(translate); + return BaseFilterCommand.getNoneString(translate); } const selected = this._children.filter((child) => child.isChecked); const counter = selected.length; if (counter === 0) { - return getNoneLabel(translate); + return BaseFilterCommand.getNoneString(translate); } if (counter === this._children.length) { - return getAllLabel(translate); + return BaseFilterCommand.getAllString(translate); } if (counter === 1) { return selected[0].getLabel(translate); } - return counter.toString() + ' ' + getSelectedLabel(translate); + return counter.toString() + ' ' + BaseFilterCommand.getSelectedString(translate); } -} -export abstract class BaseFilterItemCommand extends RenderTargetCommand { - public abstract get color(): Color | undefined; - public abstract setChecked(value: boolean): void; -} + // ================================================== + // STATIC METHODS + // ================================================== -// ================================================== -// PRIVATE FUNCTIONS -// ================================================== + public static getAllString(translate: TranslateDelegate): string { + return translate('ALL', 'All'); + } -function getAllLabel(translate: TranslateDelegate): string { - return translate('ALL', 'All'); -} + private static getNoneString(translate: TranslateDelegate): string { + return translate('NONE', 'None'); + } -function getNoneLabel(translate: TranslateDelegate): string { - return translate('NONE', 'None'); + private static getSelectedString(translate: TranslateDelegate): string { + return translate('SELECTED', 'Selected'); + } } -function getSelectedLabel(translate: TranslateDelegate): string { - return translate('SELECTED', 'Selected'); +export abstract class BaseFilterItemCommand extends RenderTargetCommand { + public abstract get color(): Color | undefined; + public abstract setChecked(value: boolean): void; } diff --git a/react-components/src/components/Architecture/FilterButton.tsx b/react-components/src/components/Architecture/FilterButton.tsx index 56c87d5e9a7..d46cec944d0 100644 --- a/react-components/src/components/Architecture/FilterButton.tsx +++ b/react-components/src/components/Architecture/FilterButton.tsx @@ -125,7 +125,7 @@ export const FilterButton = ({ onClick={() => { command.toggleAllChecked(); }}> - {command.getAllLabel(t)} + {BaseFilterCommand.getAllString(t)} {children.map((child, _index): ReactElement => {