diff --git a/interactivemining-install.sh b/interactivemining-install.sh index 047dd8c..8aaa876 100755 --- a/interactivemining-install.sh +++ b/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 diff --git a/package.json b/package.json index f82f848..93b7fb3 100644 --- a/package.json +++ b/package.json @@ -17,41 +17,40 @@ }, "private": true, "dependencies": { - "@angular/animations": "^14.2.3", - "@angular/cdk": "^14.2.2", - "@angular/common": "^14.2.3", - "@angular/compiler": "^14.2.3", - "@angular/core": "^14.2.3", - "@angular/forms": "^14.2.3", - "@angular/localize": "^14.2.3", - "@angular/material": "^14.2.2", - "@angular/platform-browser": "^14.2.3", - "@angular/platform-browser-dynamic": "^14.2.3", - "@angular/router": "^14.2.3", + "@angular/animations": "^16.1.8", + "@angular/cdk": "^16.1.7", + "@angular/common": "^16.1.8", + "@angular/compiler": "^16.1.8", + "@angular/core": "^16.1.8", + "@angular/forms": "^16.1.8", + "@angular/localize": "^16.1.8", + "@angular/material": "^16.1.7", + "@angular/platform-browser": "^16.1.8", + "@angular/platform-browser-dynamic": "^16.1.8", + "@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", - "zone.js": "~0.11.4" + "uikit": "3.16.24", + "zone.js": "~0.13.1" }, "devDependencies": { - "@angular-devkit/build-angular": "^14.2.3", - "@angular/cli": "^14.2.3", - "@angular/compiler-cli": "^14.2.3", - "@angular/language-service": "^14.2.3", + "@angular-devkit/build-angular": "^16.1.7", + "@angular/cli": "^16.1.7", + "@angular/compiler-cli": "^16.1.8", + "@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" } } diff --git a/src/app/app.component.html b/src/app/app.component.html index c6796f9..bc0d9a2 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -2,17 +2,15 @@
- + +
diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 399c9ba..93a6fa2 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -28,6 +28,7 @@ export class AppComponent implements OnInit { params: BehaviorSubject = new BehaviorSubject(null); data: BehaviorSubject = new BehaviorSubject(null); hasSidebar: boolean = false; + hasInternalSidebar: boolean = false; hasHeader: boolean = true; hasAdminMenu: boolean = false; isFrontPage: boolean = false; @@ -81,6 +82,10 @@ export class AppComponent implements OnInit { this.hasSidebar = hasSidebar; this.cdr.detectChanges(); })); + this.subscriptions.push(this.layoutService.hasInternalSidebar.subscribe(hasInternalSidebar => { + this.hasInternalSidebar = hasInternalSidebar; + this.cdr.detectChanges(); + })); this.subscriptions.push(this.layoutService.hasHeader.subscribe(hasHeader => { this.hasHeader = hasHeader; this.cdr.detectChanges(); diff --git a/src/app/pages/affiliations/affiliations.component.ts b/src/app/pages/affiliations/affiliations.component.ts index 8cba66c..2fd937e 100644 --- a/src/app/pages/affiliations/affiliations.component.ts +++ b/src/app/pages/affiliations/affiliations.component.ts @@ -113,6 +113,7 @@ export class AffiliationsComponent implements OnInit, OnDestroy { deleteAffiliationOpen(index: number) { this.index = index; let affiliation: Affiliation = this.affiliations[index]; + console.log(index, affiliation) this.removeAffiliationModal.alertTitle = 'Delete Organization'; this.removeAffiliationModal.message = 'Do you want to remove ' + affiliation.name + ' from Organizations?'; @@ -164,7 +165,8 @@ export class AffiliationsComponent implements OnInit, OnDestroy { removeAffiliation() { this.loading = true; - this.affiliationService.deleteAffiliation(this.properties.communityAPI + this.community.communityId + '/organizations', + console.log(this.index, this.affiliations[this.index].id) + this.affiliationService.deleteAffiliation(this.properties.communityAPI + this.community.communityId + '/organizations?organizationName='+this.affiliations[this.index].name, this.affiliations[this.index].id).subscribe((deleteOK) => { this.affiliations.splice(this.index, 1); if (this.currentPage.length === 0) { diff --git a/src/app/pages/community-info/profile/edit-community/edit-community.component.ts b/src/app/pages/community-info/profile/edit-community/edit-community.component.ts index 24c0046..0134f16 100644 --- a/src/app/pages/community-info/profile/edit-community/edit-community.component.ts +++ b/src/app/pages/community-info/profile/edit-community/edit-community.component.ts @@ -42,7 +42,7 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach
-
+
-
+
+
+
+
+
+
+
`, @@ -91,9 +101,24 @@ export class EditCommunityComponent { public communityFb: UntypedFormGroup; public statuses: Option[] = [ {label: 'Visible', value: 'all'}, + {label: 'Visible [Public*]', value: 'PUBLIC'}, {label: 'Visible to managers', value: 'manager'}, + {label: 'Visible to managers [Restricted*]', value: 'RESTRICTED'}, +/* + {label: 'Hidden [Private*]', value: 'PRIVATE'}, +*/ {label: 'Hidden', value: 'hidden'} ] + public claimOptions: Option[] = [ + {label: 'Logged in users', value: 'all'}, + {label: 'Members only', value: 'membersOnly'}, + {label: 'Managers only', value: 'managersOnly'} + + ] + public membershipOptions: Option[] = [ + {label: 'Anyone can join', value: 'open'}, + {label: 'By invitation', value: 'byInvitation'} + ] public community: CommunityInfo; public isNew: boolean; public properties: EnvProperties = properties @@ -133,6 +158,8 @@ export class EditCommunityComponent { shortName: this.fb.control(this.community.shortTitle, Validators.required), description: this.fb.control(this.community.description), status: this.fb.control(this.community.status), + claim: this.fb.control(this.community.claim), + membership: this.fb.control(this.community.membership), managers: this.fb.control(this.community.managers), isUpload: this.fb.control(this.community.isUpload), logoUrl: this.fb.control(this.community.logoUrl) diff --git a/src/app/pages/community-routing.module.ts b/src/app/pages/community-routing.module.ts index e4a67fc..c8fec18 100644 --- a/src/app/pages/community-routing.module.ts +++ b/src/app/pages/community-routing.module.ts @@ -31,7 +31,7 @@ import {ConnectRIGuard} from "../openaireLibrary/connect/communityGuard/connectR { path: 'customize-layout', loadChildren: () => import('./customization/customization.module').then(m => m.CustomizationModule), - data: {hasSidebar: true, hasHeader: false} + data: {hasInternalSidebar: true, hasHeader: false} }, { path: 'user-info', diff --git a/src/app/pages/content-providers/remove-content-providers.component.ts b/src/app/pages/content-providers/remove-content-providers.component.ts index 8fce21e..068add6 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.ts +++ b/src/app/pages/content-providers/remove-content-providers.component.ts @@ -81,7 +81,8 @@ export class RemoveContentProvidersComponent implements OnInit { } public confirmedDeleteContentProvider() { - this.subscriptions.push(this._manageCommunityContentProvidersService.removeContentProvider(this.properties, this.community.communityId, this.selectedCommunityContentProvider.id).subscribe( + console.log(this.selectedCommunityContentProvider) + this.subscriptions.push(this._manageCommunityContentProvidersService.removeContentProvider(this.properties, this.community.communityId, this.selectedCommunityContentProvider.openaireId).subscribe( () => { let index = this.communityContentProviders.indexOf(this.selectedCommunityContentProvider); this.communityContentProviders.splice(index, 1); diff --git a/src/app/pages/customization/color.component.ts b/src/app/pages/customization/color.component.ts index 094100e..eabe19e 100644 --- a/src/app/pages/customization/color.component.ts +++ b/src/app/pages/customization/color.component.ts @@ -21,14 +21,14 @@ import {CustomizationOptions} from '../../openaireLibrary/connect/community/Cust `, styles:[ ` - .color-input{ - width:24px; - height:14px; - border-radius:3px; - border:0.1px solid #707070; - cursor: pointer; - - }` + .color-input{ + width:24px; + height:14px; + border-radius:3px; + border:0.1px solid #707070; + cursor: pointer; + + }` ] }) diff --git a/src/app/pages/customization/customization.component.html b/src/app/pages/customization/customization.component.html index 62831e6..3c3624b 100644 --- a/src/app/pages/customization/customization.component.html +++ b/src/app/pages/customization/customization.component.html @@ -1,134 +1,135 @@ -
- -
-
-
- + +
+
+
+ +
-
-
-
-
-
-
Backgrounds
-
Note: Custom background style settings will override any identity settings that effect the - visualisation of a background. -
+
+
+
+
+
Backgrounds
+
Note: Custom background style settings will override any identity settings that effect the + visualisation of a background. +
-
Quick look +
Quick look + +
+ + +
+
+
+
+
Buttons
+
Note: Custom background style settings will override any identity settings that effect the + visualisation of a background. +
+ +
Quick look + +
+
-
-
-
-
-
Buttons
-
Note: Custom background style settings will override any identity settings that effect the - visualisation of a background. -
+
+
-
Quick look +
Identity
+
Note: Custom identity style settings will effect the visualisation of the whole gateway. That + includes buttons, links, tabs, backgrounds, etc.
- -
- -
-
-
- -
Identity
-
Note: Custom identity style settings will effect the visualisation of the whole gateway. That - includes buttons, links, tabs, backgrounds, etc.
- -
-
-
-
See a preview
-
-
-
-
-
-
-
- +
+
See a preview
+
+
+
+
+
+
+
+ +
+
Style has been changed.
+
Click to refresh the view.
-
Style has been changed.
-
Click to refresh the view.
-
- + +
@@ -136,6 +137,7 @@
+
diff --git a/src/app/pages/projects/add-projects.component.html b/src/app/pages/projects/add-projects.component.html index e9e6060..c4858e7 100644 --- a/src/app/pages/projects/add-projects.component.html +++ b/src/app/pages/projects/add-projects.component.html @@ -94,12 +94,12 @@
+ [externalUrl]="projectUrl" [hasLink]="false">