Merge pull request #1103 from griffithlab/add-ncit-to-factor-card

Add NCIt details to Factor Variant card in MP view
griffithlab · Aug 22, 2024 · 9d72b7e · 9d72b7e
2 parents 1bfa870 + f5cce69
commit 9d72b7e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 15 deletions.
diff --git a/...olecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.html b/...olecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.html
@@ -111,6 +111,21 @@
           </nz-col>
         </nz-row>
       </nz-col>
+      <nz-col [nzSpan]="24">
+        <ng-container *ngIf="variant.ncitId; else noNcit">
+          <cvc-ncit-details
+            [ncitDetails]="variant.ncitDetails"></cvc-ncit-details>
+        </ng-container>
+        <ng-template #noNcit>
+          <nz-col [nzSpan]="24">
+            <nz-card nzTitle="">
+              <cvc-empty-revisable
+                notification="Not available, please provide an NCIt Code">
+              </cvc-empty-revisable>
+            </nz-card>
+          </nz-col>
+        </ng-template>
+      </nz-col>
     </nz-row>
   </nz-card>
 }
diff --git a/.../molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.ts b/.../molecular-profile-factor-variant-card/molecular-profile-factor-variant-card.component.ts
@@ -22,6 +22,7 @@ import { CvcCoordinatesCardModule } from '@app/components/variants/coordinates-c
 import { NzSpaceModule } from 'ng-zorro-antd/space'
 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 { CvcNcitDetailsComponent } from '@app/components/factors/ncit-details/ncit-details.component'
 
 @Component({
   selector: 'cvc-mp-factor-variant-card',
@@ -50,6 +51,7 @@ import { CvcFeatureVariantTagModule } from '@app/components/shared/feature-varia
     CvcMolecularProfileTagModule,
     CvcCoordinatesCardModule,
     CvcFeatureVariantTagModule,
+    CvcNcitDetailsComponent,
   ],
 })
 export class CvcMolecularProfileFactorVariantCardComponent implements OnInit {

diff --git a/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html b/client/src/app/components/variants/factor-variant-summary/factor-variant-summary.page.html
@@ -58,21 +58,6 @@
             </nz-descriptions-item>
           </nz-descriptions>
         </nz-col>
-        <ng-container *ngIf="variant.ncitId; else noNcit">
-          <nz-col [nzSpan]="24">
-            <cvc-ncit-details
-              [ncitDetails]="variant.ncitDetails"></cvc-ncit-details>
-          </nz-col>
-        </ng-container>
-        <ng-template #noNcit>
-          <nz-col [nzSpan]="24">
-            <nz-card nzTitle="">
-              <cvc-empty-revisable
-                notification="Not available, please provide an NCIt Code">
-              </cvc-empty-revisable>
-            </nz-card>
-          </nz-col>
-        </ng-template>
       </nz-row>
     </nz-col>
 
@@ -155,6 +140,15 @@
               [ncitDetails]="variant.ncitDetails"></cvc-ncit-details>
           </nz-col>
         </ng-container>
+        <ng-template #noNcit>
+          <nz-col [nzSpan]="24">
+            <nz-card nzTitle="">
+              <cvc-empty-revisable
+                notification="Not available, please provide an NCIt Code">
+              </cvc-empty-revisable>
+            </nz-card>
+          </nz-col>
+        </ng-template>
       </nz-row>
     </nz-col>
     <!-- END RIGHT COL -->