Merge pull request #439 from ncats/mixture_SR1

fixing mixure details, reverting travis changes until SR1 is out

.travis.yml

@@ -1,9 +1,5 @@
 dist: trusty
 
-env:
-  global:
-    - TRAVIS_TAG=buildRelease
-
 language: node_js
 node_js:
   - 14.17.0
@@ -29,23 +25,4 @@ install:
 script:
   - npm run build:fda:prod
 after_success:
-  - ls
-  - zip -r deployable_binaries.zip dist/browser
-  - ls
-  - cp deployable_binaries.zip ../
-  - ls
-before_deploy:
-  # Set up git user name and tag this commit
-  - echo "before deploy"
-  - echo "$TRAVIS_TAG"
-  - gh release delete $TRAVIS_TAG --repo ncats/gsrsFrontend --yes || true
-  - if [ $TRAVIS_BRANCH = 'development_3.0' ]; then git tag $TRAVIS_TAG; fi
-  - echo "$TRAVIS_TAG"
-
-deploy:
-  provider: releases
-  api_key: ${GIT_ACCESS_TOKEN}
-  file: "../deployable_binaries.zip"
-  skip_cleanup: true
-  on:
-    all_branches: true
+  - if [ $TRAVIS_BRANCH = 'development_3.0' ]; then bash travisScript.sh; else echo "Not a branch set to push"; fi

src/app/core/substance-details/substance-mixture-components/substance-mixture-components.component.html

@@ -39,7 +39,7 @@ <h3>One of these components may be present:</h3>
   <div class="flex-row">
     <div *ngFor="let component of presentInOne" class="thumb-col">
 
-      <div *ngIf="component.substance.linkingID" class="code">{{component}}</div>
+      <div *ngIf="component.substance.linkingID" class="code">{{component.substance.linkingID}}</div>
       <a tabindex="0" role="img" aria-label="substance image" class="zoom" (click)="openImageModal(structureTemplate, component)">
 
       <img class="image-icon" appSubstanceImage [entityId]="component.substance.refuuid">
@@ -57,7 +57,7 @@ <h3>One of these components may be present:</h3>
 
 <ng-template #structureTemplate>
   <div class = "close-container" mat-dialog-header>
-      <button mat-mini-fab class = "mat-mini-fab" mat-dialog-close>
+      <button mat-mini-fab class = "mat-mini-fab" (click) = "close()">
           <mat-icon  class = "icon" svgIcon="close"></mat-icon>
         </button>
   </div>

src/app/core/substance-details/substance-mixture-components/substance-mixture-components.component.ts

@@ -51,4 +51,8 @@ export class SubstanceMixtureComponentsComponent extends SubstanceCardBase imple
     });
 }
 
+close() {
+  this.dialog.closeAll();
+}
+
 }