Merge pull request #56 from kikkomep/fix/0.3.0-issues

Fix/0.3.0 issues

Author: kikkomep

src/app/utils/services/app.service.ts

@@ -749,6 +749,7 @@ export class AppService {
     let workflow_versions: WorkflowVersion[] = [];
 
     let workflowsStatus: WorkflowsLoadingStatus = null;
+    this.subjectLoadingWorkflowsStatus.next(null);
 
     this.setLoadingWorkflows(true);
     return this.api

src/app/views/dashboard/dashboard.component.html

@@ -38,12 +38,12 @@ <h2 class="text-primary font-weight-light p-2">
         <div>
           <span *ngIf="((isLoading|async)===true)" data-toggle="tooltip" tooltipPosition="right" data-html="true"
             title="The dashboard collects your subscribed workflows">
-            {{ "Loading " + (isUserLogged() ? "Dashboard" : "Workflows") + "....."}}
+            {{ "Loading " + (isUserLogged() && !browseButtonEnabled ? "Dashboard" : "Workflows") + "....."}}
           </span>
           <span *ngIf="(isLoading|async)===false && (!workflowNameFilter || workflowNameFilter.length==0)"
             pTooltip="{{ isUserLogged() ? 'the dashboard collects your workflow subscriptions' : 'registered workflows' }}"
             showDelay=2000 tooltipPosition="right" data-html="true">
-            {{ isUserLogged() ? "Dashboard" : "Workflows" }}
+            {{ browseButtonEnabled && isUserLogged() ? 'Registered Workflows' : isUserLogged() ? "Dashboard" : "Workflows" }}
           </span>
         </div>
         <div *ngIf="workflowNameFilter && workflowNameFilter.length>0">
@@ -68,8 +68,7 @@ <h2 class="text-primary font-weight-light p-2">
             <ng-container *ngIf="workflowNameFilter == '______ALL_____'; then allWorkflows; else matchingWorkflows;">
             </ng-container>
             <ng-template #allWorkflows>
-              {{ browseButtonEnabled && isUserLogged() ? 'Registered Workflows' : isUserLogged() ? "Dashboard" :
-              "Workflows" }}
+              {{ browseButtonEnabled && isUserLogged() ? 'Registered Workflows' : isUserLogged() ? "Dashboard" : "Workflows" }}
             </ng-template>
             <ng-template #matchingWorkflows>Workflows matching "<b>{{workflowNameFilter}}</b>"</ng-template>
           </ng-template>
@@ -380,19 +379,6 @@ <h3>{{ workflows ? getStatsLength(workflowStats.unknown) : 0 }}</h3>
                             </a></span>
                         </div>
 
-                        <!-- Workflow Registry -->
-                        <div class="item-detail" *ngIf="item.registry">
-                          <span class="item-icon">
-                            <i class="fas fa-xs fa-database mr-1"></i>
-                          </span>
-                          <span class="item-label">registry ID: </span>
-                          <span class="cut-text">
-                            <a href="{{ item.registryLink }}" target="_blank">{{
-                              item.registryLink
-                              }}
-                            </a></span>
-                        </div>
-
                         <!-- Workflow Submitter -->
                         <div *ngIf="item?.version?.submitter" class="item-detail">
                           <span class="item-icon">
@@ -421,6 +407,30 @@ <h3>{{ workflows ? getStatsLength(workflowStats.unknown) : 0 }}</h3>
                                 class="m-0 p-0" *ngIf="a_index < item.authors.length - 1">, </span></span>
                           </p>
                         </div>
+
+                        <!-- Workflow Registry -->
+                        <div *ngFor="let reg of item.registries" class="item-detail">
+                          <span class="item-icon">
+                            <i class="fas fa-external-link-alt fa-xs mr-1" style="width: 10px;"></i>
+                          </span>
+                          <span class="item-label">{{reg.name}}: </span>
+                          <span class="cut-text">
+                            <a [href]="item.getRegistryLink(reg.identifier)" target="_blank">{{
+                              item.getRegistryLink(reg.identifier)
+                              }}
+                            </a></span>
+                        </div>
+
+                        <!-- Workflow Creation time -->
+                        <div *ngIf="item.created" class="item-detail">
+                          <span class="item-icon">
+                            <i class="far fa-clock fa-xs mr-1"></i>
+                          </span>
+                          <span class="item-label">created: </span>
+                          <span class="cut-text">
+                            {{ item.created * 1000 | date:'long' }}
+                          </span>
+                        </div>
                       </div>
                       <!-- Workflows Details -->
                     </div>
@@ -824,25 +834,26 @@ <h3>{{ workflows ? getStatsLength(workflowStats.unknown) : 0 }}</h3>
 
             <ng-template pTemplate="empty">
               <!-- no workflow found/matching -->
-              <div *ngIf="workflows && workflows.length === 0" class="no-workflow-container">
-
+              <div class="no-workflow-container">
                 <div class="no-workflow"
-                  *ngIf="workflows && workflows.length === 0 && (!statusFilter && !workflowNameFilter)">
+                  *ngIf="(!workflows || workflows.length === 0) && (!statusFilter && !workflowNameFilter)">
                   No workflow found
                 </div>
 
                 <div class="no-workflow"
-                  *ngIf="workflows && workflows.length === 0 && (statusFilter || workflowNameFilter)">
+                  *ngIf="(statusFilter || workflowNameFilter)">
                   No matching workflow
                 </div>
 
-                Click on
-                <a class='add-wf' href="/dashboard;add=true">
-                  <i class="fas fa-plus-circle"></i>
-                  to register a workflow
-                </a>
-                <br>or use the main search box to find and subscribe
-                <br>to workflows registered by others in the community
+                <div *ngIf="isUserLogged() && !browseButtonEnabled">
+                  Click on
+                  <a class='add-wf' href="/dashboard;add=true">
+                    <i class="fas fa-plus-circle"></i>
+                    to register a workflow
+                  </a>
+                  <br>or use the main search box to find and subscribe
+                  <br>to workflows registered by others in the community
+                </div>
               </div>
               <!-- /.no workflow found/matching-->
             </ng-template>

src/app/views/dashboard/dashboard.component.ts

@@ -390,6 +390,8 @@ export class DashboardComponent
     this._workflowNameFilter = value ? value.replace('SEARCH_KEY###', '') : '';
     this.editModeEnabled = false;
     this.prepareTableData();
+    // reset dataview paginator
+    this.goToFirstPage();
   }
 
   public get isLoading(): Observable<boolean> {
@@ -765,9 +767,6 @@ export class DashboardComponent
 
     this.checkWindowSize();
 
-    // reset dataview paginator
-    this.goToFirstPage();
-
     // this.scrollTop();
 
     this.cdref.detectChanges();