diff --git a/apps/agora/app/src/app/myPrimeNGPreset.ts b/apps/agora/app/src/app/myPrimeNGPreset.ts index dd1be5e4c..bd5cdc8d5 100644 --- a/apps/agora/app/src/app/myPrimeNGPreset.ts +++ b/apps/agora/app/src/app/myPrimeNGPreset.ts @@ -4074,11 +4074,11 @@ export const MyPreset = definePreset(Lara, { paddingY: '{form.field.padding.y}', borderRadius: '{form.field.border.radius}', focusRing: { - width: '{form.field.focus.ring.width}', - style: '{form.field.focus.ring.style}', - color: '{form.field.focus.ring.color}', - offset: '{form.field.focus.ring.offset}', - shadow: '{form.field.focus.ring.shadow}', + width: '0', + style: 'none', + color: 'transparent', + offset: '0', + shadow: 'none', }, transitionDuration: '{form.field.transition.duration}', sm: { diff --git a/libs/agora/gene-comparison-tool/src/lib/components/gene-comparison-tool-how-to-panel/gene-comparison-tool-how-to-panel.component.html b/libs/agora/gene-comparison-tool/src/lib/components/gene-comparison-tool-how-to-panel/gene-comparison-tool-how-to-panel.component.html index f0d7770c1..c24757b94 100644 --- a/libs/agora/gene-comparison-tool/src/lib/components/gene-comparison-tool-how-to-panel/gene-comparison-tool-how-to-panel.component.html +++ b/libs/agora/gene-comparison-tool/src/lib/components/gene-comparison-tool-how-to-panel/gene-comparison-tool-how-to-panel.component.html @@ -28,12 +28,12 @@
@if (activePane > 0) { } @if (activePane !== panes.length - 1) { } @if (activePane === panes.length - 1) { diff --git a/libs/agora/gene-comparison-tool/src/lib/components/gene-comparison-tool-how-to-panel/gene-comparison-tool-how-to-panel.component.ts b/libs/agora/gene-comparison-tool/src/lib/components/gene-comparison-tool-how-to-panel/gene-comparison-tool-how-to-panel.component.ts index d6166ee94..eae146c7f 100644 --- a/libs/agora/gene-comparison-tool/src/lib/components/gene-comparison-tool-how-to-panel/gene-comparison-tool-how-to-panel.component.ts +++ b/libs/agora/gene-comparison-tool/src/lib/components/gene-comparison-tool-how-to-panel/gene-comparison-tool-how-to-panel.component.ts @@ -1,14 +1,16 @@ // -------------------------------------------------------------------------- // // External // -------------------------------------------------------------------------- // +import { CommonModule } from '@angular/common'; import { Component, inject, OnInit, ViewEncapsulation } from '@angular/core'; -import { CookieService } from 'ngx-cookie-service'; +import { FormsModule } from '@angular/forms'; import { DomSanitizer, SafeHtml } from '@angular/platform-browser'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; +import { faAngleLeft, faAngleRight } from '@fortawesome/free-solid-svg-icons'; +import { LoadingIconComponent } from '@sagebionetworks/agora/shared'; +import { CookieService } from 'ngx-cookie-service'; import { CheckboxModule } from 'primeng/checkbox'; import { DialogModule } from 'primeng/dialog'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { LoadingIconComponent } from '@sagebionetworks/agora/shared'; // -------------------------------------------------------------------------- // // Internal @@ -25,7 +27,14 @@ interface Pane { // -------------------------------------------------------------------------- // @Component({ selector: 'agora-gene-comparison-tool-how-to-panel', - imports: [CommonModule, FormsModule, CheckboxModule, DialogModule, LoadingIconComponent], + imports: [ + CommonModule, + FormsModule, + CheckboxModule, + DialogModule, + FontAwesomeModule, + LoadingIconComponent, + ], providers: [CookieService], templateUrl: './gene-comparison-tool-how-to-panel.component.html', styleUrls: ['./gene-comparison-tool-how-to-panel.component.scss'], @@ -38,6 +47,8 @@ export class GeneComparisonToolHowToPanelComponent implements OnInit { isActive = false; willHide = false; willHideCookieName = 'gct_hide_how_to'; + faAngleRight = faAngleRight; + faAngleLeft = faAngleLeft; panes: Pane[] = [ { diff --git a/libs/agora/gene-comparison-tool/src/lib/gene-comparison-tool.component.html b/libs/agora/gene-comparison-tool/src/lib/gene-comparison-tool.component.html index 2a6abadd6..300906e91 100644 --- a/libs/agora/gene-comparison-tool/src/lib/gene-comparison-tool.component.html +++ b/libs/agora/gene-comparison-tool/src/lib/gene-comparison-tool.component.html @@ -8,9 +8,10 @@
- +

Gene Comparison Tool

- +
@@ -103,11 +106,11 @@

Gene Comparison Tool

- + >
Gene Comparison Tool
{{ subCategoryLabel }}
- + >
diff --git a/libs/agora/gene-comparison-tool/src/lib/gene-comparison-tool.component.scss b/libs/agora/gene-comparison-tool/src/lib/gene-comparison-tool.component.scss index cf6c867f6..7ae14fdfa 100644 --- a/libs/agora/gene-comparison-tool/src/lib/gene-comparison-tool.component.scss +++ b/libs/agora/gene-comparison-tool/src/lib/gene-comparison-tool.component.scss @@ -128,28 +128,24 @@ font-weight: 900; } - .p-dropdown { + .p-select { padding: 0; border: none; background-color: transparent; - .p-dropdown-label { + .p-select-label { padding-left: 0; font-size: 14px; font-weight: 400; color: var(--color-text); } - .p-dropdown-trigger { - margin-left: 8px; - } - - .p-dropdown-trigger-icon { + .p-select-dropdown-icon { font-size: 14px; color: var(--color-text); } - .p-dropdown-panel { + .p-select-list-container { background-color: #fff; box-shadow: 0 1px 10px 0 rgb(0 0 0 / 15%); border-radius: 5px; @@ -195,7 +191,7 @@ } &:hover { - .p-dropdown-trigger-icon { + .p-select-dropdown-icon { color: var(--color-action-primary); } } @@ -226,12 +222,12 @@ } } - .p-dropdown-label { + .p-select-label { text-transform: uppercase; font-weight: 700 !important; } - .p-dropdown-panel { + .p-select-panel { ul { li { span { diff --git a/libs/agora/gene-comparison-tool/src/lib/gene-comparison-tool.component.ts b/libs/agora/gene-comparison-tool/src/lib/gene-comparison-tool.component.ts index 704920aca..dfc5e3137 100644 --- a/libs/agora/gene-comparison-tool/src/lib/gene-comparison-tool.component.ts +++ b/libs/agora/gene-comparison-tool/src/lib/gene-comparison-tool.component.ts @@ -26,42 +26,44 @@ import { import { HelperService } from '@sagebionetworks/agora/services'; import { cloneDeep } from 'lodash'; import { FilterService, MessageService, SortEvent } from 'primeng/api'; +import { ButtonModule } from 'primeng/button'; import { Table, TableModule } from 'primeng/table'; import { TooltipModule } from 'primeng/tooltip'; import { combineLatest, Subscription } from 'rxjs'; -import * as variables from './gene-comparison-tool.variables'; import * as helpers from './gene-comparison-tool.helpers'; +import * as variables from './gene-comparison-tool.variables'; -import { GeneComparisonToolScorePanelComponent as ScorePanelComponent } from './components/gene-comparison-tool-score-panel/gene-comparison-tool-score-panel.component'; import { GeneComparisonToolDetailsPanelComponent as DetailsPanelComponent } from './components/gene-comparison-tool-details-panel/gene-comparison-tool-details-panel.component'; import { GeneComparisonToolFilterPanelComponent as FilterPanelComponent } from './components/gene-comparison-tool-filter-panel/gene-comparison-tool-filter-panel.component'; import { GeneComparisonToolPinnedGenesModalComponent as PinnedGenesModalComponent } from './components/gene-comparison-tool-pinned-genes-modal/gene-comparison-tool-pinned-genes-modal.component'; +import { GeneComparisonToolScorePanelComponent as ScorePanelComponent } from './components/gene-comparison-tool-score-panel/gene-comparison-tool-score-panel.component'; -import { GeneComparisonToolScorePanelComponent } from './components/gene-comparison-tool-score-panel/gene-comparison-tool-score-panel.component'; import { GeneComparisonToolDetailsPanelComponent } from './components/gene-comparison-tool-details-panel/gene-comparison-tool-details-panel.component'; import { GeneComparisonToolFilterPanelComponent } from './components/gene-comparison-tool-filter-panel/gene-comparison-tool-filter-panel.component'; import { GeneComparisonToolPinnedGenesModalComponent } from './components/gene-comparison-tool-pinned-genes-modal/gene-comparison-tool-pinned-genes-modal.component'; +import { GeneComparisonToolScorePanelComponent } from './components/gene-comparison-tool-score-panel/gene-comparison-tool-score-panel.component'; -import { DropdownModule } from 'primeng/dropdown'; +import { FormsModule } from '@angular/forms'; +import { OverlayPanelLinkComponent } from '@sagebionetworks/agora/genes'; +import { LoadingIconComponent, SvgIconComponent } from '@sagebionetworks/agora/shared'; import { InputSwitchModule } from 'primeng/inputswitch'; import { OverlayPanelModule } from 'primeng/overlaypanel'; -import { FormsModule } from '@angular/forms'; +import { SelectModule } from 'primeng/select'; +import { GeneComparisonToolFilterListComponent } from './components/gene-comparison-tool-filter-list/gene-comparison-tool-filter-list.component'; import { GeneComparisonToolHowToPanelComponent } from './components/gene-comparison-tool-how-to-panel/gene-comparison-tool-how-to-panel.component'; import { GeneComparisonToolLegendPanelComponent } from './components/gene-comparison-tool-legend-panel/gene-comparison-tool-legend-panel.component'; -import { GeneComparisonToolFilterListComponent } from './components/gene-comparison-tool-filter-list/gene-comparison-tool-filter-list.component'; -import { OverlayPanelLinkComponent } from '@sagebionetworks/agora/genes'; -import { LoadingIconComponent, SvgIconComponent } from '@sagebionetworks/agora/shared'; @Component({ selector: 'agora-gene-comparison-tool', imports: [ CommonModule, + ButtonModule, FormsModule, RouterModule, TableModule, TooltipModule, - DropdownModule, + SelectModule, InputSwitchModule, OverlayPanelLinkComponent, OverlayPanelModule, diff --git a/libs/agora/genes/src/lib/components/download-dom-image/download-dom-image.component.html b/libs/agora/genes/src/lib/components/download-dom-image/download-dom-image.component.html index 5501119c0..9b429f99b 100644 --- a/libs/agora/genes/src/lib/components/download-dom-image/download-dom-image.component.html +++ b/libs/agora/genes/src/lib/components/download-dom-image/download-dom-image.component.html @@ -1,6 +1,6 @@ - +
-
- + - + > +
- +
{{ error }}
diff --git a/libs/agora/genes/src/lib/components/download-dom-image/download-dom-image.component.scss b/libs/agora/genes/src/lib/components/download-dom-image/download-dom-image.component.scss index 2863d66eb..a475b3683 100644 --- a/libs/agora/genes/src/lib/components/download-dom-image/download-dom-image.component.scss +++ b/libs/agora/genes/src/lib/components/download-dom-image/download-dom-image.component.scss @@ -10,6 +10,10 @@ .download-dom-image-panel { margin-top: 5px; + .download-dom-image-option { + display: flex; + } + .p-overlaypanel-content { width: 290px; padding: 25px; diff --git a/libs/agora/genes/src/lib/components/gene-details/gene-details.component.html b/libs/agora/genes/src/lib/components/gene-details/gene-details.component.html index 9126ad771..7ca975bfb 100644 --- a/libs/agora/genes/src/lib/components/gene-details/gene-details.component.html +++ b/libs/agora/genes/src/lib/components/gene-details/gene-details.component.html @@ -8,7 +8,7 @@ class="gene-details-nav-scroll gene-details-nav-scroll-prev" (click)="slideNavigation(-1)" > - + }
@@ -54,7 +54,7 @@ class="gene-details-nav-scroll gene-details-nav-scroll-next" (click)="slideNavigation(1)" > - + }
diff --git a/libs/agora/genes/src/lib/components/gene-details/gene-details.component.ts b/libs/agora/genes/src/lib/components/gene-details/gene-details.component.ts index af19b6396..d13958b41 100644 --- a/libs/agora/genes/src/lib/components/gene-details/gene-details.component.ts +++ b/libs/agora/genes/src/lib/components/gene-details/gene-details.component.ts @@ -1,25 +1,27 @@ /* eslint-disable @typescript-eslint/no-this-alias */ +import { CommonModule, Location } from '@angular/common'; import { - Component, - OnInit, + AfterViewChecked, AfterViewInit, + Component, HostListener, inject, - AfterViewChecked, + OnInit, } from '@angular/core'; import { ActivatedRoute, ParamMap, Router } from '@angular/router'; -import { CommonModule, Location } from '@angular/common'; -import { HelperService } from '@sagebionetworks/agora/services'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; +import { faAngleLeft, faAngleRight } from '@fortawesome/free-solid-svg-icons'; import { Gene, GenesService } from '@sagebionetworks/agora/api-client-angular'; -import { GeneSoeComponent } from '../gene-soe/gene-soe.component'; -import { GeneHeroComponent } from '../gene-hero/gene-hero.component'; -import { GeneEvidenceRnaComponent } from '../gene-evidence-rna/gene-evidence-rna.component'; -import { GeneResourcesComponent } from '../gene-resources/gene-resources.component'; -import { GeneEvidenceProteomicsComponent } from '../gene-evidence-proteomics/gene-evidence-proteomics.component'; +import { HelperService } from '@sagebionetworks/agora/services'; import { GeneEvidenceMetabolomicsComponent } from '../gene-evidence-metabolomics/gene-evidence-metabolomics.component'; +import { GeneEvidenceProteomicsComponent } from '../gene-evidence-proteomics/gene-evidence-proteomics.component'; +import { GeneEvidenceRnaComponent } from '../gene-evidence-rna/gene-evidence-rna.component'; import { ExperimentalValidationComponent } from '../gene-experimental-validation/gene-experimental-validation.component'; +import { GeneHeroComponent } from '../gene-hero/gene-hero.component'; import { GeneNominationsComponent } from '../gene-nominations/gene-nominations.component'; +import { GeneResourcesComponent } from '../gene-resources/gene-resources.component'; +import { GeneSoeComponent } from '../gene-soe/gene-soe.component'; interface Panel { name: string; @@ -40,6 +42,7 @@ interface Panel { ExperimentalValidationComponent, GeneNominationsComponent, GeneResourcesComponent, + FontAwesomeModule, ], providers: [HelperService, GenesService], templateUrl: './gene-details.component.html', @@ -52,6 +55,9 @@ export class GeneDetailsComponent implements OnInit, AfterViewInit, AfterViewChe helperService = inject(HelperService); geneService = inject(GenesService); + faAngleRight = faAngleRight; + faAngleLeft = faAngleLeft; + gene: Gene | undefined; panels: Panel[] = [ diff --git a/libs/agora/genes/src/lib/components/gene-model-selector/gene-model-selector.component.html b/libs/agora/genes/src/lib/components/gene-model-selector/gene-model-selector.component.html index f12e0ca84..53fb2210d 100644 --- a/libs/agora/genes/src/lib/components/gene-model-selector/gene-model-selector.component.html +++ b/libs/agora/genes/src/lib/components/gene-model-selector/gene-model-selector.component.html @@ -1,9 +1,10 @@
- + fluid="true" + >
diff --git a/libs/agora/genes/src/lib/components/gene-model-selector/gene-model-selector.component.ts b/libs/agora/genes/src/lib/components/gene-model-selector/gene-model-selector.component.ts index 98ce87518..1b60c58f0 100644 --- a/libs/agora/genes/src/lib/components/gene-model-selector/gene-model-selector.component.ts +++ b/libs/agora/genes/src/lib/components/gene-model-selector/gene-model-selector.component.ts @@ -1,8 +1,8 @@ -import { Component, Input, Output, EventEmitter, OnInit, inject } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output, inject } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; import { removeParenthesis } from '@sagebionetworks/agora/util'; -import { DropdownModule } from 'primeng/dropdown'; +import { SelectModule } from 'primeng/select'; interface Option { name: string; @@ -11,7 +11,7 @@ interface Option { @Component({ selector: 'agora-gene-model-selector', - imports: [FormsModule, DropdownModule], + imports: [FormsModule, SelectModule], templateUrl: './gene-model-selector.component.html', styleUrls: ['./gene-model-selector.component.scss'], }) diff --git a/libs/agora/genes/src/lib/components/gene-protein-selector/gene-protein-selector.component.html b/libs/agora/genes/src/lib/components/gene-protein-selector/gene-protein-selector.component.html index da8c184d2..25ecd387e 100644 --- a/libs/agora/genes/src/lib/components/gene-protein-selector/gene-protein-selector.component.html +++ b/libs/agora/genes/src/lib/components/gene-protein-selector/gene-protein-selector.component.html @@ -1,9 +1,10 @@
- + fluid="true" + >
diff --git a/libs/agora/genes/src/lib/components/gene-protein-selector/gene-protein-selector.component.ts b/libs/agora/genes/src/lib/components/gene-protein-selector/gene-protein-selector.component.ts index c2e2b2145..908cd8a55 100644 --- a/libs/agora/genes/src/lib/components/gene-protein-selector/gene-protein-selector.component.ts +++ b/libs/agora/genes/src/lib/components/gene-protein-selector/gene-protein-selector.component.ts @@ -1,6 +1,6 @@ -import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { DropdownModule } from 'primeng/dropdown'; +import { SelectModule } from 'primeng/select'; interface Option { name: string; @@ -9,7 +9,7 @@ interface Option { @Component({ selector: 'agora-gene-protein-selector', - imports: [FormsModule, DropdownModule], + imports: [FormsModule, SelectModule], templateUrl: './gene-protein-selector.component.html', styleUrls: ['./gene-protein-selector.component.scss'], }) diff --git a/libs/agora/shared/src/lib/modal-link/modal-link.component.scss b/libs/agora/shared/src/lib/modal-link/modal-link.component.scss index 6ad1d8990..c93901061 100644 --- a/libs/agora/shared/src/lib/modal-link/modal-link.component.scss +++ b/libs/agora/shared/src/lib/modal-link/modal-link.component.scss @@ -1,7 +1,7 @@ @import 'libs/agora/styles/src/lib/variables'; @import 'libs/agora/styles/src/lib/mixins'; -modal-link, +agora-modal-link, .modal-link { display: inline-block; } diff --git a/libs/agora/styles/src/lib/components/_dropdown.scss b/libs/agora/styles/src/lib/components/_dropdown.scss index c528b4fb2..2ce8f18d8 100644 --- a/libs/agora/styles/src/lib/components/_dropdown.scss +++ b/libs/agora/styles/src/lib/components/_dropdown.scss @@ -1,10 +1,10 @@ -div.p-dropdown { +div.p-select { display: flex; padding: 12px 20px 12px 30px; background-color: var(--color-gray-100); border: 1px solid var(--color-gray-300); - .p-dropdown-panel { + .p-select-list-container { border: 1px solid var(--color-gray-300); background-color: #fff; border-radius: 0 0 5px 5px; @@ -20,12 +20,12 @@ div.p-dropdown { } } - .p-dropdown-trigger { + .p-select-dropdown { margin-left: 30px; } &:hover { - .p-dropdown-trigger-icon { + .p-select-dropdown-icon { color: var(--color-action-primary); } } diff --git a/libs/agora/styles/src/lib/components/_radio.scss b/libs/agora/styles/src/lib/components/_radio.scss index ba6d5495f..7c2e191cf 100644 --- a/libs/agora/styles/src/lib/components/_radio.scss +++ b/libs/agora/styles/src/lib/components/_radio.scss @@ -50,6 +50,10 @@ p-radiobutton { } } + /* + In PrimeNG v19, the radiobutton label does not have this class and is not a child of p-radiobutton, + so this style does not apply to the label. TODO: move this style into the preset. + */ .p-radiobutton-label { font-size: 16px; color: var(--color-text); diff --git a/libs/agora/styles/src/lib/components/_typography.scss b/libs/agora/styles/src/lib/components/_typography.scss index 895ed6b95..efac725b3 100644 --- a/libs/agora/styles/src/lib/components/_typography.scss +++ b/libs/agora/styles/src/lib/components/_typography.scss @@ -30,23 +30,23 @@ h3, h4, h5, h6 { - download-dom-image { + agora-download-dom-image { float: right; } - modal-link { + agora-modal-link { float: right; } } h2 { - modal-link { + agora-modal-link { transform: translateY(-3px); } } h3 { - download-dom-image { + agora-download-dom-image { transform: translateY(-4px); } }