diff --git a/package.json b/package.json index a8a02f5..88ef5d3 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "ng": "ng", "start": "ng serve --host 0.0.0.0 --disable-host-check --port=5000", - "build": "ng build --output-hashing all", + "build": "ng build --prod", "test": "ng test", "lint": "ng lint", "e2e": "ng e2e" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 3bf655b..2767a5d 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -31,6 +31,7 @@ import {SubscribeService} from './openaireLibrary/utils/subscribe/subscribe.serv import {ConnectRIGuard} from './openaireLibrary/connect/communityGuard/connectRIGuard.guard'; import {SideBarModule} from "./openaireLibrary/sharedComponents/sidebar/sideBar.module"; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; +import {CommunityErrorModule} from './openaireLibrary/connect/communityGuard/communityError.module'; @NgModule({ imports: [ @@ -44,11 +45,11 @@ import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; AlertModalModule, SafeHtmlPipeModule, FABModule, InteractiveMiningModule, SideBarModule, - BrowserAnimationsModule + BrowserAnimationsModule, CommunityErrorModule ], declarations: [ AppComponent, - CommunityErrorPageComponent, + // CommunityErrorPageComponent, AdminErrorPageComponent ], providers: [ diff --git a/src/app/pages/community/content-providers/add-content-providers.component.html b/src/app/pages/community/content-providers/add-content-providers.component.html index c27ff4b..96ed2f3 100644 --- a/src/app/pages/community/content-providers/add-content-providers.component.html +++ b/src/app/pages/community/content-providers/add-content-providers.component.html @@ -2,8 +2,8 @@
- -
diff --git a/src/app/pages/divhelpcontent/edit-div-help-content.component.ts b/src/app/pages/divhelpcontent/edit-div-help-content.component.ts index b838a4a..e9cbfc2 100644 --- a/src/app/pages/divhelpcontent/edit-div-help-content.component.ts +++ b/src/app/pages/divhelpcontent/edit-div-help-content.component.ts @@ -117,7 +117,7 @@ export class EditDivHelpContentComponent implements OnInit, OnDestroy{ this.formComponent.myForm.patchValue((divHelpContent)); } - private saveCustom() { + public saveCustom() { if(!Session.isLoggedIn()){ this.router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this.router.url} }); } else { @@ -144,7 +144,7 @@ export class EditDivHelpContentComponent implements OnInit, OnDestroy{ } } - private cancelCustom() { + public cancelCustom() { this.errorMessage = ""; this.updateErrorMessage = ""; diff --git a/src/app/pages/divhelpcontent/new-div-help-content.component.html b/src/app/pages/divhelpcontent/new-div-help-content.component.html index 7fb3461..c786e04 100644 --- a/src/app/pages/divhelpcontent/new-div-help-content.component.html +++ b/src/app/pages/divhelpcontent/new-div-help-content.component.html @@ -14,7 +14,7 @@ - +
diff --git a/src/app/pages/divhelpcontent/new-div-help-content.component.ts b/src/app/pages/divhelpcontent/new-div-help-content.component.ts index 06bd3fc..fb191b4 100644 --- a/src/app/pages/divhelpcontent/new-div-help-content.component.ts +++ b/src/app/pages/divhelpcontent/new-div-help-content.component.ts @@ -21,9 +21,9 @@ export class NewDivHelpContentComponent { //private errorMessage : string = null; - private communityPid: string; + public communityPid: string; - private pageId: string; + public pageId: string; public properties:EnvProperties = null; public showLoading: boolean = false; @@ -49,7 +49,7 @@ export class NewDivHelpContentComponent { }); } - private saveCustom() { + public saveCustom() { if(!Session.isLoggedIn()){ this.router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this.router.url} }); } else { @@ -76,7 +76,7 @@ export class NewDivHelpContentComponent { } } - private cancelCustom() { + public cancelCustom() { if(this.pageId) { this.router.navigate( ['/classContents/'], { queryParams: { "communityId": this.communityPid, "pageId": this.pageId } } ); } else { diff --git a/src/app/pages/helpcontent/edit-page-help-content.component.html b/src/app/pages/helpcontent/edit-page-help-content.component.html index 903fcc9..0f20923 100644 --- a/src/app/pages/helpcontent/edit-page-help-content.component.html +++ b/src/app/pages/helpcontent/edit-page-help-content.component.html @@ -14,7 +14,7 @@ - + diff --git a/src/app/pages/helpcontent/edit-page-help-content.component.ts b/src/app/pages/helpcontent/edit-page-help-content.component.ts index 9559844..d9f5c12 100644 --- a/src/app/pages/helpcontent/edit-page-help-content.component.ts +++ b/src/app/pages/helpcontent/edit-page-help-content.component.ts @@ -23,9 +23,9 @@ export class EditPageHelpContentComponent implements OnInit, OnDestroy{ @ViewChild(PageContentFormComponent) public formComponent : PageContentFormComponent; - private communityPid: string; + public communityPid: string; - private pageId: string; + public pageId: string; private sub: Subscription; @@ -98,7 +98,7 @@ export class EditPageHelpContentComponent implements OnInit, OnDestroy{ // console.log("patching",pageHelpContent); } - private saveCustom() { + public saveCustom() { if(!Session.isLoggedIn()){ this.router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this.router.url} }); } else { @@ -124,7 +124,7 @@ export class EditPageHelpContentComponent implements OnInit, OnDestroy{ } } - private cancelCustom() { + public cancelCustom() { this.errorMessage = ""; this.updateErrorMessage = ""; diff --git a/src/app/pages/helpcontent/new-page-help-content.component.html b/src/app/pages/helpcontent/new-page-help-content.component.html index 9e8860d..0027f6c 100644 --- a/src/app/pages/helpcontent/new-page-help-content.component.html +++ b/src/app/pages/helpcontent/new-page-help-content.component.html @@ -15,7 +15,7 @@ - + diff --git a/src/app/pages/helpcontent/new-page-help-content.component.ts b/src/app/pages/helpcontent/new-page-help-content.component.ts index f175237..4ff976d 100644 --- a/src/app/pages/helpcontent/new-page-help-content.component.ts +++ b/src/app/pages/helpcontent/new-page-help-content.component.ts @@ -24,9 +24,9 @@ export class NewPageHelpContentComponent { //private errorMessage : string = null; - private communityPid: string; + public communityPid: string; - private pageId: string; + public pageId: string; public properties:EnvProperties = null; public showLoading: boolean = false; @@ -52,7 +52,7 @@ export class NewPageHelpContentComponent { }); } - private saveCustom() { + public saveCustom() { if(!Session.isLoggedIn()){ this.router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this.router.url} }); } else { @@ -81,7 +81,7 @@ export class NewPageHelpContentComponent { } } - private cancelCustom() { + public cancelCustom() { if(this.pageId) { this.router.navigate( ['/pageContents/'], { queryParams: { "communityId": this.communityPid, "pageId": this.pageId } } ); } else { diff --git a/src/app/pages/htmlpagecontent/edit-htmlpage-content.component.html b/src/app/pages/htmlpagecontent/edit-htmlpage-content.component.html index 368a290..ccca5b2 100644 --- a/src/app/pages/htmlpagecontent/edit-htmlpage-content.component.html +++ b/src/app/pages/htmlpagecontent/edit-htmlpage-content.component.html @@ -15,7 +15,7 @@ - + diff --git a/src/app/pages/htmlpagecontent/edit-htmlpage-content.component.ts b/src/app/pages/htmlpagecontent/edit-htmlpage-content.component.ts index 21cd44f..de906ba 100644 --- a/src/app/pages/htmlpagecontent/edit-htmlpage-content.component.ts +++ b/src/app/pages/htmlpagecontent/edit-htmlpage-content.component.ts @@ -24,9 +24,9 @@ export class EditHtmlPageContentComponent implements OnInit { @ViewChild(HtmlPageContentFormComponent) public formComponent : HtmlPageContentFormComponent; - private communityPid: string; - private pageId: string; - private pageName: string = ""; + communityPid: string; + pageId: string; + pageName: string = ""; //public mode: string = "edit"; private sub: Subscription; @@ -118,7 +118,7 @@ export class EditHtmlPageContentComponent implements OnInit { this.formComponent.myForm.patchValue((htmlPageContent)); } - private saveCustom() { + saveCustom() { if(!Session.isLoggedIn()){ this.router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this.router.url} }); } else { @@ -152,7 +152,7 @@ export class EditHtmlPageContentComponent implements OnInit { } } - private cancelCustom() { + cancelCustom() { this.errorMessage = ""; this.updateErrorMessage = ""; this.router.navigate(['/pages'], { queryParams: { "type": "html", "communityId": this.communityPid}}); diff --git a/src/app/pages/htmlpagecontent/html-page-content-form.component.html b/src/app/pages/htmlpagecontent/html-page-content-form.component.html index ffbc9f9..270633c 100644 --- a/src/app/pages/htmlpagecontent/html-page-content-form.component.html +++ b/src/app/pages/htmlpagecontent/html-page-content-form.component.html @@ -5,7 +5,7 @@ Edit html page content - +
- + diff --git a/src/app/pages/zenodo-communities/add-zenodo-communities.component.ts b/src/app/pages/zenodo-communities/add-zenodo-communities.component.ts index 917cdfb..78c0042 100644 --- a/src/app/pages/zenodo-communities/add-zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/add-zenodo-communities.component.ts @@ -28,7 +28,7 @@ export class AddZenodoCommunitiesComponent implements OnInit { public zenodoCommunitySearchUtils:SearchUtilsClass = new SearchUtilsClass(); - private errorCodes: ErrorCodes; + errorCodes: ErrorCodes; public rowsOnPage = 10; @Input() masterCommunity = null; @Input() selectedCommunities = []; diff --git a/src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts b/src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts index 5afe4d5..fdd4d9a 100644 --- a/src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts @@ -36,7 +36,7 @@ export class ManageZenodoCommunitiesComponent implements OnInit { @Input() searchUtils:SearchUtilsClass = null; - private errorCodes: ErrorCodes; + errorCodes: ErrorCodes; public rowsOnPage = 10; @Input() masterCommunity = null; @Input() selectedCommunities = [];