Staging (#1938)

* updated liniting * fix(Application):termination for vo always possible * update changelog * fix(Credits):if no perun id doesnt request current credits (#1911) (#1912) * fix(Credits):if no perun id doesnt request current credits (#1911) (#1912) * fix(Credits):if no perun id doesnt request current credits (#1911) (#1912) * fix(Tests):updated tests * fix(application): add ? to some application * * fix(Projects):filtering for vo and facilitymanager fixed * fix(Tests):updated tests * fix(Projects):filtering for vo and facilitymanager fixed * fix(VmOverview):fixed redirect and tests * Staging (#1926) * prepare update * build(deps-dev): bump less-loader from 6.2.0 to 7.0.0 Bumps [less-loader](https://github.com/webpack-contrib/less-loader) from 6.2.0 to 7.0.0. - [Release notes](https://github.com/webpack-contrib/less-loader/releases) - [Changelog](https://github.com/webpack-contrib/less-loader/blob/master/CHANGELOG.md) - [Commits](webpack-contrib/less-loader@v6.2.0...v7.0.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * build(deps-dev): bump sass-loader from 10.0.0 to 10.0.1 Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 10.0.0 to 10.0.1. - [Release notes](https://github.com/webpack-contrib/sass-loader/releases) - [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md) - [Commits](webpack-contrib/sass-loader@v10.0.0...v10.0.1) Signed-off-by: dependabot-preview[bot] <[email protected]> * build(deps): bump jspdf from 2.0.0 to 2.1.0 Bumps [jspdf](https://github.com/MrRio/jsPDF) from 2.0.0 to 2.1.0. - [Release notes](https://github.com/MrRio/jsPDF/releases) - [Changelog](https://github.com/MrRio/jsPDF/blob/master/RELEASE.md) - [Commits](https://github.com/MrRio/jsPDF/commits) Signed-off-by: dependabot-preview[bot] <[email protected]> * build(deps): bump uglify-js from 3.10.2 to 3.10.3 Bumps [uglify-js](https://github.com/mishoo/UglifyJS) from 3.10.2 to 3.10.3. - [Release notes](https://github.com/mishoo/UglifyJS/releases) - [Commits](mishoo/UglifyJS@v3.10.2...v3.10.3) Signed-off-by: dependabot-preview[bot] <[email protected]> * build(deps): bump chromedriver from 84.0.1 to 85.0.0 Bumps [chromedriver](https://github.com/giggio/node-chromedriver) from 84.0.1 to 85.0.0. - [Release notes](https://github.com/giggio/node-chromedriver/releases) - [Commits](https://github.com/giggio/node-chromedriver/commits) Signed-off-by: dependabot-preview[bot] <[email protected]> * build(deps): bump ngx-bootstrap from 5.6.1 to 6.1.0 Bumps [ngx-bootstrap](https://github.com/valor-software/ngx-bootstrap) from 5.6.1 to 6.1.0. - [Release notes](https://github.com/valor-software/ngx-bootstrap/releases) - [Changelog](https://github.com/valor-software/ngx-bootstrap/blob/development/CHANGELOG.md) - [Commits](valor-software/ngx-bootstrap@v5.6.1...v6.1.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * build(deps-dev): bump html-webpack-plugin from 4.3.0 to 4.4.1 Bumps [html-webpack-plugin](https://github.com/jantimon/html-webpack-plugin) from 4.3.0 to 4.4.1. - [Release notes](https://github.com/jantimon/html-webpack-plugin/releases) - [Changelog](https://github.com/jantimon/html-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](jantimon/html-webpack-plugin@v4.3.0...v4.4.1) Signed-off-by: dependabot-preview[bot] <[email protected]> * build(deps-dev): bump @types/jasmine from 3.5.13 to 3.5.14 Bumps [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine) from 3.5.13 to 3.5.14. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine) Signed-off-by: dependabot-preview[bot] <[email protected]> * fix(Links):fixed links * fix(Linting):blacked code * fixed lintin * feat(Docker):change building staging instead of dev branch * dev to staging in build action * build(deps-dev): bump file-loader from 6.0.0 to 6.1.0 Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/webpack-contrib/file-loader/releases) - [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md) - [Commits](webpack-contrib/file-loader@v6.0.0...v6.1.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * fix(VmOverview):vm per site debounce time to 1s (#1896) Co-authored-by: denbicloud <[email protected]> * fix(Layout):fixed the state badge for the applications (#1897) * fix(Layout):fixed the state badge for the applications * removed badge states Co-authored-by: denbicloud <[email protected]> * fix(VmOverview):vm per site debounce time to 1s (#1896) Co-authored-by: denbicloud <[email protected]> * fix(Layout):fixed the state badge for the applications (#1897) * fix(Layout):fixed the state badge for the applications * removed badge states Co-authored-by: denbicloud <[email protected]> * fix(credits): init and mod req credits fixed * fix(Linting):blacked code * refactor(Application):improved detail overview (#1900) * refactor(Application):improved detail overview * fix(Linting):blacked code * fixed flavors for modificaiton Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: denbicloud <[email protected]> * fix(credits): init and mod req credits fixed * fix(Linting):blacked code * refactor(Application):improved detail overview (#1900) * refactor(Application):improved detail overview * fix(Linting):blacked code * fixed flavors for modificaiton Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: denbicloud <[email protected]> * fix(Application):round credits to two decimals * fixed credits user * removed logs * credits loop starts when applicaiton is loaded * fixed relaoding overview with different project * fix(Test):updated some ids for testing * fix(Credits):if no perun id doesnt request current credits (#1911) * fix(Credits):if no perun id doesnt request current credits (#1911) (#1912) * fix(Credits):if no perun id doesnt request current credits (#1911) (#1912) * fix(Credits):if no perun id doesnt request current credits (#1911) (#1912) * fix(Tests):updated tests * fix(Credits):if no perun id doesnt request current credits (#1911) (#1912) * fix(Credits):if no perun id doesnt request current credits (#1911) (#1912) * fix(Tests):updated tests * fix(application): add ? to some application * * fix(Projects):filtering for vo and facilitymanager fixed * fix(Tests):updated tests * fix(Projects):filtering for vo and facilitymanager fixed * fix(VmOverview):fixed redirect and tests Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: denbicloud <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ekatchko <[email protected]> Co-authored-by: eKatchko <[email protected]> * fix(Modifications):modifications loading again in overview Co-authored-by: eKatchko <[email protected]> Co-authored-by: ekatchko <[email protected]> Co-authored-by: vktrrdk <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: denbicloud <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
deNBI · Sep 8, 2020 · 1f5287f · 1f5287f
1 parent f5183cb
commit 1f5287f
Show file tree

Hide file tree

Showing 13 changed files with 109 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+##  (2020-07-10)
+
+
+#### Bug Fixes
+
+* **lifetime:**  mod req lifetime string adjusted. try catch exception. ([97ddb284](97ddb284))
+* **mod-req:**  submit disabled if no edam ([f96ad419](f96ad419))
+
 ##  (2020-06-18)
 
 

diff --git a/e2e/page_objects/login.po.ts b/e2e/page_objects/login.po.ts
@@ -32,7 +32,7 @@ export class LoginPage {
   }
 
   static async useGoogle(email: string, psw: string): Promise<any> {
-    await element(by.linkText('Sign in with Google')).click()
+    await Util.clickElementByLinkText('Sign in with Google')
     // Input Email
     await Util.waitForPage('accounts.google.com/o/oauth2/');
     await Util.sendTextToElementById('identifierId', email, false);

diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js
@@ -30,6 +30,7 @@ exports.config = {
   allScriptsTimeout: 11000,
   specs: [
     'tests/simple_vm_application_test.ts',
+
     'tests/simple_vm_approval_test.ts',
     'tests/member_test.ts',
     'tests/simple_vm_modification_test.ts',
@@ -38,7 +39,7 @@ exports.config = {
     'tests/cloud_application_test.ts',
     'tests/cloud_application_approval_test.ts',
     'tests/cloud_application_modification_test.ts',
-    'tests/cloud_modification_approval_test.ts',
+    'tests/cloud_modification_approval_test.ts',*/
     'tests/virtual_machine_tests.ts',
     'tests/terminate_all_pt.ts'
   ],

diff --git a/e2e/util.ts b/e2e/util.ts
@@ -114,6 +114,23 @@ export class Util {
     return await elem.sendKeys(text);
   }
 
+  static async clickElementByLinkText(text: string): Promise<void> {
+    await Util.waitForElementToBeClickableByLinkText(text)
+    console.log('Clicking element with text:')
+
+    return await element(by.linkText('Sign in with Google')).click();
+
+  }
+
+  static async waitForElementToBeClickableByLinkText(text: string, timeout: number = this.timeout): Promise<boolean> {
+    const until_: ProtractorExpectedConditions = protractor.ExpectedConditions;
+
+    console.log(`Waiting until element is clickable with text:  ${text}`);
+    const elem: ElementFinder = element(by.linkText(text));
+
+    return await browser.driver.wait(until_.elementToBeClickable(elem), timeout, 'Element taking too long to be clickable');
+  }
+
   static async sendTextToElementById(id: string, text: string, show_output: boolean = true): Promise<void> {
     await this.waitForVisibilityOfElementById(id);
     if (show_output) {

diff --git a/src/app/applications/application-detail/application-detail.component.html b/src/app/applications/application-detail/application-detail.component.html
@@ -5,7 +5,8 @@
     <li class="nav-item"><a class="nav-link"  id="information_tab" [ngClass]="{'active': INFORMATION_TAB_ACTIVE }"
                             (click)="setTab(INFORMATION_TAB)">Informations</a></li>
     <li class="nav-item"><a class="nav-link" id="resource_tab"  [ngClass]="{'active': RESOURCE_TAB_ACTIVE }"
-                            (click)="setTab(RESOURCE_TAB)">Resources</a></li>
+                            (click)="setTab(RESOURCE_TAB)">Current Resources</a></li>
+
     <li class="nav-item"><a class="nav-link" id="modification_tab"  *ngIf="(application | hasstatusinlist:Application_States.MODIFICATION_REQUESTED)
     || (application | hasstatusinlist: Application_States.WAIT_FOR_CONFIRMATION_MODIFICATION)"
                             [ngClass]="{'active': MODIFICATION_TAB_ACTIVE }"

diff --git a/...ons/application-detail/lifetime-extension-detail/lifetime-extension-detail.component.html b/...ons/application-detail/lifetime-extension-detail/lifetime-extension-detail.component.html
@@ -5,7 +5,8 @@
     </td>
 
     <td>
-      {{application?.project_lifetime_request.user.username}}
+      {{application?.project_lifetime_request?.user?.username}}
+
       ( {{application?.project_lifetime_request?.user?.email}}
       |       {{application?.project_lifetime_request?.user?.elixir_id}}
       )

diff --git a/src/app/applications/applications.component.html b/src/app/applications/applications.component.html
@@ -327,8 +327,8 @@
                       <div class="btn-group">
 
 
-                        <button [id]="'modification_approval_' + application.project_application_shortname"
-                                *ngIf="(application | hasstatusinlist:Application_States.MODIFICATION_REQUESTED)  || application?.project_modification_request"
+                        <button [id]="'modification_approval_' + application?.project_application_shortname"
+                                *ngIf="(application | hasstatusinlist:Application_States.MODIFICATION_REQUESTED)  && application?.project_modification_request"
                                 style="margin: auto 2.5px"
                                 (click)="this.resetNotificationModal(); this.approveModificationRequest(application);
                                   this.notificationModal.show();"
@@ -339,7 +339,7 @@
                         </button>
 
                         <button
-                          *ngIf="(application | hasstatusinlist:Application_States.MODIFICATION_REQUESTED) "
+                          *ngIf="(application | hasstatusinlist:Application_States.MODIFICATION_REQUESTED) && application?.project_modification_request "
                           type="button"
                           class="btn btn-danger"
                           style="margin: auto 2.5px"
@@ -473,8 +473,8 @@
 
                     <td>
                       <div class="btn-group">
-                        <button [id]="'extension_approval_' + application.project_application_shortname"
-                                *ngIf="(application | hasstatusinlist:Application_States.LIFETIME_EXTENSION_REQUESTED)  || application?.project_lifetime_request"
+                        <button [id]="'extension_approval_' + application?.project_application_shortname"
+                                *ngIf="(application | hasstatusinlist:Application_States.LIFETIME_EXTENSION_REQUESTED)  && application?.project_lifetime_request"
                                 style="margin: auto 2.5px"
                                 (click)="resetNotificationModal();
                                 approveLifetimeExtension(application);
@@ -485,7 +485,7 @@
                           <span class="applicationActionsButton">Approve Extension</span>
                         </button>
                         <button
-                          *ngIf="(application | hasstatusinlist:Application_States.LIFETIME_EXTENSION_REQUESTED)  || application?.project_lifetime_request"
+                          *ngIf="(application | hasstatusinlist:Application_States.LIFETIME_EXTENSION_REQUESTED)  && application?.project_lifetime_request"
                           type="button"
                           class="btn btn-danger"
                           style="margin: auto 2.5px"
@@ -622,7 +622,7 @@
                     <td>
                       <div class="btn-group">
 
-                        <button [id]="'credit_extension_approval_' + application.project_application_shortname"
+                        <button [id]="'credit_extension_approval_' + application?.project_application_shortname"
                                 *ngIf="(application | hasstatusinlist:Application_States.CREDITS_EXTENSION_REQUESTED) "
                                 style="margin: auto 2.5px"
                                 (click)="this.resetNotificationModal(); this.approveCreditExtension(application);
@@ -633,7 +633,7 @@
                           <span class="applicationActionsButton">Approve Credits</span>
                         </button>
 
-                        <button [id]="'credit_extension_decline_' + application.project_application_shortname"
+                        <button [id]="'credit_extension_decline_' + application?.project_application_shortname"
                                 *ngIf="(application | hasstatusinlist:Application_States.CREDITS_EXTENSION_REQUESTED) "
                                 (click)="this.resetNotificationModal(); this.declineCreditExtension(application);
                                  notificationModal.show();"

diff --git a/src/app/applications/applications.component.ts b/src/app/applications/applications.component.ts
@@ -102,9 +102,9 @@ export class ApplicationsComponent extends ApplicationBaseClassComponent impleme
       this.getApplicationHistory();
       this.getComputeCenters();
       this.applicationsservice.getExtensionRequestsCounter().subscribe((result: any): void => {
-        this.numberOfCreditRequests = result['credits_extension_requests_vo'];
-        this.numberOfExtensionRequests = result['lifetime_extension_requests_vo'];
-        this.numberOfModificationRequests = result['modification_requests_vo'];
+        this.numberOfCreditRequests = result['credits_extension_requests_all'];
+        this.numberOfExtensionRequests = result['lifetime_extension_requests_all'];
+        this.numberOfModificationRequests = result['modification_requests_all'];
         this.numberOfProjectApplications = result['applications_submitted_vo'];
       });
     } else {
@@ -161,12 +161,19 @@ export class ApplicationsComponent extends ApplicationBaseClassComponent impleme
     this.applicationsservice.approveAdditionalLifetime(application.project_application_id)
       .subscribe((res: any): void => {
                    if (application.project_application_openstack_project) {
+                     application.project_application_status = []
+                                        this.getApplication(application)
+
+
                      this.updateNotificationModal('Success', 'The request has been sent to the facility manager.', true, 'success');
                    } else {
                      this.updateNotificationModal('Success', 'The project has been extended!', true, 'success');
                    }
-                   this.all_applications.splice(this.all_applications.indexOf(application), 1);
-                   this.numberOfExtensionRequests--;
+                   if (!application.project_application_openstack_project) {
+                     this.numberOfExtensionRequests--;
+                     this.all_applications.splice(this.all_applications.indexOf(application), 1);
+
+                   }
                  },
                  (err: any): void => {
                    console.log('error', err.status);
@@ -194,9 +201,18 @@ export class ApplicationsComponent extends ApplicationBaseClassComponent impleme
 
     this.applicationsservice.approveModificationRequest(application.project_application_id)
       .subscribe((res: any): void => {
+
                    this.updateNotificationModal('Success', 'The resource modification request was approved!', true, 'success');
-                   this.all_applications.splice(this.all_applications.indexOf(application), 1);
-                   this.numberOfModificationRequests--;
+                   if (!application.project_application_openstack_project) {
+
+                     this.numberOfModificationRequests--;
+                     this.all_applications.splice(this.all_applications.indexOf(application), 1);
+
+                   } else {
+                     application.project_application_status = []
+
+                     this.getApplication(application)
+                   }
                  },
                  (err: any): void => {
                    console.log('error', err.status);
@@ -221,9 +237,18 @@ export class ApplicationsComponent extends ApplicationBaseClassComponent impleme
   approveCreditExtension(application: Application): void {
     this.applicationsservice.approveAdditionalCreditsRequest(application.project_application_id)
       .subscribe((res: any): void => {
+
                    this.updateNotificationModal('Success', 'The credit extension request was approved!', true, 'success');
-                   this.all_applications.splice(this.all_applications.indexOf(application), 1);
-                   this.numberOfCreditRequests--;
+                   if (!application.project_application_openstack_project) {
+
+                     this.numberOfCreditRequests--;
+                     this.all_applications.splice(this.all_applications.indexOf(application), 1);
+
+                   } else {
+                     application.project_application_status = []
+
+                     this.getApplication(application)
+                   }
                  },
                  (err: any): void => {
                    console.log('error', err.status);
@@ -424,15 +449,17 @@ export class ApplicationsComponent extends ApplicationBaseClassComponent impleme
     this.groupservice.createGroupOpenStack(
       application.project_application_id, compute_center)
       .subscribe((result: { [key: string]: string }): void => {
+
                    if (result['Error']) {
                      this.updateNotificationModal('Failed', result['Error'], true, 'danger');
 
                    } else {
+                     application.project_application_status = []
+
                      this.updateNotificationModal('Success', 'The new project was created', true, 'success');
-                     this.all_applications.splice(this.all_applications.indexOf(application), 1);
-                     this.numberOfProjectApplications--;
+                     this.getApplication(application);
+
                    }
-                   this.getApplication(application);
                  },
                  (): void => {
                    this.updateNotificationModal('Failed', 'Project could not be created!', true, 'danger');

diff --git a/src/app/facility_manager/facility.application.component.ts b/src/app/facility_manager/facility.application.component.ts
@@ -256,6 +256,15 @@ export class FacilityApplicationComponent extends ApplicationBaseClassComponent
     this.allApplicationsToCheck = [];
     this.all_application_modifications = [];
     this.applications_history = [];
+    this.facilityService.getExtensionRequestsCounterFacility(this.selectedFacility['FacilityId'])
+      .subscribe((res: any): void => {
+        this.numberOfCreditRequests = res['credits_extension_requests'];
+        this.numberOfExtensionRequests = res['lifetime_extension_requests'];
+        this.numberOfModificationRequests = res['modification_requests'];
+        this.numberOfProjectApplications = res['applications_submitted'];
+      });
+    this.changeTabState(TabStates.SUBMITTED);
+    this.isLoaded = true;
     // this.getFullApplications(this.selectedFacility ['FacilityId']);
     this.getAllApplicationsHistory(this.selectedFacility ['FacilityId']);
 
@@ -335,7 +344,6 @@ export class FacilityApplicationComponent extends ApplicationBaseClassComponent
       this.changeTabState(TabStates.SUBMITTED);
       this.isLoaded = true;
 
-      this.facilityService.getFacilityResources(this.selectedFacility['FacilityId']).subscribe();
       this.getApplicationStatus();
      // this.getFullApplications(this.selectedFacility ['FacilityId']);
       this.getAllApplicationsHistory(this.selectedFacility ['FacilityId']);

diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html
@@ -94,9 +94,9 @@
         <li class="nav-item" *ngFor="let application of project_enumeration">
 
           <a *ngIf="!navbar_minimized" class="nav-link" routerLinkActive="active" [id]="application?.project_name"
-             [routerLink]="['/project-management/' + application.application_id]">
+             [routerLink]="['/project-management/' + application?.application_id]">
             <div class="row" style="margin:0px;">
-              <span *ngIf="application.is_open_stack"
+              <span *ngIf="application?.is_open_stack"
                     style="float:left; font-size: 20px; margin-right: 10px;"
                     class="project-openstack_plain_white_redbg"
                     data-toggle="tooltip"
@@ -116,11 +116,11 @@
                       <span class="path5"></span>
                     </span>
               <span style="display: inline-block;width: 65%;overflow: hidden;text-overflow: ellipsis;">
-              {{application.project_name}}
+              {{application?.project_name}}
             </span>
             </div>
 
-            <div class="row justify-content-center" id="status_row_{{application.application_id}}" style="margin: 2px;">
+            <div class="row justify-content-center" id="status_row_{{application?.application_id}}" style="margin: 2px;">
               <span class="badge badge-success status-badge" data-toggle="tooltip"
                     data-placement="right" title="This project was initially approved within the last 2 weeks."
                     *ngIf="(application | hasstatusinlist:Application_States.APPROVED_LAST_2_WEEKS)">
@@ -169,10 +169,10 @@
 
           </a>
 
-          <a *ngIf="navbar_minimized && !application.is_open_stack" class="nav-link" routerLinkActive="active"
+          <a *ngIf="navbar_minimized && !application?.is_open_stack" class="nav-link" routerLinkActive="active"
              style="text-align: center;"
-             [routerLink]="['/project-management/' + application.application_id]" data-toggle="tooltip"
-             data-placement="right" [title]="application.project_name">
+             [routerLink]="['/project-management/' + application?.application_id]" data-toggle="tooltip"
+             data-placement="right" [title]="application?.project_name">
             <span class="project-simpleVM_Logo_bluebg"
                   style="color: #FFF; position:relative; left:8px; font-size: 20px">
               <span class="path1"></span>
@@ -183,10 +183,10 @@
             </span>
           </a>
 
-          <a *ngIf="navbar_minimized && application.is_open_stack" class="nav-link" routerLinkActive="active"
+          <a *ngIf="navbar_minimized && application?.is_open_stack" class="nav-link" routerLinkActive="active"
              style="text-align: center;"
-             [routerLink]="['/project-management/' + application.application_id]" data-toggle="tooltip"
-             data-placement="right" [title]="application.project_name">
+             [routerLink]="['/project-management/' + application?.application_id]" data-toggle="tooltip"
+             data-placement="right" [title]="application?.project_name">
             <span class="project-openstack_plain_white_redbg"
                   style="color: #FFF; position:relative; left:8px; font-size: 20px">
                <span class="path1"></span>

diff --git a/src/app/projectmanagement/overview.component.html b/src/app/projectmanagement/overview.component.html
@@ -605,8 +605,9 @@ <h4 class="modal-title">Applications for {{project?.Name}}</h4>
               </thead>
               <tbody *ngFor="  let application of project?.ProjectMemberApplications">
 
-              <td>{{application.Name}}</td>
-              <td>{{application.DateCreated}}</td>
+              <td>{{application?.Name}}</td>
+              <td>{{application?.DateCreated}}</td>
+
               <td>
                 <button
                   (click)="approveMemberApplication(project?.Id,application.Id,application.Name); "

diff --git a/src/app/virtualmachines/clusters/clusteroverview/clusterOverview.component.html b/src/app/virtualmachines/clusters/clusteroverview/clusterOverview.component.html
@@ -111,19 +111,19 @@
                     <a *ngIf="!show_connection_infO"
                        class="font-weight-bold font-xs btn-block text-muted btn btn-outline-secondary"
                        [id]="'showHowToConnectButton_'+cluster?.cluster_id"
-                       (click)="show_connection_infO=true; " href="#" onClick="return false;">
+                       (click)="show_connection_infO=true; "  onClick="return false;">
                       How to connect ...</a>
 
                     <a *ngIf="show_connection_infO" class="font-weight-bold font-xs btn-block btn btn-secondary"
                        [id]="'hideHowToConnectButton_'+cluster?.cluster_id"
-                       (click)="show_connection_infO=false; " href="#" onClick="return false;">
+                       (click)="show_connection_infO=false; " onClick="return false;">
                       ... Hide information</a>
                   </div>
                   <div class="col-6"
                        *ngIf="cluster?.status != VirtualMachineStates.staticDELETED && cluster?.status != VirtualMachineStates.staticDELETING">
                     <a class="font-weight-bold font-xs btn-block text-muted btn btn-outline-danger"
                        [id]="'delete_'+cluster?.cluster_id"
-                       (click)="selectedCluster=cluster; verifyModal.show()" href="#" onClick="return false;">
+                       (click)="selectedCluster=cluster; verifyModal.show()"  onClick="return false;">
                       Delete</a>
 
 
@@ -144,7 +144,7 @@
                     </div>
 
                     <div class="col-md-2" style="margin: auto" *ngIf="mode.copy_field && mode.copy_field!=''"><a
-                      (click)="copyToClipboard(mode.copy_field);" href="#"
+                      (click)="copyToClipboard(mode.copy_field);"
                       onClick="return false;"
                       class="font-weight-bold font-xs btn-block text-muted">&lt;copy
                       command&gt;</a>