feat(dh): add input to sort dropdown entries by translation key order

libs/dh/esett/feature-metering-gridarea-imbalance/src/lib/filters/dh-filters.component.ts

@@ -94,8 +94,7 @@ export class DhMeteringGridAreaImbalanceFiltersComponent implements OnInit {
 
   gridAreaOptions$ = getGridAreaOptions();
   valuestoIncludeOptions: WattDropdownOptions = dhEnumToWattDropdownOptions(
-    MeteringGridImbalanceValuesToInclude,
-    'asc'
+    MeteringGridImbalanceValuesToInclude
   );
 
   formGroup!: FormGroup<Filters>;

libs/dh/esett/feature-outgoing-messages/src/lib/filters/dh-filters.component.html

@@ -37,6 +37,7 @@
     [chipMode]="true"
     [options]="messageTypeOptions"
     [placeholder]="t('messageType')"
+    sortDirection="asc"
     dhDropdownTranslator
     translateKey="eSett.outgoingMessages.shared.messageType"
   />

libs/dh/esett/feature-outgoing-messages/src/lib/filters/dh-filters.component.ts

@@ -100,11 +100,11 @@ export class DhOutgoingMessagesFiltersComponent implements OnInit {
   filter = output<DhOutgoingMessagesFilters>();
   formReset = output<void>();
 
-  calculationTypeOptions = dhEnumToWattDropdownOptions(ExchangeEventCalculationType, 'asc');
-  messageTypeOptions = dhEnumToWattDropdownOptions(EsettTimeSeriesType, 'asc');
+  calculationTypeOptions = dhEnumToWattDropdownOptions(ExchangeEventCalculationType);
+  messageTypeOptions = dhEnumToWattDropdownOptions(EsettTimeSeriesType);
   gridAreaOptions$ = getGridAreaOptions();
   energySupplierOptions$ = getActorOptions([EicFunction.EnergySupplier]);
-  documentStatusOptions = dhEnumToWattDropdownOptions(DocumentStatus, 'asc');
+  documentStatusOptions = dhEnumToWattDropdownOptions(DocumentStatus);
 
   formGroup!: FormGroup<Filters>;
 

libs/dh/globalization/assets-localization/src/assets/i18n/da.json

@@ -294,8 +294,8 @@
       },
       "statusPlaceholder": "Status",
       "status": {
-        "ACTIVE": "Aktiv",
         "AWAITING": "Afventer",
+        "ACTIVE": "Aktiv",
         "EXPIRED": "Stoppet",
         "CANCELLED": "Annulleret"
       }
@@ -512,8 +512,8 @@
               "E17Consumption": "Forbrug"
             },
             "statusOptions": {
-              "ACTIVE": "Aktiv",
               "AWAITING": "Afventer",
+              "ACTIVE": "Aktiv",
               "EXPIRED": "Udløbet",
               "SOON_TO_EXPIRE": "Udløber snart"
             },
@@ -822,9 +822,9 @@
           "RECEIVED": "Modtaget",
           "AWAITING_DISPATCH": "Afventer afsendelse",
           "AWAITING_REPLY": "Afventer svar fra eSett",
+          "BIZ_TALK_ACCEPTED": "Afventer svar fra ECP",
           "ACCEPTED": "Accepteret",
-          "REJECTED": "Afvist",
-          "BIZ_TALK_ACCEPTED": "Afventer svar fra ECP"
+          "REJECTED": "Afvist"
         }
       },
       "filters": {
@@ -1088,8 +1088,8 @@
       },
       "calculationTypes": {
         "BALANCE_FIXING": "{{wholesale.shared.BALANCE_FIXING}}",
-        "WHOLESALE_FIXING": "{{wholesale.shared.WHOLESALE_FIXING}}",
         "AGGREGATION": "{{wholesale.shared.AGGREGATION}}",
+        "WHOLESALE_FIXING": "{{wholesale.shared.WHOLESALE_FIXING}}",
         "FIRST_CORRECTION_SETTLEMENT": "{{wholesale.shared.FIRST_CORRECTION_SETTLEMENT}}",
         "SECOND_CORRECTION_SETTLEMENT": "{{wholesale.shared.SECOND_CORRECTION_SETTLEMENT}}",
         "THIRD_CORRECTION_SETTLEMENT": "{{wholesale.shared.THIRD_CORRECTION_SETTLEMENT}}",
@@ -1202,12 +1202,12 @@
         "MONTHLY_SUBSCRIPTION": "Abonnement månedssum",
         "MONTHLY_FEE": "Gebyr månedssum",
         "MONTHLY_TARIFF_SUBSCRIPTION_AND_FEE": "Alle månedssummer",
-        "ALL_ENERGY": "Alle",
+        "PRODUCTION": "Produktion",
         "FLEX_CONSUMPTION": "Forbrug (flexafregning)",
         "TOTAL_CONSUMPTION": "Total forbrug",
-        "PRODUCTION": "Produktion",
         "NON_PROFILED_CONSUMPTION": "Forbrug (timeafregning)",
-        "EXCHANGE": "Udveksling"
+        "EXCHANGE": "Udveksling",
+        "ALL_ENERGY": "Alle"
       }
     },
     "settlementReports": {

libs/dh/globalization/assets-localization/src/assets/i18n/en.json

@@ -294,8 +294,8 @@
       },
       "statusPlaceholder": "Status",
       "status": {
-        "ACTIVE": "Active",
         "AWAITING": "Pending",
+        "ACTIVE": "Active",
         "EXPIRED": "Stopped",
         "CANCELLED": "Cancelled"
       }
@@ -513,8 +513,8 @@
               "E17Consumption": "Consumption"
             },
             "statusOptions": {
-              "ACTIVE": "Active",
               "AWAITING": "Awaiting",
+              "ACTIVE": "Active",
               "EXPIRED": "Expired",
               "SOON_TO_EXPIRE": "Soon to expire"
             },
@@ -823,9 +823,9 @@
           "RECEIVED": "Received",
           "AWAITING_DISPATCH": "Awaiting dispatch",
           "AWAITING_REPLY": "Awaiting reply from eSett",
+          "BIZ_TALK_ACCEPTED": "Awaiting reply from ECP",
           "ACCEPTED": "Accepted",
-          "REJECTED": "Rejected",
-          "BIZ_TALK_ACCEPTED": "Awaiting reply from ECP"
+          "REJECTED": "Rejected"
         }
       },
       "filters": {
@@ -1089,8 +1089,8 @@
       },
       "calculationTypes": {
         "BALANCE_FIXING": "{{wholesale.shared.BALANCE_FIXING}}",
-        "WHOLESALE_FIXING": "{{wholesale.shared.WHOLESALE_FIXING}}",
         "AGGREGATION": "{{wholesale.shared.AGGREGATION}}",
+        "WHOLESALE_FIXING": "{{wholesale.shared.WHOLESALE_FIXING}}",
         "FIRST_CORRECTION_SETTLEMENT": "{{wholesale.shared.FIRST_CORRECTION_SETTLEMENT}}",
         "SECOND_CORRECTION_SETTLEMENT": "{{wholesale.shared.SECOND_CORRECTION_SETTLEMENT}}",
         "THIRD_CORRECTION_SETTLEMENT": "{{wholesale.shared.THIRD_CORRECTION_SETTLEMENT}}",
@@ -1203,12 +1203,12 @@
         "MONTHLY_SUBSCRIPTION": "Subscription monthly sum",
         "MONTHLY_FEE": "Fee monthly sum",
         "MONTHLY_TARIFF_SUBSCRIPTION_AND_FEE": "All monthly sums",
-        "ALL_ENERGY": "All",
+        "PRODUCTION": "Production",
         "FLEX_CONSUMPTION": "Flex consumption",
         "TOTAL_CONSUMPTION": "Total consumption",
-        "PRODUCTION": "Production",
         "NON_PROFILED_CONSUMPTION": "Non profiled consumption",
-        "EXCHANGE": "Exchange"
+        "EXCHANGE": "Exchange",
+        "ALL_ENERGY": "All"
       }
     },
     "settlementReports": {

libs/dh/market-participant/actors/feature-actors/src/lib/create/steps/dh-new-actor-step.component.ts

@@ -139,7 +139,7 @@ import { dhMarketParticipantNameMaxLength } from '../../dh-market-participant-na
 export class DhNewActorStepComponent {
   newActorForm = input.required<ActorForm>();
 
-  marketRoleOptions: WattDropdownOptions = dhEnumToWattDropdownOptions(EicFunction, 'asc');
+  marketRoleOptions: WattDropdownOptions = dhEnumToWattDropdownOptions(EicFunction);
   gridAreaOptions = getGridAreaOptions();
 
   showGridAreaOptions = signal(false);

libs/dh/market-participant/actors/feature-actors/src/lib/drawer/balance-responsible-relation-tab/dh-balance-responsible-relation-filter.component.ts

@@ -143,8 +143,7 @@ export class DhBalanceResponsibleRelationFilterComponent implements OnInit {
   balanceResponsibleOptions$ = getActorOptions([EicFunction.BalanceResponsibleParty], 'actorId');
   gridAreaOptions$ = getGridAreaOptions();
   statusOptions: WattDropdownOptions = dhEnumToWattDropdownOptions(
-    BalanceResponsibilityAgreementStatus,
-    'asc'
+    BalanceResponsibilityAgreementStatus
   );
 
   filtersForm = new FormGroup<Filters>({

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<DhActorExte
   }
 
   private getDelegatedProcesses() {
-    return dhEnumToWattDropdownOptions(
-      DelegatedProcess,
-      'asc',
-      this.getDelegatedProcessesToExclude()
-    );
+    return dhEnumToWattDropdownOptions(DelegatedProcess, this.getDelegatedProcessesToExclude());
   }
 
   private getGridAreaOptions(): Observable<WattDropdownOptions> {

libs/dh/market-participant/actors/feature-delegation/src/lib/dh-delegation-tab.component.ts

@@ -98,7 +98,7 @@ export class DhDelegationTabComponent {
   isEmpty = computed(() => this.delegationsRaw().length === 0);
 
   statusControl = new FormControl<ActorDelegationStatus[] | null>(null);
-  statusOptions = dhEnumToWattDropdownOptions(ActorDelegationStatus, 'asc');
+  statusOptions = dhEnumToWattDropdownOptions(ActorDelegationStatus);
 
   constructor() {
     effect(() => this.fetchData(this.actor().id), { allowSignalWrites: true });

libs/dh/market-participant/grid-areas/overview/src/lib/dh-market-participant-gridarea-overview.component.html

@@ -31,6 +31,7 @@ <h3>{{ t("topBarTitle") }}</h3>
 
     <vater-stack align="flex-start" gap="m">
       <watt-dropdown
+        sortDirection="asc"
         dhDropdownTranslator
         translateKey="marketParticipant.gridAreas.types"
         [chipMode]="true"

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<boolean>(false);
   hasError = input<boolean>(false);
 
-  gridAreaTypeOptions = dhEnumToWattDropdownOptions(GridAreaType, 'asc', [GridAreaType.NotSet]);
+  gridAreaTypeOptions = dhEnumToWattDropdownOptions(GridAreaType, [GridAreaType.NotSet]);
 
   selectedGridAreaType = signal<GridAreaType | null>(null);
 

libs/dh/shared/ui-util/src/lib/dh-dropdown-translator.directive.ts

@@ -47,6 +47,10 @@ export class DhDropdownTranslatorDirective implements OnInit {
         displayValue: this.translateDisplayValue(keys[option.value as keyof typeof keys]),
       }));
 
+      // Sort translatedOptions based on the order of the translation keys
+      const keyOrder = Object.keys(keys);
+      translatedOptions.sort((a, b) => keyOrder.indexOf(a.value) - keyOrder.indexOf(b.value));
+
       this.host.options = this.host.sortDirection
         ? this.host.sortOptions(translatedOptions)
         : translatedOptions;

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<T extends object>(
-  enumObj: T,
-  sort: 'asc' | 'desc' | null = null,
-  exclude?: string[]
-) {
+export function dhEnumToWattDropdownOptions<T extends object>(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;
 }

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,
   ]);
 

libs/dh/wholesale/feature-request-calculation/src/lib/dh-wholesale-request-calculation.ts

@@ -168,7 +168,7 @@ export class DhWholesaleRequestCalculationComponent {
   });
 
   calculationTypeOptions = computed(() =>
-    dhEnumToWattDropdownOptions(CalculationType, 'asc', this.excludeCalculationTypes())
+    dhEnumToWattDropdownOptions(CalculationType, this.excludeCalculationTypes())
   );
 
   excludeRequestCalculationDataTypes = computed(() => {
@@ -202,7 +202,6 @@ export class DhWholesaleRequestCalculationComponent {
   requestCalculationDataTypeOptions = computed(() => {
     return dhEnumToWattDropdownOptions(
       RequestCalculationDataType,
-      null,
       this.excludeRequestCalculationDataTypes()
     );
   });

libs/dh/wholesale/feature-settlement-reports/src/lib/modal/dh-request-settlement-report-modal.component.ts

@@ -370,7 +370,7 @@ export class DhRequestSettlementReportModalComponent extends WattTypedModal<Sett
   }
 
   private getCalculationTypeOptions(): WattDropdownOptions {
-    return dhEnumToWattDropdownOptions(CalculationType, null, [
+    return dhEnumToWattDropdownOptions(CalculationType, [
       CalculationType.Aggregation,
       this.modalData.marketRole === EicFunction.SystemOperator ? CalculationType.BalanceFixing : '',
     ]);