Merge pull request #1309 from Sage-Bionetworks/develop

AG-1338: 3.4.0 RC to staging
Sage-Bionetworks · May 16, 2024 · 5f1a19a · 5f1a19a
2 parents 763ad14 + a52fd96
commit 5f1a19a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/app/features/genes/components/gene-comparison-tool/gene-comparison-tool.component.html b/src/app/features/genes/components/gene-comparison-tool/gene-comparison-tool.component.html
@@ -343,7 +343,7 @@ <h1 class="gct-heading h2">Gene Comparison Tool</h1>
                       <div>
                         <button
                           (click)="onUnPinGeneClick(gene)"
-                          pTooltip="Unpin this gene"
+                          pTooltip="Unpin this row"
                           tooltipPosition="top"
                           tooltipStyleClass="tooltip"
                         >
@@ -410,7 +410,7 @@ <h1 class="gct-heading h2">Gene Comparison Tool</h1>
                     (click)="onPinAllClick()"
                     [pTooltip]="
                       getPinDisabledStatus()
-                        ? 'You have already pinned the maximum number of Ensembl identifiers (' +
+                        ? 'You have already pinned the maximum number of genes (' +
                           maxPinnedGenes +
                           '). You must unpin some genes before you can pin more.'
                         : 'Pin all matching rows to the top.'
@@ -478,7 +478,7 @@ <h1 class="gct-heading h2">Gene Comparison Tool</h1>
                           }"
                           [pTooltip]="
                             getPinDisabledStatus()
-                              ? 'You have already pinned the maximum number of Ensembl identifiers (' +
+                              ? 'You have already pinned the maximum number of genes (' +
                                 maxPinnedGenes +
                                 '). You must unpin some genes before you can pin more.'
                               : 'Pin this row to the top of the list'

diff --git a/src/app/features/genes/components/gene-comparison-tool/gene-comparison-tool.component.ts b/src/app/features/genes/components/gene-comparison-tool/gene-comparison-tool.component.ts
@@ -752,14 +752,14 @@ export class GeneComparisonToolComponent implements OnInit, AVI, OnDestroy {
   showMaxPinnedRowsErrorToast(rows: number) {
     let message = '';
     if (rows === 0) {
-      message = 'No rows were added because you reached the maximum of ' +
-        this.maxPinnedGenes + ' pinned Ensembl identifiers.';
+      message = 'No rows were pinned because you reached the maximum of ' +
+        this.maxPinnedGenes + ' pinned genes.';
     } else if (rows === 1) {
-      message = 'Only ' + rows + ' row was added, because you reached the maximum of ' +
-      this.maxPinnedGenes + ' pinned Ensembl identifiers.';
+      message = 'Only ' + rows + ' row were pinned, because you reached the maximum of ' +
+      this.maxPinnedGenes + ' pinned genes.';
     } else {
-      message = 'Only ' + rows + ' rows were added, because you reached the maximum of ' +
-      this.maxPinnedGenes + ' pinned Ensembl identifiers.';
+      message = 'Only ' + rows + ' rows were pinned, because you reached the maximum of ' +
+      this.maxPinnedGenes + ' pinned genes.';
     }
 
     const self = this;
@@ -807,9 +807,9 @@ export class GeneComparisonToolComponent implements OnInit, AVI, OnDestroy {
       sticky: true,
       summary: '',
       detail:
-        'Could not pin the requested item because you reached the maximum of ' +
+        'The row was not pinned because you reached the maximum of ' +
         this.maxPinnedGenes +
-        ' pinned Ensembl identifiers.',
+        ' pinned genes.',
     });
     setTimeout(() => {
       self.messageService.clear();

diff --git a/tests/helpers/gct-pinning.ts b/tests/helpers/gct-pinning.ts
@@ -36,7 +36,7 @@ export const expectPinnedProteinsCountText = async (
 export const expectTooManyPinnedGenesToast = async (page: Page) => {
   const alert = page.getByRole('alert');
   await expect(alert).toHaveText(
-    'Only 50 rows were added, because you reached the maximum of 50 pinned Ensembl identifiers.'
+    'Only 50 rows were pinned, because you reached the maximum of 50 pinned genes.'
   );
 };