diff --git a/libs/dh/market-participant/actors/feature-delegation/src/lib/create/dh-delegation-create-modal.component.ts b/libs/dh/market-participant/actors/feature-delegation/src/lib/create/dh-delegation-create-modal.component.ts index e7cb2894d7..c3e00d3d62 100644 --- a/libs/dh/market-participant/actors/feature-delegation/src/lib/create/dh-delegation-create-modal.component.ts +++ b/libs/dh/market-participant/actors/feature-delegation/src/lib/create/dh-delegation-create-modal.component.ts @@ -169,11 +169,7 @@ export class DhDelegationCreateModalComponent extends WattTypedModal { diff --git a/libs/dh/market-participant/grid-areas/overview/src/lib/dh-market-participant-gridarea-overview.component.ts b/libs/dh/market-participant/grid-areas/overview/src/lib/dh-market-participant-gridarea-overview.component.ts index 29df4030da..dd296ba091 100644 --- a/libs/dh/market-participant/grid-areas/overview/src/lib/dh-market-participant-gridarea-overview.component.ts +++ b/libs/dh/market-participant/grid-areas/overview/src/lib/dh-market-participant-gridarea-overview.component.ts @@ -116,7 +116,7 @@ export class DhMarketParticipantGridAreaOverviewComponent { isLoading = input(false); hasError = input(false); - gridAreaTypeOptions = dhEnumToWattDropdownOptions(GridAreaType, null, [GridAreaType.NotSet]); + gridAreaTypeOptions = dhEnumToWattDropdownOptions(GridAreaType, [GridAreaType.NotSet]); selectedGridAreaType = signal(null); diff --git a/libs/dh/shared/ui-util/src/lib/dh-enum-to-dropdown-options.ts b/libs/dh/shared/ui-util/src/lib/dh-enum-to-dropdown-options.ts index 8c42493125..6016e34c90 100644 --- a/libs/dh/shared/ui-util/src/lib/dh-enum-to-dropdown-options.ts +++ b/libs/dh/shared/ui-util/src/lib/dh-enum-to-dropdown-options.ts @@ -16,24 +16,11 @@ */ import { WattDropdownOptions } from '@energinet-datahub/watt/dropdown'; -export function dhEnumToWattDropdownOptions( - enumObj: T, - sort: 'asc' | 'desc' | null = null, - exclude?: string[] -) { +export function dhEnumToWattDropdownOptions(enumObj: T, exclude?: string[]) { return Object.keys(enumObj) .map((key) => ({ displayValue: key, value: Object.values(enumObj)[Object.keys(enumObj).indexOf(key)], })) - .sort((a, b) => { - if (sort === null) return 0; - - if (sort === 'asc') { - return a.displayValue.localeCompare(b.displayValue); - } else { - return b.displayValue.localeCompare(a.displayValue); - } - }) .filter(({ value }) => !exclude?.includes(value)) as WattDropdownOptions; } diff --git a/libs/dh/wholesale/feature-calculations/src/lib/filters/filters.component.ts b/libs/dh/wholesale/feature-calculations/src/lib/filters/filters.component.ts index 7b34c2c91a..8f47b0c690 100644 --- a/libs/dh/wholesale/feature-calculations/src/lib/filters/filters.component.ts +++ b/libs/dh/wholesale/feature-calculations/src/lib/filters/filters.component.ts @@ -142,7 +142,7 @@ export class DhCalculationsFiltersComponent implements OnInit { calculationTypesOptions = dhEnumToWattDropdownOptions(CalculationType); executionTypeOptions = dhEnumToWattDropdownOptions(CalculationExecutionType); gridAreaOptions$ = getGridAreaOptions(); - executionStateOptions = dhEnumToWattDropdownOptions(CalculationOrchestrationState, null, [ + executionStateOptions = dhEnumToWattDropdownOptions(CalculationOrchestrationState, [ CalculationOrchestrationState.ActorMessagesEnqueued, ]);