Merge pull request #1104 from griffithlab/show-org-in-revision

Show org tag in revision header
griffithlab · Aug 22, 2024 · 771a9f8 · 771a9f8
2 parents 9d72b7e + 102ab48
commit 771a9f8
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 14 deletions.
diff --git a/client/src/app/components/revisions/revision-list/revision-list.component.html b/client/src/app/components/revisions/revision-list/revision-list.component.html
@@ -39,7 +39,7 @@
                     name: item.displayName,
                     link: item.link,
                     deprecated: item.deprecated,
-                    flagged: item.flagged
+                    flagged: item.flagged,
                   }"></cvc-feature-tag>
               </ng-template>
             </cvc-revision-list-diff>
@@ -85,7 +85,7 @@
                     name: item.displayName,
                     link: item.link,
                     deprecated: item.deprecated,
-                    flagged: item.flagged
+                    flagged: item.flagged,
                   }"></cvc-molecular-profile-tag>
               </ng-template>
             </cvc-revision-list-diff>
@@ -102,7 +102,7 @@
                     id: item.id,
                     name: item.displayName,
                     link: item.link,
-                    deprecated: item.deprecated
+                    deprecated: item.deprecated,
                   }"></cvc-therapy-tag>
               </ng-template>
             </cvc-revision-list-diff>
@@ -119,7 +119,7 @@
                     id: item.id,
                     name: item.displayName,
                     link: item.link,
-                    deprecated: item.deprecated
+                    deprecated: item.deprecated,
                   }"></cvc-therapy-tag>
               </ng-template>
             </cvc-revision-list-diff>
@@ -239,7 +239,7 @@
                   [variantType]="{
                     id: item.id,
                     name: item.displayName,
-                    link: item.link
+                    link: item.link,
                   }"></cvc-variant-type-tag>
               </ng-template>
             </cvc-revision-list-diff>
@@ -255,7 +255,7 @@
                   [phenotype]="{
                     id: item.id,
                     name: item.displayName,
-                    link: item.link
+                    link: item.link,
                   }"></cvc-phenotype-tag>
               </ng-template>
             </cvc-revision-list-diff>
@@ -274,7 +274,7 @@
                     link: item.link,
                     feature: item.feature,
                     deprecated: item.deprecated,
-                    flagged: item.flagged
+                    flagged: item.flagged,
                   }"></cvc-feature-variant-tag>
               </ng-template>
             </cvc-revision-list-diff>
@@ -293,7 +293,7 @@
                     link: item.link,
                     feature: item.feature,
                     deprecated: item.deprecated,
-                    flagged: item.flagged
+                    flagged: item.flagged,
                   }"></cvc-feature-variant-tag>
               </ng-template>
             </cvc-revision-list-diff>
@@ -322,7 +322,7 @@
                     name: item.displayName,
                     link: item.link,
                     status: item.status,
-                    flagged: item.flagged
+                    flagged: item.flagged,
                   }"></cvc-evidence-tag>
               </ng-template>
             </cvc-revision-list-diff>
@@ -404,11 +404,21 @@
                 *ngIf="revision.creationActivity?.user; else noRevisor">
                 <span
                   nz-typography
-                  nzType="secondary"
-                  >Submitted By</span
-                >
+                  nzType="secondary">
+                  By&nbsp;
+                </span>
                 <cvc-user-tag
                   [user]="revision.creationActivity!.user"></cvc-user-tag>
+                @if (revision.creationActivity?.organization) {
+                  <span
+                    nz-typography
+                    nzType="secondary">
+                    for&nbsp;
+                  </span>
+                  <cvc-organization-tag
+                    [org]="revision.creationActivity.organization">
+                  </cvc-organization-tag>
+                }
               </ng-container>
               <ng-template #noRevisor>
                 <span

diff --git a/client/src/app/components/revisions/revision-list/revision-list.module.ts b/client/src/app/components/revisions/revision-list/revision-list.module.ts
@@ -37,6 +37,7 @@ import { CvcTherapyTagModule } from '@app/components/therapies/cvc-therapy-tag/c
 import { CvcMolecularProfileTagModule } from '@app/components/molecular-profiles/molecular-profile-tag/molecular-profile-tag.module'
 import { CvcFeatureTagModule } from '@app/components/features/feature-tag/feature-tag.module'
 import { CvcFeatureVariantTagModule } from '@app/components/shared/feature-variant-tag/feature-variant-tag.module'
+import { CvcOrganizationTagModule } from '@app/components/organizations/organization-tag/organization-tag.module'
 
 @NgModule({
   declarations: [RevisionListComponent],
@@ -76,6 +77,7 @@ import { CvcFeatureVariantTagModule } from '@app/components/shared/feature-varia
     CvcMolecularProfileTagModule,
     CvcPipesModule,
     CvcCommentBodyModule,
+    CvcOrganizationTagModule,
     NzCollapseModule,
     NzButtonModule,
     NzAlertModule,

diff --git a/...rc/app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.query.gql b/...rc/app/components/revisions/revisions-list-and-filter/revisions-list-and-filter.query.gql
@@ -165,6 +165,10 @@ fragment revision on Revision {
     parsedNote {
       ...parsedCommentFragment
     }
+    organization {
+      id
+      name
+    }
   }
   resolutionActivity {
     createdAt

diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts