Merge pull request 'angular-16' (#6) from angular-16 into develop

Reviewed-on: #6

interactivemining-install.sh

@@ -1,7 +1,7 @@
 rm -f interactiveminingv3.tgz
 git clone https://code-repo.d4science.org/MaDgIK/interactive-mining.git
 cd interactive-mining/
-git checkout angular-14
+git checkout angular-16
 cd interactive-mining-angular-frontend/
 npm install
 npm run packagr

package.json

@@ -17,41 +17,40 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^14.2.3",
+    "@angular/animations": "^16.1.8",
-    "@angular/cdk": "^14.2.2",
+    "@angular/cdk": "^16.1.7",
-    "@angular/common": "^14.2.3",
+    "@angular/common": "^16.1.8",
-    "@angular/compiler": "^14.2.3",
+    "@angular/compiler": "^16.1.8",
-    "@angular/core": "^14.2.3",
+    "@angular/core": "^16.1.8",
-    "@angular/forms": "^14.2.3",
+    "@angular/forms": "^16.1.8",
-    "@angular/localize": "^14.2.3",
+    "@angular/localize": "^16.1.8",
-    "@angular/material": "^14.2.2",
+    "@angular/material": "^16.1.7",
-    "@angular/platform-browser": "^14.2.3",
+    "@angular/platform-browser": "^16.1.8",
-    "@angular/platform-browser-dynamic": "^14.2.3",
+    "@angular/platform-browser-dynamic": "^16.1.8",
-    "@angular/router": "^14.2.3",
+    "@angular/router": "^16.1.8",
     "clipboard": "^1.5.16",
     "core-js": "^2.5.4",
     "express": "^4.15.2",
     "jquery": "^3.4.1",
-    "ng-recaptcha": "^10.0.0",
+    "ng-recaptcha": "^12.0.2",
     "ng2-ckeditor": "1.3.7",
-    "ngx-color-picker": "^8.1.0",
+    "ngx-color-picker": "^14.0.0",
     "rxjs": "^6.5.1",
     "sass-loader": "7.3.1",
     "ts-md5": "^1.2.0",
     "tslib": "^2.0.0",
-    "uikit": "3.13.10",
+    "uikit": "3.16.24",
-    "zone.js": "~0.11.4"
+    "zone.js": "~0.13.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^14.2.3",
+    "@angular-devkit/build-angular": "^16.1.7",
-    "@angular/cli": "^14.2.3",
+    "@angular/cli": "^16.1.7",
-    "@angular/compiler-cli": "^14.2.3",
+    "@angular/compiler-cli": "^16.1.8",
-    "@angular/language-service": "^14.2.3",
+    "@angular/language-service": "^16.1.8",
+    "@types/ckeditor": "^4.9.10",
     "@types/express": "^4.17.0",
     "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
-    "@types/node": "^12.11.1",
-    "@types/ckeditor": "^4.9.10",
     "codelyzer": "^6.0.0",
     "jasmine-core": "~3.8.0",
     "jasmine-spec-reporter": "~5.0.0",
@@ -62,6 +61,6 @@
     "karma-jasmine-html-reporter": "^1.6.0",
     "protractor": "~7.0.0",
     "ts-node": "~7.0.0",
-    "typescript": "~4.6.4"
+    "typescript": "~4.9.5"
   }
 }

src/app/app.component.html

@@ -2,17 +2,15 @@
   <loading [full]="true"></loading>
 </div>
 <div *ngIf="loading == false">
-  <div class="sidebar_main_swipe" [class.sidebar_main_active]="open && hasSidebar" [class.sidebar_mini]="!open && hasSidebar"
+  <div id="modal-container"></div>
+  <navbar *ngIf="hasHeader" portal="connect-admin" [header]="menuHeader" [communityId]="community ? community.communityId : null"
+          [userMenuItems]=userMenuItems [menuItems]="menuItems" [user]="user"></navbar>
+  <div class="sidebar_main_swipe uk-flex" [class.sidebar_main_active]="open && hasSidebar" [class.sidebar_mini]="!open && hasSidebar"
        [class.sidebar_hover]="hover">
-    <div id="modal-container"></div>
-    <navbar *ngIf="hasHeader" portal="connect-admin" [header]="menuHeader" [communityId]="community ? community.communityId : null"
-            [userMenuItems]=userMenuItems [menuItems]="menuItems" [user]="user"></navbar>
-    <div>
       <dashboard-sidebar *ngIf="hasSidebar" [items]="sideBarItems" [backItem]="backItem"></dashboard-sidebar>
-      <main>
+      <main class="uk-width-1-1">
         <router-outlet></router-outlet>
       </main>
-    </div>
   </div>
 </div>
 

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit c12916583247fc225ee49c4851b8b4183edc2be0
+Subproject commit 64e8919925eb283df124fc1bcef826a5b62bf991

src/app/pages/community-info/profile/edit-community/edit-community.component.ts

@@ -42,7 +42,7 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach
         <div class="uk-width-1-1">
           <input #file id="photo" type="file" class="uk-hidden" (change)="fileChangeEvent($event)"/>
           <div *ngIf="!communityFb.get('isUpload').value" class="uk-grid uk-grid-column-large" uk-grid>
-            <div class="uk-margin-top uk-width-auto@l uk-width-1-1">
+            <div class="uk-margin-xsmall-top uk-width-auto@l uk-width-1-1">
               <div class="uk-grid uk-grid-column-large uk-flex-middle" uk-grid>
                 <div class="uk-width-auto@l uk-width-1-1 uk-flex uk-flex-center">
                   <button class="uk-button uk-button-primary uk-flex uk-flex-middle uk-flex-wrap"

src/app/pages/customization/color.component.ts

@@ -21,14 +21,14 @@ import {CustomizationOptions} from '../../openaireLibrary/connect/community/Cust
   `,
   styles:[
     `
-    .color-input{
+        .color-input{
-        width:24px;
+            width:24px;
-        height:14px;
+            height:14px;
-        border-radius:3px;
+            border-radius:3px;
-        border:0.1px solid #707070;
+            border:0.1px solid #707070;
-        cursor: pointer;
+            cursor: pointer;
-        
+            
-    }`
+        }`
   ]
 })
 

src/app/pages/projects/remove-projects.component.html

@@ -82,14 +82,14 @@
                 <div class="uk-card uk-card-default">
                   <div class="uk-card-body">
                     <h6 class="uk-margin-bottom">
-                      <a *ngIf="item.openaireId || (item.grantId && item.funder)"
+                      <a *ngIf="(item.openaireId || (item.grantId && item.funder)) && (!item['availableSince'] || !lastDBLoadDate || item['availableSince']<lastDBLoadDate)"
                          target="_blank" class="custom-external uk-link-text"
                          [href]="projectUrl+'?' + ((item.openaireId) ? 'projectId='+item.openaireId : 'grantId='+item.grantId+'&funder='+item.funder)">
                         <span *ngIf="item.name">{{item.name}}</span>
                         <span *ngIf="item.name && item.acronym"> (</span><span *ngIf="item.acronym">{{item.acronym}}</span><span *ngIf="item.name && item.acronym">)</span>
                         <span *ngIf="!item.name && !item.acronym">[no title available]</span>
                       </a>
-                      <span *ngIf="!item.openaireId && !(item.grantId && item.funder)">
+                      <span *ngIf="(!item.openaireId && !(item.grantId && item.funder) || (item['availableSince'] && lastDBLoadDate && item['availableSince'] >= lastDBLoadDate))">
                         <span *ngIf="item.name">{{item.name}}</span>
                         <span *ngIf="item.name && item.acronym"> (</span><span *ngIf="item.acronym">{{item.acronym}}</span><span *ngIf="item.name && item.acronym">)</span>
                         <span *ngIf="!item.name && !item.acronym">[no title available]</span>

src/app/pages/projects/remove-projects.component.ts

@@ -20,6 +20,7 @@ import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class
 import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler";
 import {ClearCacheService} from "../../openaireLibrary/services/clear-cache.service";
 import {debounceTime, distinctUntilChanged} from "rxjs/operators";
+import {IndexInfoService} from "../../openaireLibrary/utils/indexInfo.service";
 
 @Component({
   selector: 'remove-projects',
@@ -63,18 +64,21 @@ export class RemoveProjectsComponent implements OnInit {
   ];
 
   public openaireEntiites = OpenaireEntities;
-
+  lastDBLoadDate = null;
   constructor(private route: ActivatedRoute, private _router: Router,
               private _fb: UntypedFormBuilder,
               private communityService: CommunityService,
               private _manageCommunityProjectsService: ManageCommunityProjectsService,
               private _searchCommunityProjectsService: SearchCommunityProjectsService,
-              private _clearCacheService: ClearCacheService) {
+              private _clearCacheService: ClearCacheService, private indexInfoService: IndexInfoService) {
     this.errorCodes = new ErrorCodes();
     this.communitySearchUtils.status = this.errorCodes.LOADING;
   }
 
   ngOnInit() {
+    this.subscriptions.push(this.indexInfoService.getDBLoadLastDate(this.properties).subscribe(res => {
+      this.lastDBLoadDate = res;
+    }));
     this.communitySearchUtils.keyword = "";
 
     this.filterForm = this._fb.group({
@@ -254,4 +258,6 @@ export class RemoveProjectsComponent implements OnInit {
   isSelected(value: string) {
     return this.filterForm && this.filterForm.get('funder').value && this.filterForm.get('funder').value.id === value;
   }
+
+
 }

src/app/pages/zenodo-communities/zenodo-communities.component.ts

@@ -62,7 +62,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
         this.masterZenodoCommunityId = this.community.zenodoCommunity;
         if (this.masterZenodoCommunityId) {
           this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties,
-            this.properties.zenodoCommunities + this.masterZenodoCommunityId).subscribe(
+             this.masterZenodoCommunityId).subscribe(
             result => {
               this.masterZenodoCommunity = result;
               this.selectedCommunities.unshift(this.masterZenodoCommunity);
@@ -113,7 +113,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy {
   
   getZenodoCommunityById(zenodoid) {
     this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties,
-      this.properties.zenodoCommunities + zenodoid).subscribe(
+       zenodoid).subscribe(
       result => {
         this.selectedCommunities.push(result);
         this.zenodocommunitiesloadedCount++;

src/assets/common-assets

@@ -1 +1 @@
-Subproject commit d18e0a7e43e5ab74649481ecbf352ba49893c66f
+Subproject commit d1b2d5e585722751792d12645d17f820cd6a7860

src/assets/openaire-theme

@@ -1 +1 @@
-Subproject commit 2df4b377a3e89b7dd26a011a2e1e1f07fdcedf2a
+Subproject commit 2dadcf85926bc0f11fff22ed94dc197ddd8587c6

src/environments/environment.beta.ts

@@ -8,7 +8,7 @@ export let properties: EnvProperties = {
   enablePiwikTrack: false,
   useCache: false,
   framesAPIURL: "https://beta.openaire.eu/stats3/",
-  claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/",
+  claimsAPIURL: "https://beta.services.openaire.eu/claims-new/rest/claimsService/",
   statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
   statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
   statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/",
@@ -28,7 +28,7 @@ export let properties: EnvProperties = {
   swhURL: "https://archive.softwareheritage.org/",
   sherpaURL: "http://www.sherpa.ac.uk/romeo/search.php?issn=",
   zenodo: "https://zenodo.org/",
-  zenodoCommunities: "https://zenodo.org/api/communities/",
+  zenodoCommunities: "https://zenodo.org/api/communities",
   openAccess: "https://www.openaire.eu/support/faq#article-id-234",
   openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310",
   fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",

src/environments/environment.prod.ts

@@ -28,7 +28,7 @@ export let properties: EnvProperties = {
   swhURL: "https://archive.softwareheritage.org/",
   sherpaURL: "http://www.sherpa.ac.uk/romeo/search.php?issn=",
   zenodo: "https://zenodo.org/",
-  zenodoCommunities: "https://zenodo.org/api/communities/",
+  zenodoCommunities: "https://zenodo.org/api/communities",
   openAccess: "https://www.openaire.eu/support/faq#article-id-234",
   openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310",
   fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",

src/environments/environment.ts

@@ -33,7 +33,7 @@ export let properties: EnvProperties = {
   swhURL: "https://archive.softwareheritage.org/",
   sherpaURL: 'http://www.sherpa.ac.uk/romeo/search.php?issn=',
   zenodo: 'https://zenodo.org/',
-  zenodoCommunities: 'https://zenodo.org/api/communities/',
+  zenodoCommunities: 'https://zenodo.org/api/communities',
   openAccess: 'https://www.openaire.eu/support/faq#article-id-234',
   openAccessRepo: 'https://www.openaire.eu/support/faq#article-id-310',
   fp7Guidlines: 'https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme',

src/mining.scss

@@ -1,5 +1,5 @@
 @use "sass:meta";
-@import "~interactiveminingv3/assets/css/variables.css";
+@import "node_modules/interactiveminingv3/assets/css/variables.css";
 
 .mining {
 

src/test.ts

@@ -7,8 +7,6 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
-declare const require: any;
-
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
@@ -16,7 +14,3 @@ getTestBed().initTestEnvironment(
     teardown: { destroyAfterEach: false }
 }
 );
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);

tsconfig.json

@@ -10,13 +10,14 @@
     "moduleResolution": "node",
     "experimentalDecorators": true,
     "importHelpers": true,
-    "target": "es2020",
+    "target": "ES2022",
     "typeRoots": [
       "node_modules/@types"
     ],
     "lib": [
       "es2018",
       "dom"
-    ]
+    ],
+    "useDefineForClassFields": false
   }
 }