fix: default values, minWidth and Input name

geonetwork · Jul 18, 2023 · 5e8bc26 · 5e8bc26
1 parent f80282b
commit 5e8bc26
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/libs/feature/dataviz/src/lib/chart-view/chart-view.component.html b/libs/feature/dataviz/src/lib/chart-view/chart-view.component.html
@@ -5,15 +5,15 @@
     <gn-ui-dropdown-selector
       class="basis-1/4 grow"
       [choices]="typeChoices"
-      [extraClass]="'secondary min-w-full'"
+      [extraBtnClass]="'secondary min-w-full'"
       (selectValue)="chartType$.next($event)"
       [selected]="chartType$.value"
       [title]="'chart.dropdown.type' | translate"
     ></gn-ui-dropdown-selector>
     <gn-ui-dropdown-selector
       class="basis-1/4 grow"
       [choices]="xChoices$ | async"
-      [extraClass]="'secondary min-w-full'"
+      [extraBtnClass]="'secondary min-w-full'"
       (selectValue)="xProperty$.next($event)"
       [selected]="xProperty$.value"
       [title]="'chart.dropdown.xProperty' | translate"

diff --git a/libs/feature/dataviz/src/lib/feature-dataviz.module.ts b/libs/feature/dataviz/src/lib/feature-dataviz.module.ts
@@ -14,7 +14,6 @@ import { ChartViewComponent } from './chart-view/chart-view.component'
 import { TranslateModule } from '@ngx-translate/core'
 import { UiWidgetsModule } from '@geonetwork-ui/ui/widgets'
 import { UiInputsModule } from '@geonetwork-ui/ui/inputs'
-import { OverlayModule } from '@angular/cdk/overlay'
 
 @NgModule({
   imports: [
@@ -26,7 +25,6 @@ import { OverlayModule } from '@angular/cdk/overlay'
     UiWidgetsModule,
     TranslateModule,
     ChartComponent,
-    OverlayModule,
     UiInputsModule,
   ],
   declarations: [

diff --git a/libs/feature/editor/src/lib/components/wizard-field/wizard-field.component.html b/libs/feature/editor/src/lib/components/wizard-field/wizard-field.component.html
@@ -64,7 +64,7 @@
         #dropdown
         [id]="wizardFieldConfig.id"
         [title]="''"
-        [extraClass]="'secondary min-w-full'"
+        [extraBtnClass]="'secondary min-w-full'"
         [showTitle]="false"
         [choices]="dropdownChoices"
         [selected]="wizardFieldData"

diff --git a/libs/feature/record/src/lib/data-view/data-view.component.html b/libs/feature/record/src/lib/data-view/data-view.component.html
@@ -3,7 +3,7 @@
     *ngIf="dropdownChoices$ | async as choices"
     [title]="'table.select.data' | translate"
     class="mb-7 w-auto ml-auto"
-    extraClass="!text-primary font-sans font-medium"
+    extraBtnClass="!text-primary font-sans font-medium"
     [choices]="choices"
     (selectValue)="selectLink($event)"
   ></gn-ui-dropdown-selector>

diff --git a/libs/feature/record/src/lib/map-view/map-view.component.html b/libs/feature/record/src/lib/map-view/map-view.component.html
@@ -1,7 +1,7 @@
 <div class="w-full h-full flex flex-col p-1">
   <div class="flex w-full justify-end mb-7 mt-1">
     <gn-ui-dropdown-selector
-      extraClass="!text-primary font-sans font-medium"
+      extraBtnClass="!text-primary font-sans font-medium"
       [title]="'map.select.layer' | translate"
       [choices]="dropdownChoices$ | async"
       (selectValue)="selectLinkToDisplay($event)"

diff --git a/libs/ui/catalog/src/lib/organisations-sort/organisations-sort.component.html b/libs/ui/catalog/src/lib/organisations-sort/organisations-sort.component.html
@@ -9,6 +9,7 @@
       [title]="'organisation.sort.sortBy' | translate"
       class="shrink"
       [choices]="choices"
+      [minWidth]="'180px'"
       [showTitle]="true"
       (selectValue)="selectOrderToDisplay($event)"
     ></gn-ui-dropdown-selector>

diff --git a/libs/ui/inputs/src/lib/dropdown-selector/dropdown-selector.component.html b/libs/ui/inputs/src/lib/dropdown-selector/dropdown-selector.component.html
@@ -1,6 +1,5 @@
 <div
   class="flex items-start flex-col sm:flex-row sm:items-center relative w-full"
-  *ngIf="choices"
 >
   <span
     *ngIf="showTitle"
@@ -11,8 +10,9 @@
   </span>
   <gn-ui-button
     type="outline"
-    class="grow min-w-[165px]"
-    extraClass="w-full !p-[8px] !pl-[16px] {{ extraClass }}"
+    class="grow"
+    style="min-width: {{ minWidth }}"
+    extraClass="w-full !p-[8px] !pl-[16px] {{ extraBtnClass }}"
     [title]="title"
     [attr.aria-owns]="id"
     (buttonClick)="openOverlay()"

diff --git a/libs/ui/inputs/src/lib/dropdown-selector/dropdown-selector.component.ts b/libs/ui/inputs/src/lib/dropdown-selector/dropdown-selector.component.ts
@@ -34,7 +34,8 @@ export class DropdownSelectorComponent implements OnInit {
   @Input() choices: DDChoices<unknown>
   @Input() selected: any
   @Input() maxRows: number
-  @Input() extraClass = ''
+  @Input() extraBtnClass = ''
+  @Input() minWidth = ''
   @Output() selectValue = new EventEmitter<any>()
   @ViewChild('overlayOrigin') overlayOrigin: CdkOverlayOrigin
   @ViewChild(CdkConnectedOverlay) overlay: CdkConnectedOverlay
@@ -69,14 +70,14 @@ export class DropdownSelectorComponent implements OnInit {
   }
 
   getChoiceLabel(): string {
-    return (
-      this.selectedChoice.label.substring(0, 50) +
-      (this.selectedChoice.label.length > 50 ? '...' : '')
-    )
+    return this.selectedChoice?.label
   }
 
   ngOnInit(): void {
     if (!this.maxRows) this.maxRows = DEFAULT_ROW_NUMBERS
+    if (!this.choices || this.choices.length === 0) {
+      this.choices = []
+    }
   }
 
   isSelected(choice) {