Merge remote-tracking branch 'origin/main' into pb646-software-field

Author: svogt0511

app/components/doi-list.hbs

@@ -14,10 +14,16 @@
           </BsAlert>
       </div>
     </div>
-    <div>
-      <MetadataDashboardButton />
+  {{/unless}}
+
+  {{#unless (eq this.link 'repositories.show.dois')}}
+    <div class="panel panel-transparent">
+      <div class="panel-body">
+        <MetadataDashboardButton @dashboardId={{@dashboardId}} />
+      </div>
     </div>
   {{/unless}}
+
   {{#if
     (eq this.link 'repositories.show.dois')
   }}
@@ -40,9 +46,7 @@
                 {{#if (and this.repository.isActive (or (can 'create doi' this.model) (can 'upload doi' this.model)) (gt this.repository.meta.prefixCount 0))}}
                   <CreateDoiButton @model={{this.model}} class="create-doi-button" />
                 {{/if}}
-                <div>
-                  <MetadataDashboardButton />
-                </div>
+                <MetadataDashboardButton @dashboardId={{@dashboardId}} />
                 <div class="btn-group-vertical btn-group-sm">
                   <ExportBasicMetadata @model={{this.model}} @client_id={{this.repository.id}} @page={{this.page}} class="btn btn-warning" />
                   {{#if (and (can 'move doi' this.repository))}} 
@@ -67,17 +71,16 @@
           <div class="panel facets">
             <div class="panel-body">
               <CreateDoiButton @model={{this.model}} class="create-doi-button" />
+              <MetadataDashboardButton @dashboardId={{@dashboardId}} />
             </div>
           </div>
-          <div>
-            <MetadataDashboardButton />
-          </div>
         {{/if}}
       {{/if}}
     {{else}}
       {{#if (gt this.model.length 0) }} 
         <div class="panel facets add-25">
           <div class="panel-body">
+            <MetadataDashboardButton @dashboardId={{@dashboardId}} />
             <div class="btn-toolbar">
               <div class="btn-group-vertical btn-group-sm">
                 <ExportBasicMetadata @model={{this.model}} @client_id={{this.repository.id}} @page={{this.page}} class="btn btn-warning" />

app/components/metadata-dashboard-button.hbs

@@ -1,8 +1,7 @@
 {{#if (and (not-eq this.fabricaDeployTarget "test") this.metadataDashboardUrl)}}
-<div class="btn-group btn-group-sm metadata-dashboard-button">
-  <a href={{this.metadataDashboardUrl}} target="_blank" rel="noopener noreferrer" class="btn btn-warning" id="metadata-dashboard">
-    <i class="fas fa-external-link-alt"></i>
-    Metadata Dashboard
-  </a>
-</div>
+  <div class="metadata-dashboard-button">
+    <BsButton class="btn-warning"  id="metadata-dashboard-button" {{on "click" (fn this.openLink this.metadataDashboardUrl)}}>
+      <i class="fas fa-external-link-alt"></i>Metadata Dashboard
+    </BsButton>
+  </div>
 {{/if}}

app/components/metadata-dashboard-button.js

@@ -1,14 +1,20 @@
 import Component from '@glimmer/component';
 import ENV from 'bracco/config/environment';
-import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
 
 export default class MetadataDashboardButton extends Component {
-  @service currentUser;
 
   get metadataDashboardUrl() {
-    return ENV.METADATA_DASHBOARD_URL + "/" + this.currentUser.uid;
+    return ENV.METADATA_DASHBOARD_URL + (this.args.dashboardId ? "/" + this.args.dashboardId.toLowerCase() : '');
   }
+
   get fabricaDeployTarget() {
     return ENV.fabricaDeployTarget;
   }
+
+  @action
+  openLink(url) {
+    document.activeElement.blur(); // Remove focus from the button after clicking to ultimately clear the styles when the user returns to the page.
+    window.open(url, '_blank', 'noopener,noreferrer');
+  }
 }

app/styles/local.css

@@ -62,9 +62,11 @@ z-index: 10000;
 }
 
 /* Metadata dashboard button - make it look more like other buttons in the left sidebar. */
-.metadata-dashboard-button {
-  margin-left: 5px;
-  margin-bottom: 15px;
+
+.metadata-dashboard-button button {
+    margin-left: 5px;
+    margin-bottom: 15px;
+    font-size: 16px !important;
 }
 
 /* INFO TAB - chart placement on info tab*/

app/templates/providers/show/dois.hbs

@@ -3,6 +3,7 @@
     @model={{this.model.dois}}
     @link="providers.show.dois"
     @searchable={{true}}
+    @dashboardId={{this.model.provider.uid}}
   />
 {{else}}
   <div class="col-md-9 col-md-offset-3">

app/templates/providers/show/index.hbs

@@ -4,7 +4,7 @@
       <div class="panel-body">
         <div class="btn-toolbar">
           <div class="shrink">
-            <MetadataDashboardButton />
+            <MetadataDashboardButton @dashboardId={{this.model.uid}} />
           </div>
         </div>
       </div>

app/templates/repositories/show/dois/index.hbs

@@ -5,6 +5,7 @@
     @link="repositories.show.dois"
     @searchable={{true}}
     @page={{this.model.page}}
+    @dashboardId={{this.model.repository.symbol}}
   />
 {{else}}
   <div class="col-md-9 col-md-offset-3">

app/templates/repositories/show/index.hbs

@@ -18,7 +18,7 @@
               {{#if (and this.model.isActive (can 'update repository' this.model) (or (can 'create doi' this.model) (can 'upload doi' this.model)) (gt this.model.meta.prefixCount 0))}}
                 <CreateDoiButton @model={{this.model}} class="create-doi-button" />
               {{/if}}
-              <MetadataDashboardButton />
+              <MetadataDashboardButton @dashboardId={{this.model.id}} />
             </div>
           </div>
         </div>