Skip to content

Commit

Permalink
refactor: move badge from inputs to widgets
Browse files Browse the repository at this point in the history
  • Loading branch information
LHBruneton-C2C committed Feb 4, 2025
1 parent 22b2eb8 commit b36749c
Show file tree
Hide file tree
Showing 15 changed files with 53 additions and 55 deletions.
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
import { CommonModule } from '@angular/common'
import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
import { DatasetRecord } from '@geonetwork-ui/common/domain/model/record'
import { MdViewFacade } from '@geonetwork-ui/feature/record'
import {
FavoriteStarComponent,
SearchService,
} from '@geonetwork-ui/feature/search'
import { getGlobalConfig, getThemeConfig } from '@geonetwork-ui/util/app-config'
import { DatasetRecord } from '@geonetwork-ui/common/domain/model/record'
import { MdViewFacade } from '@geonetwork-ui/feature/record'
import { combineLatest, map } from 'rxjs'
import { TranslateModule, TranslateService } from '@ngx-translate/core'
import {
BadgeComponent,
NavigationButtonComponent,
} from '@geonetwork-ui/ui/inputs'
import { LanguageSwitcherComponent } from '@geonetwork-ui/ui/catalog'
import { CommonModule } from '@angular/common'
import { NavigationButtonComponent } from '@geonetwork-ui/ui/inputs'
import { BadgeComponent } from '@geonetwork-ui/ui/widgets'
import { getGlobalConfig, getThemeConfig } from '@geonetwork-ui/util/app-config'
import { NgIcon, provideIcons } from '@ng-icons/core'
import { matLocationSearchingOutline } from '@ng-icons/material-icons/outline'
import { matArrowBack } from '@ng-icons/material-icons/baseline'
import { matLocationSearchingOutline } from '@ng-icons/material-icons/outline'
import { TranslateModule, TranslateService } from '@ngx-translate/core'
import { combineLatest, map } from 'rxjs'

@Component({
selector: 'datahub-header-record',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
import { CommonModule } from '@angular/common'
import { ChangeDetectionStrategy, Component } from '@angular/core'
import { RouterModule } from '@angular/router'
import { TranslateModule } from '@ngx-translate/core'
import { RecordsRepositoryInterface } from '@geonetwork-ui/common/domain/repository/records-repository.interface'
import { startWith, switchMap } from 'rxjs/operators'
import { BadgeComponent } from '@geonetwork-ui/ui/inputs'
import {
matChatBubbleOutlineOutline,
matLabelOutline,
} from '@ng-icons/material-icons/outline'
import { BadgeComponent } from '@geonetwork-ui/ui/widgets'
import {
NgIconComponent,
provideIcons,
Expand All @@ -22,6 +16,12 @@ import {
iconoirPageEdit,
iconoirUser,
} from '@ng-icons/iconoir'
import {
matChatBubbleOutlineOutline,
matLabelOutline,
} from '@ng-icons/material-icons/outline'
import { TranslateModule } from '@ngx-translate/core'
import { startWith, switchMap } from 'rxjs/operators'

@Component({
selector: 'md-editor-dashboard-menu',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { ComponentFixture, TestBed } from '@angular/core/testing'

import { SearchFiltersSummaryItemComponent } from './search-filters-summary-item.component'
import { BehaviorSubject, firstValueFrom, of } from 'rxjs'
import { MockBuilder, MockComponent, MockProvider } from 'ng-mocks'
import { SearchFacade } from '../state/search.facade'
import { SearchService } from '../utils/service/search.service'
import { FieldFilters } from '@geonetwork-ui/common/domain/model/search'
import { BadgeComponent } from '@geonetwork-ui/ui/inputs'
import { CommonModule, DatePipe } from '@angular/common'
import { FieldFilters } from '@geonetwork-ui/common/domain/model/search'
import { BadgeComponent } from '@geonetwork-ui/ui/widgets'
import { TranslateModule, TranslateService } from '@ngx-translate/core'
import { FieldsService } from '../utils/service/fields.service'
import { MockBuilder, MockComponent, MockProvider } from 'ng-mocks'
import { BehaviorSubject, firstValueFrom, of } from 'rxjs'
import { SearchFacade } from '../state/search.facade'
import { FieldType } from '../utils/service/fields'
import { FieldsService } from '../utils/service/fields.service'
import { SearchService } from '../utils/service/search.service'
import { SearchFiltersSummaryItemComponent } from './search-filters-summary-item.component'

const FIELD_VALUES_FROM_FILTERS_MOCK = {
organization: [],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import { Component, Input, OnInit } from '@angular/core'
import { CommonModule, DatePipe } from '@angular/common'
import { Component, Input, OnInit } from '@angular/core'
import { marker } from '@biesbjerg/ngx-translate-extract-marker'
import { DateRange } from '@geonetwork-ui/api/repository'
import { BadgeComponent } from '@geonetwork-ui/ui/widgets'
import { formatUserInfo } from '@geonetwork-ui/util/shared'
import { TranslateModule, TranslateService } from '@ngx-translate/core'
import {
catchError,
firstValueFrom,
Expand All @@ -8,15 +13,10 @@ import {
of,
switchMap,
} from 'rxjs'
import { BadgeComponent } from '@geonetwork-ui/ui/inputs'
import { TranslateModule, TranslateService } from '@ngx-translate/core'
import { DateRange } from '@geonetwork-ui/api/repository'
import { FieldType, FieldValue } from '../utils/service/fields'
import { SearchFacade } from '../state/search.facade'
import { SearchService } from '../utils/service/search.service'
import { FieldType, FieldValue } from '../utils/service/fields'
import { FieldsService } from '../utils/service/fields.service'
import { formatUserInfo } from '@geonetwork-ui/util/shared'
import { marker } from '@biesbjerg/ngx-translate-extract-marker'
import { SearchService } from '../utils/service/search.service'

marker('search.filters.summaryLabel.user')
marker('search.filters.summaryLabel.changeDate')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ import {
DatasetRecord,
Keyword,
} from '@geonetwork-ui/common/domain/model/record'
import { BadgeComponent } from '@geonetwork-ui/ui/inputs'
import {
ExpandablePanelComponent,
MaxLinesComponent,
} from '@geonetwork-ui/ui/layout'
import { CopyTextButtonComponent } from '@geonetwork-ui/ui/widgets'
import {
BadgeComponent,
CopyTextButtonComponent,
} from '@geonetwork-ui/ui/widgets'
import { getTemporalRangeUnion } from '@geonetwork-ui/util/shared'
import { NgIcon, provideIcons } from '@ng-icons/core'
import { matOpenInNew } from '@ng-icons/material-icons/baseline'
Expand Down
10 changes: 5 additions & 5 deletions libs/ui/elements/src/lib/ui-elements.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import { NgModule } from '@angular/core'
import { FormsModule } from '@angular/forms'
import { MatTooltipModule } from '@angular/material/tooltip'
import { RouterModule } from '@angular/router'
import { TextInputComponent, UiInputsModule } from '@geonetwork-ui/ui/inputs'
import { MaxLinesComponent, UiLayoutModule } from '@geonetwork-ui/ui/layout'
import {
BadgeComponent,
TextInputComponent,
UiInputsModule,
} from '@geonetwork-ui/ui/inputs'
import { MaxLinesComponent, UiLayoutModule } from '@geonetwork-ui/ui/layout'
import { PopoverComponent, UiWidgetsModule } from '@geonetwork-ui/ui/widgets'
PopoverComponent,
UiWidgetsModule,
} from '@geonetwork-ui/ui/widgets'
import { UtilSharedModule } from '@geonetwork-ui/util/shared'
import { provideNgIconsConfig } from '@ng-icons/core'
import { TranslateModule } from '@ngx-translate/core'
Expand Down
1 change: 0 additions & 1 deletion libs/ui/inputs/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
export * from './lib/autocomplete/autocomplete.component'
export * from './lib/badge/badge.component'
export * from './lib/check-toggle/check-toggle.component'
export * from './lib/checkbox/checkbox.component'
export * from './lib/chips-input/chips-input.component'
Expand Down
3 changes: 0 additions & 3 deletions libs/ui/inputs/src/lib/ui-inputs.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import {
import { TranslateModule } from '@ngx-translate/core'
import { TagInputModule } from 'ngx-chips'
import { NgxDropzoneModule } from 'ngx-dropzone'
import { BadgeComponent } from './badge/badge.component'
import { CheckToggleComponent } from './check-toggle/check-toggle.component'
import { CheckboxComponent } from './checkbox/checkbox.component'
import { ChipsInputComponent } from './chips-input/chips-input.component'
Expand Down Expand Up @@ -68,7 +67,6 @@ import { ViewportIntersectorComponent } from './viewport-intersector/viewport-in
DropdownSelectorComponent,
DateRangePickerComponent,
CheckToggleComponent,
BadgeComponent,
NgIconComponent,
],
providers: [
Expand All @@ -93,7 +91,6 @@ import { ViewportIntersectorComponent } from './viewport-intersector/viewport-in
DateRangePickerComponent,
EditableLabelDirective,
ImageInputComponent,
BadgeComponent,
],
})
export class UiInputsModule {}
21 changes: 11 additions & 10 deletions libs/ui/search/src/lib/results-table/results-table.component.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
import {
CdkConnectedOverlay,
CdkOverlayOrigin,
Overlay,
OverlayRef,
} from '@angular/cdk/overlay'
import { TemplatePortal } from '@angular/cdk/portal'
import { CommonModule } from '@angular/common'
import {
ChangeDetectorRef,
Expand All @@ -15,30 +22,24 @@ import {
FieldSort,
SortByField,
} from '@geonetwork-ui/common/domain/model/search'
import { BadgeComponent, UiInputsModule } from '@geonetwork-ui/ui/inputs'
import { UiInputsModule } from '@geonetwork-ui/ui/inputs'
import {
InteractiveTableColumnComponent,
InteractiveTableComponent,
} from '@geonetwork-ui/ui/layout'
import { BadgeComponent } from '@geonetwork-ui/ui/widgets'
import {
FileFormat,
formatUserInfo,
getBadgeColor,
getFileFormat,
getFormatPriority,
} from '@geonetwork-ui/util/shared'
import { TranslateModule } from '@ngx-translate/core'
import { ActionMenuComponent } from './action-menu/action-menu.component'
import { NgIconComponent, provideIcons } from '@ng-icons/core'
import { iconoirUser } from '@ng-icons/iconoir'
import {
CdkConnectedOverlay,
CdkOverlayOrigin,
Overlay,
OverlayRef,
} from '@angular/cdk/overlay'
import { TemplatePortal } from '@angular/cdk/portal'
import { matMoreVert } from '@ng-icons/material-icons/baseline'
import { TranslateModule } from '@ngx-translate/core'
import { ActionMenuComponent } from './action-menu/action-menu.component'

@Component({
selector: 'gn-ui-results-table',
Expand Down
1 change: 1 addition & 0 deletions libs/ui/widgets/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export * from './lib/badge/badge.component'
export * from './lib/button/button.component'
export * from './lib/color-scale/color-scale.component'
export * from './lib/copy-text-button/copy-text-button.component'
Expand Down

0 comments on commit b36749c

Please sign in to comment.