diff --git a/.github/workflows/dotnet-core-master.yml b/.github/workflows/dotnet-core-master.yml index 630235ea..a6174721 100644 --- a/.github/workflows/dotnet-core-master.yml +++ b/.github/workflows/dotnet-core-master.yml @@ -108,6 +108,8 @@ jobs: run: cat docker_run_log - name: Pretest changes to work with Docker container run: sed -i 's/localhost/mariadbtest/g' eform-angular-frontend/eform-client/playwright/e2e/Constants/DatabaseConfigurationConstants.ts + - name: Enable Corepack + run: corepack enable - name: yarn install run: cd eform-angular-frontend/eform-client && yarn install - name: Install Playwright browsers diff --git a/.github/workflows/dotnet-core-pr.yml b/.github/workflows/dotnet-core-pr.yml index 92c77639..ca2a13c7 100644 --- a/.github/workflows/dotnet-core-pr.yml +++ b/.github/workflows/dotnet-core-pr.yml @@ -18,7 +18,7 @@ jobs: uses: actions/checkout@v3 with: repository: microting/eform-angular-frontend - ref: stable + ref: ${{ github.base_ref }} path: eform-angular-frontend - name: Copy dependencies run: | @@ -81,7 +81,7 @@ jobs: uses: actions/checkout@v3 with: repository: microting/eform-angular-frontend - ref: stable + ref: ${{ github.base_ref }} path: eform-angular-frontend - name: Sleep 15 seconds run: sleep 15 @@ -102,6 +102,8 @@ jobs: run: cat docker_run_log - name: Pretest changes to work with Docker container run: sed -i 's/localhost/mariadbtest/g' eform-angular-frontend/eform-client/playwright/e2e/Constants/DatabaseConfigurationConstants.ts + - name: Enable Corepack + run: corepack enable - name: yarn install run: cd eform-angular-frontend/eform-client && yarn install - name: Install Playwright browsers diff --git a/Dockerfile b/Dockerfile index 9850a3dc..ffebe9ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,9 @@ FROM node:22-bookworm-slim as node-env WORKDIR /app ENV PATH /app/node_modules/.bin:$PATH COPY eform-angular-frontend/eform-client ./ +RUN corepack enable RUN yarn install -RUN npm run build +RUN yarn build FROM mcr.microsoft.com/dotnet/sdk:10.0-noble AS build-env WORKDIR /app diff --git a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/components/outer-inner-resource-settings/outer-inner-resource-settings.component.ts b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/components/outer-inner-resource-settings/outer-inner-resource-settings.component.ts index d81e5172..ee0d8504 100644 --- a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/components/outer-inner-resource-settings/outer-inner-resource-settings.component.ts +++ b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/components/outer-inner-resource-settings/outer-inner-resource-settings.component.ts @@ -1,3 +1,11 @@ +import {EformNewSubheaderComponent} from 'src/app/common/modules/eform-shared/components/eform-new-subheader/eform-new-subheader.component'; +import {TranslatePipe} from '@ngx-translate/core'; +import {MatButton} from '@angular/material/button'; +import {MatCard, MatCardContent} from '@angular/material/card'; +import {FormsModule} from '@angular/forms'; +import {MatFormField, MatLabel} from '@angular/material/form-field'; +import {MatInput} from '@angular/material/input'; +import {MtxSelect} from '@ng-matero/extensions/select'; import { ChangeDetectorRef, Component, @@ -18,8 +26,8 @@ import {EFormService} from 'src/app/common/services'; @Component({ selector: 'app-machine-area-settings', templateUrl: './outer-inner-resource-settings.component.html', - styleUrls: ['./outer-inner-resource-settings.component.scss'], - standalone: false + imports: [EformNewSubheaderComponent, TranslatePipe, MatButton, MatCard, MatCardContent, FormsModule, MatFormField, MatLabel, MatInput, MtxSelect], + styleUrls: ['./outer-inner-resource-settings.component.scss'] }) export class OuterInnerResourceSettingsComponent implements OnInit { typeahead = new EventEmitter(); diff --git a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/layouts/outer-inner-resource-pn-layout.component.ts b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/layouts/outer-inner-resource-pn-layout.component.ts index 539d9168..af1b235b 100644 --- a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/layouts/outer-inner-resource-pn-layout.component.ts +++ b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/layouts/outer-inner-resource-pn-layout.component.ts @@ -1,3 +1,4 @@ +import {RouterOutlet} from '@angular/router'; import {AfterContentInit, Component, OnInit} from '@angular/core'; import {TranslateService} from '@ngx-translate/core'; import {translates} from '../i18n/translates'; @@ -7,9 +8,9 @@ import {take} from 'rxjs'; @Component({ selector: 'app-machine-area-pn-layout', + imports: [RouterOutlet], template: ` - `, - standalone: false + ` }) export class OuterInnerResourcePnLayoutComponent implements AfterContentInit, OnInit { private pluginName = 'outer-inner-resource'; diff --git a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/components/inner-resource-create/inner-resource-create.component.ts b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/components/inner-resource-create/inner-resource-create.component.ts index f7049812..e293a423 100644 --- a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/components/inner-resource-create/inner-resource-create.component.ts +++ b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/components/inner-resource-create/inner-resource-create.component.ts @@ -1,3 +1,8 @@ +import {FormsModule} from '@angular/forms'; +import {MatFormField, MatLabel} from '@angular/material/form-field'; +import {MatInput} from '@angular/material/input'; +import {MtxGrid} from '@ng-matero/extensions/grid'; +import {MatCheckbox} from '@angular/material/checkbox'; import { Component, EventEmitter, @@ -13,15 +18,15 @@ import {OuterInnerResourcePnInnerResourceService} from '../../../../services'; import {AutoUnsubscribe} from 'ngx-auto-unsubscribe'; import {Subscription} from 'rxjs'; import {MtxGridColumn} from '@ng-matero/extensions/grid'; -import {TranslateService} from '@ngx-translate/core'; -import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; +import {TranslateService, TranslatePipe} from '@ngx-translate/core'; +import {MAT_DIALOG_DATA, MatDialogRef, MatDialogTitle, MatDialogContent, MatDialogActions} from '@angular/material/dialog'; @AutoUnsubscribe() @Component({ selector: 'app-machine-area-pn-machine-create', templateUrl: './inner-resource-create.component.html', - styleUrls: ['./inner-resource-create.component.scss'], - standalone: false + imports: [TranslatePipe, MatDialogTitle, MatDialogContent, MatDialogActions, FormsModule, MatFormField, MatLabel, MatInput, MtxGrid, MatCheckbox], + styleUrls: ['./inner-resource-create.component.scss'] }) export class InnerResourceCreateComponent implements OnInit, OnDestroy { onMachineCreated: EventEmitter = new EventEmitter(); diff --git a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/components/inner-resource-delete/inner-resource-delete.component.ts b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/components/inner-resource-delete/inner-resource-delete.component.ts index 695dc151..caa650bc 100644 --- a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/components/inner-resource-delete/inner-resource-delete.component.ts +++ b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/components/inner-resource-delete/inner-resource-delete.component.ts @@ -1,3 +1,4 @@ +import {TranslatePipe} from '@ngx-translate/core'; import { Component, EventEmitter, Inject, @@ -8,14 +9,14 @@ import {InnerResourcePnModel,} from '../../../../models'; import { OuterInnerResourcePnInnerResourceService } from '../../../../services'; import { AutoUnsubscribe } from 'ngx-auto-unsubscribe'; import { Subscription } from 'rxjs'; -import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; +import {MAT_DIALOG_DATA, MatDialogRef, MatDialogTitle, MatDialogContent, MatDialogActions} from '@angular/material/dialog'; @AutoUnsubscribe() @Component({ selector: 'app-machine-area-pn-machine-delete', templateUrl: './inner-resource-delete.component.html', - styleUrls: ['./inner-resource-delete.component.scss'], - standalone: false + imports: [TranslatePipe, MatDialogTitle, MatDialogContent, MatDialogActions], + styleUrls: ['./inner-resource-delete.component.scss'] }) export class InnerResourceDeleteComponent implements OnInit, OnDestroy { onMachineDeleted: EventEmitter = new EventEmitter(); diff --git a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/components/inner-resource-edit/inner-resource-edit.component.ts b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/components/inner-resource-edit/inner-resource-edit.component.ts index b5ed65d1..84802598 100644 --- a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/components/inner-resource-edit/inner-resource-edit.component.ts +++ b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/components/inner-resource-edit/inner-resource-edit.component.ts @@ -1,3 +1,8 @@ +import {FormsModule} from '@angular/forms'; +import {MatFormField, MatLabel} from '@angular/material/form-field'; +import {MatInput} from '@angular/material/input'; +import {MtxGrid} from '@ng-matero/extensions/grid'; +import {MatCheckbox} from '@angular/material/checkbox'; import { Component, EventEmitter, @@ -14,15 +19,15 @@ import { OuterInnerResourcePnInnerResourceService } from '../../../../services'; import { Subscription } from 'rxjs'; import { AutoUnsubscribe } from 'ngx-auto-unsubscribe'; import {MtxGridColumn} from '@ng-matero/extensions/grid'; -import {TranslateService} from '@ngx-translate/core'; -import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; +import {TranslateService, TranslatePipe} from '@ngx-translate/core'; +import {MAT_DIALOG_DATA, MatDialogRef, MatDialogTitle, MatDialogContent, MatDialogActions} from '@angular/material/dialog'; @AutoUnsubscribe() @Component({ selector: 'app-machine-area-pn-machine-edit', templateUrl: './inner-resource-edit.component.html', - styleUrls: ['./inner-resource-edit.component.scss'], - standalone: false + imports: [TranslatePipe, MatDialogTitle, MatDialogContent, MatDialogActions, FormsModule, MatFormField, MatLabel, MatInput, MtxGrid, MatCheckbox], + styleUrls: ['./inner-resource-edit.component.scss'] }) export class InnerResourceEditComponent implements OnInit, OnDestroy { mappingAreas: OuterResourcesPnModel = new OuterResourcesPnModel(); diff --git a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/components/inner-resources-page/inner-resources-page.component.ts b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/components/inner-resources-page/inner-resources-page.component.ts index a71c8bc2..cfc5347f 100644 --- a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/components/inner-resources-page/inner-resources-page.component.ts +++ b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/components/inner-resources-page/inner-resources-page.component.ts @@ -1,3 +1,10 @@ +import {Sort} from '@angular/material/sort'; +import {EformNewSubheaderComponent} from 'src/app/common/modules/eform-shared/components/eform-new-subheader/eform-new-subheader.component'; +import {EformPaginationComponent} from 'src/app/common/modules/eform-shared/components/eform-pagination/eform-pagination.component'; +import {AsyncPipe, NgIf} from '@angular/common'; +import {MatButton} from '@angular/material/button'; +import {MatTooltip} from '@angular/material/tooltip'; +import {MtxGrid} from '@ng-matero/extensions/grid'; import {Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; import { InnerResourcePnModel, @@ -16,10 +23,9 @@ import {InnerResourcesStateService} from '../store'; import {PaginationModel, TableHeaderElementModel} from 'src/app/common/models'; import {AuthStateService} from 'src/app/common/store'; import {MtxGridColumn} from '@ng-matero/extensions/grid'; -import {TranslateService} from '@ngx-translate/core'; +import {TranslateService, TranslatePipe} from '@ngx-translate/core'; import {MatDialog} from '@angular/material/dialog'; import {Overlay} from '@angular/cdk/overlay'; -import {Sort} from '@angular/material/sort'; import { InnerResourceCreateComponent, InnerResourceDeleteComponent, @@ -37,8 +43,8 @@ import { @Component({ selector: 'app-machine-area-pn-machines-page', templateUrl: './inner-resources-page.component.html', - styleUrls: ['./inner-resources-page.component.scss'], - standalone: false + imports: [EformNewSubheaderComponent, EformPaginationComponent, NgIf, TranslatePipe, AsyncPipe, MatButton, MatTooltip, MtxGrid], + styleUrls: ['./inner-resources-page.component.scss'] }) export class InnerResourcesPageComponent implements OnInit, OnDestroy { @ViewChild('createMachineModal', {static: false}) createMachineModal; diff --git a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/inner-resources.module.ts b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/inner-resources.module.ts index ae1a24a7..ed55cc46 100644 --- a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/inner-resources.module.ts +++ b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/inner-resources/inner-resources.module.ts @@ -1,6 +1,5 @@ -import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; -import {TranslateModule} from '@ngx-translate/core'; +import {MatDialogModule} from '@angular/material/dialog'; import { InnerResourceCreateComponent, InnerResourceDeleteComponent, @@ -8,34 +7,15 @@ import { InnerResourcesPageComponent, } from './components'; import {InnerResourcesRouting} from './inner-resources.routing'; -import {EformSharedModule} from 'src/app/common/modules/eform-shared/eform-shared.module'; -import {FormsModule} from '@angular/forms'; -import {MatTooltipModule} from '@angular/material/tooltip'; -import {MatButtonModule} from '@angular/material/button'; -import {MtxGridModule} from '@ng-matero/extensions/grid'; -import {MatDialogModule} from '@angular/material/dialog'; -import {MatFormFieldModule} from '@angular/material/form-field'; -import {MatInputModule} from '@angular/material/input'; @NgModule({ - declarations: [ + imports: [ + MatDialogModule, InnerResourceCreateComponent, InnerResourceDeleteComponent, InnerResourceEditComponent, InnerResourcesPageComponent, - ], - imports: [ - CommonModule, - TranslateModule, InnerResourcesRouting, - EformSharedModule, - FormsModule, - MatTooltipModule, - MatButtonModule, - MtxGridModule, - MatDialogModule, - MatFormFieldModule, - MatInputModule, ], providers: [], }) diff --git a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/components/outer-resource-create/outer-resource-create.component.ts b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/components/outer-resource-create/outer-resource-create.component.ts index 46cea334..83c5c0d5 100644 --- a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/components/outer-resource-create/outer-resource-create.component.ts +++ b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/components/outer-resource-create/outer-resource-create.component.ts @@ -1,3 +1,8 @@ +import {FormsModule} from '@angular/forms'; +import {MatFormField, MatLabel} from '@angular/material/form-field'; +import {MatInput} from '@angular/material/input'; +import {MtxGrid} from '@ng-matero/extensions/grid'; +import {MatCheckbox} from '@angular/material/checkbox'; import { Component, EventEmitter, @@ -13,15 +18,15 @@ import {OuterInnerResourcePnOuterResourceService} from '../../../../services'; import {AutoUnsubscribe} from 'ngx-auto-unsubscribe'; import {Subscription} from 'rxjs'; import {MtxGridColumn} from '@ng-matero/extensions/grid'; -import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; -import {TranslateService} from '@ngx-translate/core'; +import {MAT_DIALOG_DATA, MatDialogRef, MatDialogTitle, MatDialogContent, MatDialogActions} from '@angular/material/dialog'; +import {TranslateService, TranslatePipe} from '@ngx-translate/core'; @AutoUnsubscribe() @Component({ selector: 'app-machine-area-pn-area-create', templateUrl: './outer-resource-create.component.html', - styleUrls: ['./outer-resource-create.component.scss'], - standalone: false + imports: [TranslatePipe, MatDialogTitle, MatDialogContent, MatDialogActions, FormsModule, MatFormField, MatLabel, MatInput, MtxGrid, MatCheckbox], + styleUrls: ['./outer-resource-create.component.scss'] }) export class OuterResourceCreateComponent implements OnInit, OnDestroy { onAreaCreated: EventEmitter = new EventEmitter(); diff --git a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/components/outer-resource-delete/outer-resource-delete.component.ts b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/components/outer-resource-delete/outer-resource-delete.component.ts index ee07a802..9258d15c 100644 --- a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/components/outer-resource-delete/outer-resource-delete.component.ts +++ b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/components/outer-resource-delete/outer-resource-delete.component.ts @@ -1,3 +1,4 @@ +import {TranslatePipe} from '@ngx-translate/core'; import { Component, EventEmitter, @@ -9,14 +10,14 @@ import {OuterInnerResourcePnOuterResourceService} from '../../../../services'; import {OuterResourcePnModel} from '../../../../models'; import {AutoUnsubscribe} from 'ngx-auto-unsubscribe'; import {Subscription} from 'rxjs'; -import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; +import {MAT_DIALOG_DATA, MatDialogRef, MatDialogTitle, MatDialogContent, MatDialogActions} from '@angular/material/dialog'; @AutoUnsubscribe() @Component({ selector: 'app-machine-area-pn-area-delete', templateUrl: './outer-resource-delete.component.html', - styleUrls: ['./outer-resource-delete.component.scss'], - standalone: false + imports: [TranslatePipe, MatDialogTitle, MatDialogContent, MatDialogActions], + styleUrls: ['./outer-resource-delete.component.scss'] }) export class OuterResourceDeleteComponent implements OnInit, OnDestroy { onAreaDeleted: EventEmitter = new EventEmitter(); diff --git a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/components/outer-resource-edit/outer-resource-edit.component.ts b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/components/outer-resource-edit/outer-resource-edit.component.ts index a2372bf0..d5aa35ef 100644 --- a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/components/outer-resource-edit/outer-resource-edit.component.ts +++ b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/components/outer-resource-edit/outer-resource-edit.component.ts @@ -1,3 +1,8 @@ +import {FormsModule} from '@angular/forms'; +import {MatFormField, MatLabel} from '@angular/material/form-field'; +import {MatInput} from '@angular/material/input'; +import {MtxGrid} from '@ng-matero/extensions/grid'; +import {MatCheckbox} from '@angular/material/checkbox'; import { Component, EventEmitter, @@ -13,16 +18,16 @@ import { import {OuterInnerResourcePnOuterResourceService} from '../../../../services'; import {AutoUnsubscribe} from 'ngx-auto-unsubscribe'; import {Subscription} from 'rxjs'; -import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; +import {MAT_DIALOG_DATA, MatDialogRef, MatDialogTitle, MatDialogContent, MatDialogActions} from '@angular/material/dialog'; import {MtxGridColumn} from '@ng-matero/extensions/grid'; -import {TranslateService} from '@ngx-translate/core'; +import {TranslateService, TranslatePipe} from '@ngx-translate/core'; @AutoUnsubscribe() @Component({ selector: 'app-machine-area-pn-area-edit', templateUrl: './outer-resource-edit.component.html', - styleUrls: ['./outer-resource-edit.component.scss'], - standalone: false + imports: [TranslatePipe, MatDialogTitle, MatDialogContent, MatDialogActions, FormsModule, MatFormField, MatLabel, MatInput, MtxGrid, MatCheckbox], + styleUrls: ['./outer-resource-edit.component.scss'] }) export class OuterResourceEditComponent implements OnInit, OnDestroy { mappingMachines: InnerResourcesPnModel = new InnerResourcesPnModel(); diff --git a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/components/outer-resources-page/outer-resources-page.component.ts b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/components/outer-resources-page/outer-resources-page.component.ts index ff0de3d3..9605cf2a 100644 --- a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/components/outer-resources-page/outer-resources-page.component.ts +++ b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/components/outer-resources-page/outer-resources-page.component.ts @@ -1,3 +1,10 @@ +import {Sort} from '@angular/material/sort'; +import {EformNewSubheaderComponent} from 'src/app/common/modules/eform-shared/components/eform-new-subheader/eform-new-subheader.component'; +import {EformPaginationComponent} from 'src/app/common/modules/eform-shared/components/eform-pagination/eform-pagination.component'; +import {AsyncPipe} from '@angular/common'; +import {MatButton} from '@angular/material/button'; +import {MatTooltip} from '@angular/material/tooltip'; +import {MtxGrid} from '@ng-matero/extensions/grid'; import {Component, OnDestroy, OnInit} from '@angular/core'; import { OuterResourcePnModel, @@ -13,9 +20,8 @@ import {OuterResourcesStateService} from '../store'; import {PaginationModel} from 'src/app/common/models'; import {Subscription} from 'rxjs'; import {AutoUnsubscribe} from 'ngx-auto-unsubscribe'; -import {Sort} from '@angular/material/sort'; import {MtxGridColumn} from '@ng-matero/extensions/grid'; -import {TranslateService} from '@ngx-translate/core'; +import {TranslateService, TranslatePipe} from '@ngx-translate/core'; import {dialogConfigHelper} from 'src/app/common/helpers'; import {MatDialog} from '@angular/material/dialog'; import {Overlay} from '@angular/cdk/overlay'; @@ -35,8 +41,8 @@ import { @Component({ selector: 'app-areas-page', templateUrl: './outer-resources-page.component.html', - styleUrls: ['./outer-resources-page.component.scss'], - standalone: false + imports: [EformNewSubheaderComponent, EformPaginationComponent, TranslatePipe, AsyncPipe, MatButton, MatTooltip, MtxGrid], + styleUrls: ['./outer-resources-page.component.scss'] }) export class OuterResourcesPageComponent implements OnInit, OnDestroy { areasModel: OuterResourcesPnModel = new OuterResourcesPnModel(); diff --git a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/outer-resources.module.ts b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/outer-resources.module.ts index 3ee9dceb..eabdf80d 100644 --- a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/outer-resources.module.ts +++ b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/outer-resources/outer-resources.module.ts @@ -1,7 +1,5 @@ -import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; -import {RouterModule} from '@angular/router'; -import {TranslateModule} from '@ngx-translate/core'; +import {MatDialogModule} from '@angular/material/dialog'; import { OuterResourceCreateComponent, OuterResourceDeleteComponent, @@ -9,37 +7,15 @@ import { OuterResourcesPageComponent, } from './components'; import {OuterResourcesRouting} from './outer-resources.routing'; -import {EformSharedModule} from 'src/app/common/modules/eform-shared/eform-shared.module'; -import {FormsModule} from '@angular/forms'; -import {MatTooltipModule} from '@angular/material/tooltip'; -import {MatButtonModule} from '@angular/material/button'; -import {MtxGridModule} from '@ng-matero/extensions/grid'; -import {MatDialogModule} from '@angular/material/dialog'; -import {MatFormFieldModule} from '@angular/material/form-field'; -import {MatInputModule} from '@angular/material/input'; -import {MatCheckboxModule} from '@angular/material/checkbox'; @NgModule({ - declarations: [ + imports: [ + MatDialogModule, OuterResourceCreateComponent, OuterResourceDeleteComponent, OuterResourceEditComponent, OuterResourcesPageComponent, - ], - imports: [ - CommonModule, - TranslateModule, - RouterModule, OuterResourcesRouting, - EformSharedModule, - FormsModule, - MatTooltipModule, - MatButtonModule, - MtxGridModule, - MatDialogModule, - MatFormFieldModule, - MatInputModule, - MatCheckboxModule, ], providers: [], }) diff --git a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/reports/components/report-generator-container/report-generator-container.component.ts b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/reports/components/report-generator-container/report-generator-container.component.ts index e82dec57..6142b453 100644 --- a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/reports/components/report-generator-container/report-generator-container.component.ts +++ b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/reports/components/report-generator-container/report-generator-container.component.ts @@ -1,3 +1,6 @@ +import {EformNewSubheaderComponent} from 'src/app/common/modules/eform-shared/components/eform-new-subheader/eform-new-subheader.component'; +import {ReportGeneratorFormComponent} from '../report-generator-form/report-generator-form.component'; +import {ReportPreviewTableComponent} from '../report-preview-table/report-preview-table.component'; import { Component, OnInit } from '@angular/core'; import { ReportPnFullModel, ReportPnGenerateModel } from '../../../../models'; import { OuterInnerResourcePnReportsService } from '../../../../services'; @@ -7,8 +10,8 @@ import { ToastrService } from 'ngx-toastr'; @Component({ selector: 'app-machine-area-pn-report-generator', templateUrl: './report-generator-container.component.html', - styleUrls: ['./report-generator-container.component.scss'], - standalone: false + imports: [EformNewSubheaderComponent, ReportGeneratorFormComponent, ReportPreviewTableComponent], + styleUrls: ['./report-generator-container.component.scss'] }) export class ReportGeneratorContainerComponent implements OnInit { reportModel: ReportPnFullModel = new ReportPnFullModel(); diff --git a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/reports/components/report-generator-form/report-generator-form.component.ts b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/reports/components/report-generator-form/report-generator-form.component.ts index 9372df76..21b4ce75 100644 --- a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/reports/components/report-generator-form/report-generator-form.component.ts +++ b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/reports/components/report-generator-form/report-generator-form.component.ts @@ -1,7 +1,13 @@ +import {TranslatePipe} from '@ngx-translate/core'; +import {MatFormField, MatLabel, MatPrefix} from '@angular/material/form-field'; +import {MatDatepickerToggle, MatDateRangeInput, MatStartDate, MatEndDate, MatDateRangePicker} from '@angular/material/datepicker'; +import {MtxSelect} from '@ng-matero/extensions/select'; +import {MatButton, MatIconButton} from '@angular/material/button'; +import {MatIcon} from '@angular/material/icon'; import {Component, EventEmitter, OnInit, Output} from '@angular/core'; import {ReportPnGenerateModel, ReportNamesModel} from '../../../../models'; import {format} from 'date-fns'; -import {FormControl, FormGroup, Validators} from '@angular/forms'; +import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms'; import {OuterInnerResourcePnReportsService} from '../../../../services'; import {OuterInnerResourcePnReportTypeEnum} from '../../../../enums'; import {ExcelIcon} from 'src/app/common/const'; @@ -11,8 +17,8 @@ import {MatIconRegistry} from '@angular/material/icon'; @Component({ selector: 'app-machine-area-pn-report-generator-form', templateUrl: './report-generator-form.component.html', - styleUrls: ['./report-generator-form.component.scss'], - standalone: false + imports: [ReactiveFormsModule, TranslatePipe, MatFormField, MatLabel, MatPrefix, MatDatepickerToggle, MatDateRangeInput, MatStartDate, MatEndDate, MatDateRangePicker, MtxSelect, MatButton, MatIconButton, MatIcon], + styleUrls: ['./report-generator-form.component.scss'] }) export class ReportGeneratorFormComponent implements OnInit { @Output() diff --git a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/reports/components/report-preview-table/report-preview-table.component.ts b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/reports/components/report-preview-table/report-preview-table.component.ts index 63f9e85b..0d4c87d4 100644 --- a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/reports/components/report-preview-table/report-preview-table.component.ts +++ b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/reports/components/report-preview-table/report-preview-table.component.ts @@ -1,3 +1,4 @@ +import {MtxGrid} from '@ng-matero/extensions/grid'; import {Component, Input, OnChanges, OnInit, SimpleChanges, TemplateRef} from '@angular/core'; import {OuterInnerResourcePnReportRelationshipEnum} from '../../../../enums'; import {ReportEntityModel, ReportPnFullModel} from '../../../../models'; @@ -7,8 +8,8 @@ import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'app-machine-area-pn-report-preview-table', templateUrl: './report-preview-table.component.html', - styleUrls: ['./report-preview-table.component.scss'], - standalone: false + imports: [MtxGrid], + styleUrls: ['./report-preview-table.component.scss'] }) export class ReportPreviewTableComponent implements OnInit, OnChanges { @Input() reportData: ReportPnFullModel = new ReportPnFullModel(); diff --git a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/reports/reports.module.ts b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/reports/reports.module.ts index 411312ca..d441bede 100644 --- a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/reports/reports.module.ts +++ b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/modules/reports/reports.module.ts @@ -1,42 +1,19 @@ import {NgModule} from '@angular/core'; -import {RouterModule} from '@angular/router'; -import {TranslateModule} from '@ngx-translate/core'; +import {MatDialogModule} from '@angular/material/dialog'; import { ReportGeneratorContainerComponent, ReportGeneratorFormComponent, ReportPreviewTableComponent, } from './components'; import {ReportsRouting} from './reports.routing'; -import {EformSharedModule} from 'src/app/common/modules/eform-shared/eform-shared.module'; -import {FormsModule, ReactiveFormsModule} from '@angular/forms'; -import {MtxGridModule} from '@ng-matero/extensions/grid'; -import {MatFormFieldModule} from '@angular/material/form-field'; -import {MatIconModule} from '@angular/material/icon'; -import {MatInputModule} from '@angular/material/input'; -import {MtxSelectModule} from '@ng-matero/extensions/select'; -import {MatButtonModule} from '@angular/material/button'; -import {MatDatepickerModule} from '@angular/material/datepicker'; @NgModule({ - declarations: [ + imports: [ + MatDialogModule, ReportGeneratorContainerComponent, ReportGeneratorFormComponent, ReportPreviewTableComponent, - ], - imports: [ - TranslateModule, - RouterModule, ReportsRouting, - EformSharedModule, - FormsModule, - ReactiveFormsModule, - MtxGridModule, - MatFormFieldModule, - MatIconModule, - MatInputModule, - MtxSelectModule, - MatButtonModule, - MatDatepickerModule, ], providers: [], }) diff --git a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/outer-inner-resource-pn.module.ts b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/outer-inner-resource-pn.module.ts index 2307a98f..9facc2ac 100644 --- a/eform-client/src/app/plugins/modules/outer-inner-resource-pn/outer-inner-resource-pn.module.ts +++ b/eform-client/src/app/plugins/modules/outer-inner-resource-pn/outer-inner-resource-pn.module.ts @@ -1,6 +1,5 @@ import {NgModule} from '@angular/core'; -import {FormsModule} from '@angular/forms'; -import {TranslateModule} from '@ngx-translate/core'; +import {MatDialogModule} from '@angular/material/dialog'; import { OuterInnerResourcePnInnerResourceService, OuterInnerResourcePnOuterResourceService, @@ -12,35 +11,20 @@ import { OuterInnerResourceSettingsComponent, } from './components'; import {OuterInnerResourcePnRouting} from './outer-inner-resource-pn.routing'; -import {EformSharedModule} from 'src/app/common/modules/eform-shared/eform-shared.module'; -import {MatButtonModule} from '@angular/material/button'; -import {MatFormFieldModule} from '@angular/material/form-field'; -import {MatInputModule} from '@angular/material/input'; -import {MtxSelectModule} from '@ng-matero/extensions/select'; -import {MatCardModule} from '@angular/material/card'; import {StoreModule} from '@ngrx/store'; import {outerResourceReducer, innerResourcesReducer} from './state'; @NgModule({ imports: [ + MatDialogModule, OuterInnerResourcePnRouting, - TranslateModule, - FormsModule, - EformSharedModule, - MatButtonModule, - MatFormFieldModule, - MatInputModule, - MtxSelectModule, - MatCardModule, + OuterInnerResourcePnLayoutComponent, + OuterInnerResourceSettingsComponent, StoreModule.forFeature('outerInnerResourcePn', { outerResourcesState: outerResourceReducer, innerResourcesState: innerResourcesReducer, }), ], - declarations: [ - OuterInnerResourcePnLayoutComponent, - OuterInnerResourceSettingsComponent, - ], providers: [ OuterInnerResourcePnOuterResourceService, OuterInnerResourcePnInnerResourceService,