changes for angular aot build

dmp-frontend/src/app/core/formatting.module.ts

@@ -1,5 +1,7 @@
 import { DatePipe } from '@angular/common';
 import { NgModule } from '@angular/core';
+import { DateFormatPipe } from './pipes/date-format.pipe';
+import { DateTimeFormatPipe } from './pipes/date-time-format.pipe';
 import { NgForLimitPipe } from './pipes/ng-for-limit.pipe';
 import { TimezoneInfoDisplayPipe } from './pipes/timezone-info-display.pipe';
 import { EnumUtils } from './services/utilities/enum-utils.service';
@@ -13,17 +15,23 @@ import { EnumUtils } from './services/utilities/enum-utils.service';
 @NgModule({
 	declarations: [
 		NgForLimitPipe,
-		TimezoneInfoDisplayPipe
+		TimezoneInfoDisplayPipe,
+		DateFormatPipe,
+		DateTimeFormatPipe
 	],
 	exports: [
 		NgForLimitPipe,
-		TimezoneInfoDisplayPipe
+		TimezoneInfoDisplayPipe,
+		DateFormatPipe,
+		DateTimeFormatPipe
 	],
 	providers: [
 		EnumUtils,
 		DatePipe,
 		NgForLimitPipe,
-		TimezoneInfoDisplayPipe
+		TimezoneInfoDisplayPipe,
+		DateFormatPipe,
+		DateTimeFormatPipe
 	]
 })
 export class FormattingModule { }

dmp-frontend/src/app/core/pipes/culture-info-display.pipe.ts

@@ -1,11 +0,0 @@
-import { Pipe, PipeTransform } from '@angular/core';
-import { CultureInfo } from '../model/culture-info';
-
-@Pipe({ name: 'cultureInfoDisplay' })
-export class CultureInfoDisplayPipe implements PipeTransform {
-	constructor() { }
-
-	public transform(value: CultureInfo): any {
-		return value.nativeName + ' [' + value.name + ']';
-	}
-}

dmp-frontend/src/app/core/pipes/date-format.pipe.ts

@@ -18,26 +18,3 @@ export class DateFormatPipe implements PipeTransform {
 		return this.datePipe.transform(value, format, timezoneToUse, locale);
 	}
 }
-
-@Pipe({
-	name: 'dataTableDateFormatter'
-})
-// This is only used for the DataTable Column definition.
-// It's a hacky way to apply format to the pipe because it only supports passing a pipe instance and calls transform in it without params.
-export class DataTableDateFormatPipe extends DateFormatPipe implements PipeTransform {
-
-	format: string;
-
-	constructor(_datePipe: DatePipe) {
-		super(_datePipe);
-	}
-
-	public withFormat(format: string): DataTableDateFormatPipe {
-		this.format = format;
-		return this;
-	}
-
-	transform(value: any): string | null {
-		return super.transform(value, this.format);
-	}
-}

dmp-frontend/src/app/core/pipes/date-time-format.pipe.ts

@@ -19,28 +19,3 @@ export class DateTimeFormatPipe implements PipeTransform {
 		return this.datePipe.transform(value, format, timezoneToUse, locale);
 	}
 }
-
-
-@Pipe({
-	name: 'dataTableDateTimeFormatter'
-})
-// This is only used for the DataTable Column definition.
-// It's a hacky way to apply format to the pipe because it only supports passing a pipe instance and calls transform in it without params.
-export class DataTableDateTimeFormatPipe extends DateTimeFormatPipe implements PipeTransform {
-
-	format: string;
-
-	constructor(private _datePipe: DatePipe, private _timezoneService: TimezoneService) {
-		super(_datePipe, _timezoneService);
-	}
-
-	public withFormat(format: string): DataTableDateTimeFormatPipe {
-		this.format = format;
-		return this;
-	}
-
-	transform(value: any): string | null {
-		return super.transform(value, this.format);
-	}
-}
-

dmp-frontend/src/app/ui/about/about.module.ts

@@ -1,11 +1,12 @@
 import { NgModule } from '@angular/core';
 import { CommonUiModule } from '../../common/ui/common-ui.module';
 import { AboutComponent } from './about.component';
+import { AboutRoutingModule } from './about.routing';
 
 @NgModule({
 	imports: [
 		CommonUiModule,
-		AboutComponent
+		AboutRoutingModule
 	],
 	declarations: [
 		AboutComponent

dmp-frontend/src/app/ui/admin/dataset-profile/dataset-profile.module.ts

@@ -2,9 +2,10 @@ import { NgModule } from '@angular/core';
 import { CommonFormsModule } from '../../../common/forms/common-forms.module';
 import { CommonUiModule } from '../../../common/ui/common-ui.module';
 import { FormattingModule } from '../../../core/formatting.module';
+import { ConfirmationDialogModule } from '../../../library/confirmation-dialog/confirmation-dialog.module';
 import { DatasetProfileRoutingModule } from './dataset-profile.routing';
-import { DatasetProfileEditorDefaultValueComponent } from './editor/components/composite-profile-editor-default-value/component-profile-editor-default-value.component';
 import { DatasetProfileEditorCompositeFieldComponent } from './editor/components/composite-field/dataset-profile-editor-composite-field.component';
+import { DatasetProfileEditorDefaultValueComponent } from './editor/components/composite-profile-editor-default-value/component-profile-editor-default-value.component';
 import { DatasetProfileEditorAutoCompleteFieldComponent } from './editor/components/field-type/auto-complete/dataset-profile-editor-auto-complete-field.component';
 import { DatasetProfileEditorBooleanDecisionFieldComponent } from './editor/components/field-type/boolean-decision/dataset-profile-editor-boolean-decision-field.component';
 import { DatasetProfileEditorCheckboxFieldComponent } from './editor/components/field-type/checkbox/dataset-profile-editor-checkbox-field.component';
@@ -20,7 +21,7 @@ import { DatasetProfileEditorSectionComponent } from './editor/components/sectio
 import { DatasetProfileEditorComponent } from './editor/dataset-profile-editor.component';
 import { DatasetProfileCriteriaComponent } from './listing/criteria/dataset-profile.component';
 import { DatasetProfileListingComponent } from './listing/dataset-profile-listing.component';
-import { ConfirmationDialogModule } from '../../../library/confirmation-dialog/confirmation-dialog.module';
+import { DatasetProfilePreviewerComponent } from './preview/dataset-profile-preview.component';
 
 @NgModule({
 	imports: [
@@ -47,8 +48,8 @@ import { ConfirmationDialogModule } from '../../../library/confirmation-dialog/c
 		DatasetProfileEditorRadioBoxFieldComponent,
 		DatasetProfileEditorTextAreaFieldComponent,
 		DatasetProfileEditorWordListFieldComponent,
-		DatasetProfileEditorDefaultValueComponent
+		DatasetProfileEditorDefaultValueComponent,
-
+		DatasetProfilePreviewerComponent
 	],
 	entryComponents: [
 	]

dmp-frontend/src/app/ui/admin/dataset-profile/preview/dataset-profile-preview.component.html

@@ -1,2 +1,2 @@
-<app-dynamic-form *ngIf="formGroup" [form]="this.formGroup"
+<!-- <app-dynamic-form *ngIf="formGroup" [form]="this.formGroup"
-        [dataModel]="datasetWizardModel"></app-dynamic-form>
+        [dataModel]="datasetWizardModel"></app-dynamic-form> -->

dmp-frontend/src/app/ui/dmp/dmp.module.ts

@@ -44,8 +44,8 @@ import { DmpWizardDatasetListingComponent } from './wizard/listing/dmp-wizard-da
 		AvailableProfilesComponent,
 		DmpFinalizeDialogComponent,
 		DynamicDmpFieldResolverComponent,
-		// DynamicFieldsProjectComponent,
+		DynamicFieldsProjectComponent,
-		// DynamicFieldProjectComponent
+		DynamicFieldProjectComponent
 	],
 	entryComponents: [
 		DmpInvitationDialogComponent,

dmp-frontend/src/app/ui/dmp/editor/dynamic-fields-project/dynamic-field-project/dynamic-field-project.component.html

@@ -1,3 +1,3 @@
-<app-auto-complete class="mat-form-field-full-width" placeholder="{{ formGroup.get('name').value | translate }}" [inputData]="autoCompleteConfiguration"
+<!-- <app-auto-complete class="mat-form-field-full-width" placeholder="{{ formGroup.get('name').value | translate }}" [inputData]="autoCompleteConfiguration"
     titleKey="label" [formCtrl]="formGroup.get('value')" [displayFunction]="displayFunction"  [disabled]="hasUnResolvedDependencies()">
-</app-auto-complete>
+</app-auto-complete> -->

dmp-frontend/src/app/ui/misc/criteria/base-criteria.component.ts

@@ -1,12 +1,8 @@
-import { Component, OnInit } from '@angular/core';
+import { OnInit } from '@angular/core';
 import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms';
 import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model';
 import { BaseComponent } from '../../../core/common/base/base.component';
 
-@Component({
-	selector: 'app-base-criteria-component',
-	template: '',
-})
 export class BaseCriteriaComponent extends BaseComponent implements OnInit {
 
 	public refreshCallback: Function = null;

dmp-frontend/src/app/ui/misc/dataset-description-form/helpers/dynamic-form-pending-questions/dynamic-form-pending-questions-display.component.ts

@@ -8,11 +8,11 @@ import { DatasetWizardModel } from '../../../../../core/model/dataset/dataset-wi
 import { MarkForConsiderationService } from '../../mark-for-consideration/mark-for-consideration.service';
 import { VisibilityRulesService } from '../../visibility-rules/visibility-rules.service';
 
-@Component({
+// @Component({
-	selector: 'app-dynamic-form-pending-questions-display',
+// 	selector: 'app-dynamic-form-pending-questions-display',
-	templateUrl: './dynamic-form-pending-questions-display.component.html',
+// 	templateUrl: './dynamic-form-pending-questions-display.component.html',
-	styleUrls: ['./dynamic-form-pending-questions-display.component.scss']
+// 	styleUrls: ['./dynamic-form-pending-questions-display.component.scss']
-})
+// })
 export class DynamicFormPendingQuestionsDisplayComponent implements OnInit {
 
 	constructor(

dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContents/table-of-content-field/table-of-content-field.component.ts

@@ -4,10 +4,10 @@ import { Field } from '../../../../../core/model/dataset-profile-definition/fiel
 import { BaseTableOfContent } from '../base-table-of-content.component';
 
 
-@Component({
+// @Component({
-	selector: 'app-table-of-contents-field',
+// 	selector: 'app-table-of-contents-field',
-	templateUrl: './table-of-content-field.component.html'
+// 	templateUrl: './table-of-content-field.component.html'
-})
+// })
 export class TableOfContentsFieldComponent extends BaseTableOfContent {
 	@Input() model: Field;
 	@Input() index: number;

dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContents/table-of-content-fieldset/table-of-content-fieldset.component.ts

@@ -3,10 +3,10 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { CompositeField } from '../../../../../core/model/dataset-profile-definition/composite-field';
 import { BaseTableOfContent } from '../base-table-of-content.component';
 
-@Component({
+// @Component({
-	selector: 'app-table-of-contents-fieldset',
+// 	selector: 'app-table-of-contents-fieldset',
-	templateUrl: './table-of-content-fieldset.component.html'
+// 	templateUrl: './table-of-content-fieldset.component.html'
-})
+// })
 export class TableOfContentsFieldSetComponent extends BaseTableOfContent {
 
 	@Input() model: CompositeField;

dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContents/table-of-content-section/table-of-content-section.component.ts

@@ -3,10 +3,10 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { Section } from '../../../../../core/model/dataset-profile-definition/section';
 import { BaseTableOfContent } from '../base-table-of-content.component';
 
-@Component({
+// @Component({
-	selector: 'app-table-of-contents-section',
+// 	selector: 'app-table-of-contents-section',
-	templateUrl: './table-of-content-section.component.html'
+// 	templateUrl: './table-of-content-section.component.html'
-})
+// })
 export class TableOfContentsSectionComponent extends BaseTableOfContent implements OnInit {
 
 	@Input() model: Section;

dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContents/table-of-contents.component.ts

@@ -1,11 +1,11 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { DatasetProfileDefinitionModel } from '../../../../core/model/dataset-profile-definition/dataset-profile-definition';
 
-@Component({
+// @Component({
-	selector: 'app-table-of-content',
+// 	selector: 'app-table-of-content',
-	templateUrl: './table-of-contents.component.html',
+// 	templateUrl: './table-of-contents.component.html',
-	styleUrls: ['./toc.component.css']
+// 	styleUrls: ['./toc.component.css']
-})
+// })
 export class TableOfContentsComponent implements OnInit {
 
 	@Input()

dmp-frontend/src/app/ui/misc/help-content/help-content.component.ts

@@ -52,15 +52,15 @@ export class HelpContentComponent extends BaseComponent implements OnInit {
 	}
 }
 
-@Component({
+// @Component({
-	selector: 'app-aside-help-content',
+// 	selector: 'app-aside-help-content',
-	template: `
+// 	template: `
-        <ng-template [ngIf]="contents && contents.length>0">
+//         <ng-template [ngIf]="contents && contents.length>0">
-            <ng-template ngFor let-content [ngForOf]="contents">
+//             <ng-template ngFor let-content [ngForOf]="contents">
-                <div [innerHTML]="content.content" class="uk-card uk-card-body uk-card-default sidemenu uk-margin-bottom"></div>
+//                 <div [innerHTML]="content.content" class="uk-card uk-card-body uk-card-default sidemenu uk-margin-bottom"></div>
-            </ng-template>
+//             </ng-template>
-        </ng-template>
+//         </ng-template>
-    `,
+//     `,
-})
+// })
-export class AsideHelpContentComponent extends HelpContentComponent {
+// export class AsideHelpContentComponent extends HelpContentComponent {
-}
+// }

dmp-frontend/src/environments/environment.prod.ts

@@ -25,5 +25,9 @@ export const environment = {
 			oauthUrl: 'https://b2access-integration.fz-juelich.de:443/oauth2-as/oauth2-authz',
 			redirectUri: 'http://opendmp.eu/api/oauth/authorized/b2access'
 		}
-	}
+	},
+	logging: {
+		enabled: false,
+		logLevels: ["debug", "info", "warning", "error"]
+	},
 };

dmp-frontend/src/environments/environment.staging.ts

@@ -25,5 +25,9 @@ export const environment = {
 			oauthUrl: 'https://b2access-integration.fz-juelich.de:443/oauth2-as/oauth2-authz',
 			redirectUri: 'http://opendmp.eu/api/oauth/authorized/b2access'
 		}
-	}
+	},
+	logging: {
+		enabled: false,
+		logLevels: ["debug", "info", "warning", "error"]
+	},
 };