diff --git a/frontend/README.md b/frontend/README.md index ee2afa8c76..35cab3adcb 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -42,6 +42,7 @@ https://prettier.io/ If you get a does not match pattern error, it is likely because of the custom words for the OKR tool here is a regex101 project that showcases how the regex works: https://regex101.com/r/VUyAt6/1 + ## Test Coverage For generating the coverage of our frontend specs (jest), you can use following command: @@ -53,16 +54,16 @@ Open the html file in browser and you get a beautiful overview ## Cypress Tests - local setup - - start local Docker `docker-compose up` - - start local Server: `OkrApplication-E2E` - - start local Client: `npm run start` + - start local Docker `docker-compose up` + - start local Server: `OkrApplication-E2E` + - start local Client: `npm run start` - run selected Tests - - npm run `npm run cypress:open` - - in Cypress App, select `E2E Testing` and `Chrome` as Browser + - npm run `npm run cypress:open` + - in Cypress App, select `E2E Testing` and `Chrome` as Browser - run all tests - - npm run `npm run cypress:run` - - in Cypress App, select `E2E Testing` and `Chrome` as Browser + - npm run `npm run cypress:run` + - in Cypress App, select `E2E Testing` and `Chrome` as Browser - in case of failing Tests: - - stop and restart local Server - - stop and restart local Client - - re-run Cypress Tests + - stop and restart local Server + - stop and restart local Client + - re-run Cypress Tests diff --git a/frontend/cypress/e2e/check-in.cy.ts b/frontend/cypress/e2e/check-in.cy.ts index 46080c59a6..bd11052954 100644 --- a/frontend/cypress/e2e/check-in.cy.ts +++ b/frontend/cypress/e2e/check-in.cy.ts @@ -1,7 +1,7 @@ import * as users from '../fixtures/users.json'; import { uniqueSuffix } from '../support/helper/utils'; import CyOverviewPage from '../support/helper/dom-helper/pages/overviewPage'; -import { Unit } from '../../src/app/shared/types/enums/Unit'; +import { Unit } from '../../src/app/shared/types/enums/unit'; import KeyResultDetailPage from '../support/helper/dom-helper/pages/keyResultDetailPage'; import CheckInDialog from '../support/helper/dom-helper/dialogs/checkInDialog'; import CheckInHistoryDialog from '../support/helper/dom-helper/dialogs/checkInHistoryDialog'; diff --git a/frontend/cypress/e2e/key-result.cy.ts b/frontend/cypress/e2e/key-result.cy.ts index f8d8902d4d..35355e1d00 100644 --- a/frontend/cypress/e2e/key-result.cy.ts +++ b/frontend/cypress/e2e/key-result.cy.ts @@ -1,7 +1,7 @@ import * as users from '../fixtures/users.json'; import CyOverviewPage from '../support/helper/dom-helper/pages/overviewPage'; import KeyResultDetailPage from '../support/helper/dom-helper/pages/keyResultDetailPage'; -import { Unit } from '../../src/app/shared/types/enums/Unit'; +import { Unit } from '../../src/app/shared/types/enums/unit'; import KeyResultDialog from '../support/helper/dom-helper/dialogs/keyResultDialog'; describe('okr key-result', () => { diff --git a/frontend/cypress/e2e/scoring.cy.ts b/frontend/cypress/e2e/scoring.cy.ts index 58ed5c3939..a0c9f6ae66 100644 --- a/frontend/cypress/e2e/scoring.cy.ts +++ b/frontend/cypress/e2e/scoring.cy.ts @@ -1,7 +1,7 @@ import * as users from '../fixtures/users.json'; import { getPercentageMetric, getPercentageOrdinal } from 'cypress/support/helper/scoringSupport'; import CyOverviewPage from '../support/helper/dom-helper/pages/overviewPage'; -import { Unit } from '../../src/app/shared/types/enums/Unit'; +import { Unit } from '../../src/app/shared/types/enums/unit'; import KeyResultDetailPage from '../support/helper/dom-helper/pages/keyResultDetailPage'; describe('okr scoring', () => { diff --git a/frontend/cypress/e2e/tab.cy.ts b/frontend/cypress/e2e/tab.cy.ts index d531804d74..ab40126c3b 100644 --- a/frontend/cypress/e2e/tab.cy.ts +++ b/frontend/cypress/e2e/tab.cy.ts @@ -1,6 +1,6 @@ import * as users from '../fixtures/users.json'; import CyOverviewPage from '../support/helper/dom-helper/pages/overviewPage'; -import { Unit } from '../../src/app/shared/types/enums/Unit'; +import { Unit } from '../../src/app/shared/types/enums/unit'; import KeyResultDetailPage from '../support/helper/dom-helper/pages/keyResultDetailPage'; describe('tabbing workflows', () => { diff --git a/frontend/cypress/support/helper/dom-helper/dialogs/keyResultDialog.ts b/frontend/cypress/support/helper/dom-helper/dialogs/keyResultDialog.ts index c8483fd139..8a5e4683cd 100644 --- a/frontend/cypress/support/helper/dom-helper/dialogs/keyResultDialog.ts +++ b/frontend/cypress/support/helper/dom-helper/dialogs/keyResultDialog.ts @@ -1,5 +1,5 @@ import Dialog from './dialog'; -import { Unit } from '../../../../../src/app/shared/types/enums/Unit'; +import { Unit } from '../../../../../src/app/shared/types/enums/unit'; import ConfirmDialog from './confirmDialog'; import Chainable = Cypress.Chainable; diff --git a/frontend/eslint.config.mjs b/frontend/eslint.config.mjs index b387c1d63f..a5241afaa4 100644 --- a/frontend/eslint.config.mjs +++ b/frontend/eslint.config.mjs @@ -6,8 +6,20 @@ import html from '@html-eslint/eslint-plugin' import angular from 'angular-eslint' import htmlParser from '@html-eslint/parser' import { createRegexForWords } from './eslintHelper.mjs' +import checkFile from 'eslint-plugin-check-file' export default tsEslint.config( + { + files: ['src/app/shared/types/**/*'], + rules: { + 'check-file/filename-naming-convention': [ + 'error', + { + '**/*.{js,ts}': 'KEBAB_CASE', + }, + ], + }, + }, { ignores: ['cypress/downloads/**/*'], }, @@ -19,6 +31,11 @@ export default tsEslint.config( ...tsEslint.configs.stylistic, ...angular.configs.tsRecommended, ], + languageOptions: { + parserOptions: { + project: ['./tsconfig.json', './tsconfig.spec.json'], + }, + }, processor: angular.processInlineTemplates, languageOptions: { parserOptions: { @@ -209,6 +226,7 @@ export default tsEslint.config( 'unused-imports': unusedImports, '@stylistic': stylistic, '@html-eslint': html, + 'check-file': checkFile, }, } ) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 050060cc9a..21a2b3e1c5 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -48,6 +48,7 @@ "cypress": "^13.15.0", "cypress-real-events": "^1.13.0", "eslint": "^9.16.0", + "eslint-plugin-check-file": "^2.8.0", "eslint-plugin-i18n-json": "^4.0.0", "eslint-plugin-unused-imports": "^4.1.4", "jest": "^29.7.0", @@ -9107,9 +9108,9 @@ } }, "node_modules/domutils": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.0.tgz", - "integrity": "sha512-pmjBRsZD5Fz3XR8NlM1zTBDlHjB5OvLjMkGMGHrLabzoECJNPPOCiCNEgSSLQn2pYIOO4Ytfia7zIehRiit+sQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.1.tgz", + "integrity": "sha512-xWXmuRnN9OMP6ptPd2+H0cCbcYBULa5YDTbMm/2lvkWvNA3O4wcW+GvzooqBuNM8yy6pl3VIAeJTUUWUbfI5Fw==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -9584,6 +9585,27 @@ } } }, + "node_modules/eslint-plugin-check-file": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-check-file/-/eslint-plugin-check-file-2.8.0.tgz", + "integrity": "sha512-FvvafMTam2WJYH9uj+FuMxQ1y+7jY3Z6P9T4j2214cH0FBxNzTcmeCiGTj1Lxp3mI6kbbgsXvmgewvf+llKYyw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "is-glob": "^4.0.3", + "micromatch": "^4.0.5" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "type": "ko_fi", + "url": "https://ko-fi.com/huanluo" + }, + "peerDependencies": { + "eslint": ">=7.28.0" + } + }, "node_modules/eslint-plugin-i18n-json": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/eslint-plugin-i18n-json/-/eslint-plugin-i18n-json-4.0.1.tgz", diff --git a/frontend/package.json b/frontend/package.json index fb2e149a98..4fed1e2f3c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -60,14 +60,17 @@ "@eslint/js": "^9.15.0", "@html-eslint/eslint-plugin": "^0.27.0", "@html-eslint/parser": "^0.27.0", + "@stylistic/eslint-plugin": "^2.11.0", "@types/eslint__js": "^8.42.3", "@types/jest": "^29.5.13", "@types/uuid": "^10.0.0", + "@typescript-eslint/eslint-plugin": "^8.15.0", "angular-eslint": "19.0.2", "browserslist": "^4.24.2", "cypress": "^13.15.0", "cypress-real-events": "^1.13.0", "eslint": "^9.16.0", + "eslint-plugin-check-file": "^2.8.0", "eslint-plugin-unused-imports": "^4.1.4", "jest": "^29.7.0", "jest-preset-angular": "^14.2.4", diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts index 6329caf02e..20f000ca59 100644 --- a/frontend/src/app/app-routing.module.ts +++ b/frontend/src/app/app-routing.module.ts @@ -5,7 +5,7 @@ import { of } from 'rxjs'; import { SidePanelComponent } from './shared/side-panel/side-panel.component'; import { authGuard } from './guards/auth.guard'; import { UserService } from './services/user.service'; -import { User } from './shared/types/model/User'; +import { User } from './shared/types/model/user'; import { OAuthService } from 'angular-oauth2-oidc'; import { ObjectiveDetailComponent } from './components/objective-detail/objective-detail.component'; import { KeyResultDetailComponent } from './components/key-result-detail/key-result-detail.component'; diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index cbe6714480..ba111dfe93 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -58,7 +58,7 @@ import { CdkDrag, CdkDragHandle, CdkDropList } from '@angular/cdk/drag-drop'; import { SharedModule } from './shared/shared.module'; import { OAuthInterceptor } from './interceptors/o-auth.interceptor'; import { ErrorInterceptor } from './interceptors/error.interceptor'; -import { CustomRouter } from './shared/customRouter'; +import { CustomRouter } from './shared/custom-router'; import { KeyResultFormComponent } from './components/key-result-form/key-result-form.component'; import { KeyResultDialogComponent } from './components/key-result-dialog/key-result-dialog.component'; import { CheckInHistoryDialogComponent } from './components/check-in-history-dialog/check-in-history-dialog.component'; diff --git a/frontend/src/app/components/action-plan/action-plan.component.spec.ts b/frontend/src/app/components/action-plan/action-plan.component.spec.ts index a898fe8db3..c259862bda 100644 --- a/frontend/src/app/components/action-plan/action-plan.component.spec.ts +++ b/frontend/src/app/components/action-plan/action-plan.component.spec.ts @@ -5,9 +5,9 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { MatDialogRef } from '@angular/material/dialog'; import { CdkDrag, CdkDropList } from '@angular/cdk/drag-drop'; import { ActionService } from '../../services/action.service'; -import { action1, action2, action3, addedAction } from '../../shared/testData'; +import { action1, action2, action3, addedAction } from '../../shared/test-data'; import { BehaviorSubject, of } from 'rxjs'; -import { Action } from '../../shared/types/model/Action'; +import { Action } from '../../shared/types/model/action'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { DialogService } from '../../services/dialog.service'; import { ConfirmDialogComponent } from '../../shared/dialog/confirm-dialog/confirm-dialog.component'; diff --git a/frontend/src/app/components/action-plan/action-plan.component.ts b/frontend/src/app/components/action-plan/action-plan.component.ts index 674ddcf58d..bb3c81f8bb 100644 --- a/frontend/src/app/components/action-plan/action-plan.component.ts +++ b/frontend/src/app/components/action-plan/action-plan.component.ts @@ -1,6 +1,6 @@ import { Component, ElementRef, Input, QueryList, ViewChildren } from '@angular/core'; import { CdkDragDrop, moveItemInArray, transferArrayItem } from '@angular/cdk/drag-drop'; -import { Action } from '../../shared/types/model/Action'; +import { Action } from '../../shared/types/model/action'; import { ActionService } from '../../services/action.service'; import { BehaviorSubject } from 'rxjs'; import { trackByFn } from '../../shared/common'; diff --git a/frontend/src/app/components/application-banner/application-banner.component.spec.ts b/frontend/src/app/components/application-banner/application-banner.component.spec.ts index 16738c5b52..bce75b359e 100644 --- a/frontend/src/app/components/application-banner/application-banner.component.spec.ts +++ b/frontend/src/app/components/application-banner/application-banner.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testin import { ApplicationBannerComponent } from './application-banner.component'; import { By } from '@angular/platform-browser'; import { RefreshDataService } from '../../services/refresh-data.service'; -import { PUZZLE_TOP_BAR_HEIGHT } from '../../shared/constantLibary'; +import { PUZZLE_TOP_BAR_HEIGHT } from '../../shared/constant-library'; import { TeamFilterComponent } from '../team-filter/team-filter.component'; import { QuarterFilterComponent } from '../quarter-filter/quarter-filter.component'; import { HttpClientTestingModule } from '@angular/common/http/testing'; diff --git a/frontend/src/app/components/application-banner/application-banner.component.ts b/frontend/src/app/components/application-banner/application-banner.component.ts index 2e0ef4c781..caf8dcc887 100644 --- a/frontend/src/app/components/application-banner/application-banner.component.ts +++ b/frontend/src/app/components/application-banner/application-banner.component.ts @@ -9,7 +9,7 @@ import { } from '@angular/core'; import { BehaviorSubject } from 'rxjs'; import { RefreshDataService } from '../../services/refresh-data.service'; -import { DEFAULT_HEADER_HEIGHT_PX, PUZZLE_TOP_BAR_HEIGHT } from '../../shared/constantLibary'; +import { DEFAULT_HEADER_HEIGHT_PX, PUZZLE_TOP_BAR_HEIGHT } from '../../shared/constant-library'; @Component({ selector: 'app-application-banner', diff --git a/frontend/src/app/components/application-top-bar/application-top-bar.component.spec.ts b/frontend/src/app/components/application-top-bar/application-top-bar.component.spec.ts index f1cf1d3568..ece5cdbcd2 100644 --- a/frontend/src/app/components/application-top-bar/application-top-bar.component.spec.ts +++ b/frontend/src/app/components/application-top-bar/application-top-bar.component.spec.ts @@ -12,7 +12,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { MatDialogModule } from '@angular/material/dialog'; import { NavigationEnd, Router } from '@angular/router'; import { of } from 'rxjs'; -import { testUser } from '../../shared/testData'; +import { testUser } from '../../shared/test-data'; import { UserService } from '../../services/user.service'; import { ConfigService } from '../../services/config.service'; import { DialogService } from '../../services/dialog.service'; diff --git a/frontend/src/app/components/application-top-bar/application-top-bar.component.ts b/frontend/src/app/components/application-top-bar/application-top-bar.component.ts index 91a1d197db..bd9ba68b17 100644 --- a/frontend/src/app/components/application-top-bar/application-top-bar.component.ts +++ b/frontend/src/app/components/application-top-bar/application-top-bar.component.ts @@ -4,7 +4,7 @@ import { BehaviorSubject, Subscription } from 'rxjs'; import { ConfigService } from '../../services/config.service'; import { NavigationEnd, Router } from '@angular/router'; import { UserService } from '../../services/user.service'; -import { getFullNameOfUser } from '../../shared/types/model/User'; +import { getFullNameOfUser } from '../../shared/types/model/user'; @Component({ selector: 'app-application-top-bar', diff --git a/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.spec.ts b/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.spec.ts index 333ea339f5..953467ef0b 100644 --- a/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.spec.ts +++ b/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { CheckInHistoryDialogComponent } from './check-in-history-dialog.component'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { provideHttpClientTesting } from '@angular/common/http/testing'; -import { checkInMetric, checkInMetricWriteableFalse, keyResult } from '../../shared/testData'; +import { checkInMetric, checkInMetricWriteableFalse, keyResult } from '../../shared/test-data'; import { By } from '@angular/platform-browser'; import { DialogService } from '../../services/dialog.service'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; diff --git a/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.ts b/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.ts index 9ccea9d58b..b6041c2cc7 100644 --- a/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.ts +++ b/frontend/src/app/components/check-in-history-dialog/check-in-history-dialog.component.ts @@ -1,16 +1,16 @@ import { Component, Inject, OnInit } from '@angular/core'; -import { CheckInMin } from '../../shared/types/model/CheckInMin'; +import { CheckInMin } from '../../shared/types/model/check-in-min'; import { CheckInService } from '../../services/check-in.service'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { DATE_FORMAT } from '../../shared/constantLibary'; -import { KeyResult } from '../../shared/types/model/KeyResult'; +import { DATE_FORMAT } from '../../shared/constant-library'; +import { KeyResult } from '../../shared/types/model/key-result'; import { CheckInFormComponent } from '../checkin/check-in-form/check-in-form.component'; import { Observable, of } from 'rxjs'; -import { KeyResultMetric } from '../../shared/types/model/KeyResultMetric'; +import { KeyResultMetric } from '../../shared/types/model/key-result-metric'; import { RefreshDataService } from '../../services/refresh-data.service'; import { DialogService } from '../../services/dialog.service'; -import { CheckInMetricMin } from '../../shared/types/model/CheckInMetricMin'; -import { CheckInOrdinalMin } from '../../shared/types/model/CheckInOrdinalMin'; +import { CheckInMetricMin } from '../../shared/types/model/check-in-metric-min'; +import { CheckInOrdinalMin } from '../../shared/types/model/check-in-ordinal-min'; @Component({ selector: 'app-check-in-history-dialog', diff --git a/frontend/src/app/components/checkin/check-in-form-metric/check-in-form-metric.component.spec.ts b/frontend/src/app/components/checkin/check-in-form-metric/check-in-form-metric.component.spec.ts index 808addfb4f..b59ae70be5 100644 --- a/frontend/src/app/components/checkin/check-in-form-metric/check-in-form-metric.component.spec.ts +++ b/frontend/src/app/components/checkin/check-in-form-metric/check-in-form-metric.component.spec.ts @@ -1,14 +1,14 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { CheckInFormMetricComponent } from './check-in-form-metric.component'; -import { checkInMetric, keyResultMetric } from '../../../shared/testData'; +import { checkInMetric, keyResultMetric } from '../../../shared/test-data'; import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; import { MatDialogModule } from '@angular/material/dialog'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { MatSelectModule } from '@angular/material/select'; import { MatInputModule } from '@angular/material/input'; import { MatRadioModule } from '@angular/material/radio'; -import { Unit } from '../../../shared/types/enums/Unit'; +import { Unit } from '../../../shared/types/enums/unit'; import { TranslateTestingModule } from 'ngx-translate-testing'; import * as de from '../../../../assets/i18n/de.json'; diff --git a/frontend/src/app/components/checkin/check-in-form-metric/check-in-form-metric.component.ts b/frontend/src/app/components/checkin/check-in-form-metric/check-in-form-metric.component.ts index ca77d2ef0b..1b9c790e2f 100644 --- a/frontend/src/app/components/checkin/check-in-form-metric/check-in-form-metric.component.ts +++ b/frontend/src/app/components/checkin/check-in-form-metric/check-in-form-metric.component.ts @@ -1,10 +1,10 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; import { FormGroup, Validators } from '@angular/forms'; -import { KeyResultMetric } from '../../../shared/types/model/KeyResultMetric'; -import { CheckInMin } from '../../../shared/types/model/CheckInMin'; +import { KeyResultMetric } from '../../../shared/types/model/key-result-metric'; +import { CheckInMin } from '../../../shared/types/model/check-in-min'; import { formInputCheck, hasFormFieldErrors } from '../../../shared/common'; import { TranslateService } from '@ngx-translate/core'; -import { CheckInMetricMin } from '../../../shared/types/model/CheckInMetricMin'; +import { CheckInMetricMin } from '../../../shared/types/model/check-in-metric-min'; @Component({ selector: 'app-check-in-form-metric', diff --git a/frontend/src/app/components/checkin/check-in-form-ordinal/check-in-form-ordinal.component.spec.ts b/frontend/src/app/components/checkin/check-in-form-ordinal/check-in-form-ordinal.component.spec.ts index d29249e2b0..937d65e1f6 100644 --- a/frontend/src/app/components/checkin/check-in-form-ordinal/check-in-form-ordinal.component.spec.ts +++ b/frontend/src/app/components/checkin/check-in-form-ordinal/check-in-form-ordinal.component.spec.ts @@ -2,14 +2,14 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { CheckInFormOrdinalComponent } from './check-in-form-ordinal.component'; import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; -import { keyResultOrdinalMin } from '../../../shared/testData'; -import { KeyResultOrdinal } from '../../../shared/types/model/KeyResultOrdinal'; +import { keyResultOrdinalMin } from '../../../shared/test-data'; +import { KeyResultOrdinal } from '../../../shared/types/model/key-result-ordinal'; import { MatDialogModule } from '@angular/material/dialog'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { MatSelectModule } from '@angular/material/select'; import { MatInputModule } from '@angular/material/input'; import { MatRadioModule } from '@angular/material/radio'; -import { Zone } from '../../../shared/types/enums/Zone'; +import { Zone } from '../../../shared/types/enums/zone'; import { MatRadioButtonHarness } from '@angular/material/radio/testing'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; diff --git a/frontend/src/app/components/checkin/check-in-form-ordinal/check-in-form-ordinal.component.ts b/frontend/src/app/components/checkin/check-in-form-ordinal/check-in-form-ordinal.component.ts index ed8354c380..e48e26172b 100644 --- a/frontend/src/app/components/checkin/check-in-form-ordinal/check-in-form-ordinal.component.ts +++ b/frontend/src/app/components/checkin/check-in-form-ordinal/check-in-form-ordinal.component.ts @@ -1,8 +1,8 @@ import { Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { KeyResultOrdinal } from '../../../shared/types/model/KeyResultOrdinal'; -import { Zone } from '../../../shared/types/enums/Zone'; -import { CheckInMin } from '../../../shared/types/model/CheckInMin'; +import { KeyResultOrdinal } from '../../../shared/types/model/key-result-ordinal'; +import { Zone } from '../../../shared/types/enums/zone'; +import { CheckInMin } from '../../../shared/types/model/check-in-min'; @Component({ selector: 'app-check-in-form-ordinal', diff --git a/frontend/src/app/components/checkin/check-in-form/check-in-form.component.spec.ts b/frontend/src/app/components/checkin/check-in-form/check-in-form.component.spec.ts index 888f537e6b..c8ccab833e 100644 --- a/frontend/src/app/components/checkin/check-in-form/check-in-form.component.spec.ts +++ b/frontend/src/app/components/checkin/check-in-form/check-in-form.component.spec.ts @@ -10,7 +10,7 @@ import { keyResultActions, keyResultMetric, keyResultOrdinal -} from '../../../shared/testData'; +} from '../../../shared/test-data'; import { MatIconModule } from '@angular/material/icon'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatSelectModule } from '@angular/material/select'; diff --git a/frontend/src/app/components/checkin/check-in-form/check-in-form.component.ts b/frontend/src/app/components/checkin/check-in-form/check-in-form.component.ts index 6711b0ba98..b7ed36d091 100644 --- a/frontend/src/app/components/checkin/check-in-form/check-in-form.component.ts +++ b/frontend/src/app/components/checkin/check-in-form/check-in-form.component.ts @@ -1,18 +1,18 @@ import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core'; -import { KeyResultMetric } from '../../../shared/types/model/KeyResultMetric'; +import { KeyResultMetric } from '../../../shared/types/model/key-result-metric'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { KeyResult } from '../../../shared/types/model/KeyResult'; -import { KeyResultOrdinal } from '../../../shared/types/model/KeyResultOrdinal'; -import { CheckInMin } from '../../../shared/types/model/CheckInMin'; +import { KeyResult } from '../../../shared/types/model/key-result'; +import { KeyResultOrdinal } from '../../../shared/types/model/key-result-ordinal'; +import { CheckInMin } from '../../../shared/types/model/check-in-min'; import { CheckInService } from '../../../services/check-in.service'; -import { Action } from '../../../shared/types/model/Action'; +import { Action } from '../../../shared/types/model/action'; import { ActionService } from '../../../services/action.service'; import { formInputCheck, hasFormFieldErrors } from '../../../shared/common'; import { TranslateService } from '@ngx-translate/core'; -import { CheckIn } from '../../../shared/types/model/CheckIn'; -import { CheckInMetricMin } from '../../../shared/types/model/CheckInMetricMin'; -import { CheckInOrdinalMin } from '../../../shared/types/model/CheckInOrdinalMin'; +import { CheckIn } from '../../../shared/types/model/check-in'; +import { CheckInMetricMin } from '../../../shared/types/model/check-in-metric-min'; +import { CheckInOrdinalMin } from '../../../shared/types/model/check-in-ordinal-min'; @Component({ selector: 'app-check-in-form', diff --git a/frontend/src/app/components/confidence/confidence.component.spec.ts b/frontend/src/app/components/confidence/confidence.component.spec.ts index a628972571..9081b81aaf 100644 --- a/frontend/src/app/components/confidence/confidence.component.spec.ts +++ b/frontend/src/app/components/confidence/confidence.component.spec.ts @@ -1,9 +1,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ConfidenceComponent } from './confidence.component'; -import { checkInMetric } from '../../shared/testData'; +import { checkInMetric } from '../../shared/test-data'; import { MatSliderModule } from '@angular/material/slider'; -import { CheckInMin } from '../../shared/types/model/CheckInMin'; +import { CheckInMin } from '../../shared/types/model/check-in-min'; import { FormsModule } from '@angular/forms'; import { SimpleChange } from '@angular/core'; import { By } from '@angular/platform-browser'; diff --git a/frontend/src/app/components/confidence/confidence.component.ts b/frontend/src/app/components/confidence/confidence.component.ts index 2255288e73..c74f08359a 100644 --- a/frontend/src/app/components/confidence/confidence.component.ts +++ b/frontend/src/app/components/confidence/confidence.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core'; -import { CheckInMin } from '../../shared/types/model/CheckInMin'; +import { CheckInMin } from '../../shared/types/model/check-in-min'; @Component({ selector: 'app-confidence', diff --git a/frontend/src/app/components/key-result-detail/key-result-detail.component.spec.ts b/frontend/src/app/components/key-result-detail/key-result-detail.component.spec.ts index 9eea2ea837..86fd030620 100644 --- a/frontend/src/app/components/key-result-detail/key-result-detail.component.spec.ts +++ b/frontend/src/app/components/key-result-detail/key-result-detail.component.spec.ts @@ -5,7 +5,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { MatDialogModule } from '@angular/material/dialog'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { keyResult, keyResultWriteableFalse } from '../../shared/testData'; +import { keyResult, keyResultWriteableFalse } from '../../shared/test-data'; import { By } from '@angular/platform-browser'; import { KeyResultService } from '../../services/key-result.service'; import { MatIconModule } from '@angular/material/icon'; diff --git a/frontend/src/app/components/key-result-detail/key-result-detail.component.ts b/frontend/src/app/components/key-result-detail/key-result-detail.component.ts index a2d56f3b53..6e338f4508 100644 --- a/frontend/src/app/components/key-result-detail/key-result-detail.component.ts +++ b/frontend/src/app/components/key-result-detail/key-result-detail.component.ts @@ -1,22 +1,22 @@ import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { KeyResult } from '../../shared/types/model/KeyResult'; +import { KeyResult } from '../../shared/types/model/key-result'; import { KeyResultService } from '../../services/key-result.service'; -import { KeyResultMetric } from '../../shared/types/model/KeyResultMetric'; -import { KeyResultOrdinal } from '../../shared/types/model/KeyResultOrdinal'; +import { KeyResultMetric } from '../../shared/types/model/key-result-metric'; +import { KeyResultOrdinal } from '../../shared/types/model/key-result-ordinal'; import { CheckInHistoryDialogComponent } from '../check-in-history-dialog/check-in-history-dialog.component'; import { BehaviorSubject, catchError, EMPTY, Subject, takeUntil } from 'rxjs'; import { ActivatedRoute, Router } from '@angular/router'; import { RefreshDataService } from '../../services/refresh-data.service'; -import { CloseState } from '../../shared/types/enums/CloseState'; +import { CloseState } from '../../shared/types/enums/close-state'; import { CheckInFormComponent } from '../checkin/check-in-form/check-in-form.component'; -import { State } from '../../shared/types/enums/State'; -import { DATE_FORMAT } from '../../shared/constantLibary'; +import { State } from '../../shared/types/enums/state'; +import { DATE_FORMAT } from '../../shared/constant-library'; import { calculateCurrentPercentage } from '../../shared/common'; import { KeyResultDialogComponent } from '../key-result-dialog/key-result-dialog.component'; import { DialogService } from '../../services/dialog.service'; -import { KeyResultMin } from '../../shared/types/model/KeyResultMin'; -import { KeyResultMetricMin } from '../../shared/types/model/KeyResultMetricMin'; -import { KeyResultOrdinalMin } from '../../shared/types/model/KeyResultOrdinalMin'; +import { KeyResultMin } from '../../shared/types/model/key-result-min'; +import { KeyResultMetricMin } from '../../shared/types/model/key-result-metric-min'; +import { KeyResultOrdinalMin } from '../../shared/types/model/key-result-ordinal-min'; @Component({ selector: 'app-key-result-detail', diff --git a/frontend/src/app/components/key-result-dialog/key-result-dialog.component.spec.ts b/frontend/src/app/components/key-result-dialog/key-result-dialog.component.spec.ts index 1ef8d75f27..4850d8b166 100644 --- a/frontend/src/app/components/key-result-dialog/key-result-dialog.component.spec.ts +++ b/frontend/src/app/components/key-result-dialog/key-result-dialog.component.spec.ts @@ -7,14 +7,14 @@ import { MatInputModule } from '@angular/material/input'; import { ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; import { By } from '@angular/platform-browser'; -import { testUser, users } from '../../shared/testData'; -import { State } from '../../shared/types/enums/State'; -import { KeyResult } from '../../shared/types/model/KeyResult'; +import { testUser, users } from '../../shared/test-data'; +import { State } from '../../shared/types/enums/state'; +import { KeyResult } from '../../shared/types/model/key-result'; import { of } from 'rxjs'; import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { MatSelectModule } from '@angular/material/select'; import { MatRadioModule } from '@angular/material/radio'; -import { KeyResultObjective } from '../../shared/types/model/KeyResultObjective'; +import { KeyResultObjective } from '../../shared/types/model/key-result-objective'; import { OAuthService } from 'angular-oauth2-oidc'; import { KeyResultTypeComponent } from '../key-result-type/key-result-type.component'; import { ActionPlanComponent } from '../action-plan/action-plan.component'; @@ -27,7 +27,7 @@ import { provideHttpClient } from '@angular/common/http'; import { provideHttpClientTesting } from '@angular/common/http/testing'; import { MatDividerModule } from '@angular/material/divider'; import { DialogTemplateCoreComponent } from '../../shared/custom/dialog-template-core/dialog-template-core.component'; -import { Quarter } from '../../shared/types/model/Quarter'; +import { Quarter } from '../../shared/types/model/quarter'; describe('KeyResultDialogComponent', () => { let component: KeyResultDialogComponent; diff --git a/frontend/src/app/components/key-result-dialog/key-result-dialog.component.ts b/frontend/src/app/components/key-result-dialog/key-result-dialog.component.ts index 2ef8283c11..061566bf91 100644 --- a/frontend/src/app/components/key-result-dialog/key-result-dialog.component.ts +++ b/frontend/src/app/components/key-result-dialog/key-result-dialog.component.ts @@ -1,13 +1,13 @@ import { Component, Inject } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; -import { User } from '../../shared/types/model/User'; -import { Action } from '../../shared/types/model/Action'; +import { User } from '../../shared/types/model/user'; +import { Action } from '../../shared/types/model/action'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { Objective } from '../../shared/types/model/Objective'; -import { KeyResult } from '../../shared/types/model/KeyResult'; -import { KeyResultMetricDTO } from '../../shared/types/DTOs/KeyResultMetricDTO'; -import { KeyResultOrdinalDTO } from '../../shared/types/DTOs/KeyResultOrdinalDTO'; -import { CloseState } from '../../shared/types/enums/CloseState'; +import { Objective } from '../../shared/types/model/objective'; +import { KeyResult } from '../../shared/types/model/key-result'; +import { KeyResultMetricDto } from '../../shared/types/DTOs/key-result-metric-dto'; +import { KeyResultOrdinalDto } from '../../shared/types/DTOs/key-result-ordinal-dto'; +import { CloseState } from '../../shared/types/enums/close-state'; import { KeyResultService } from '../../services/key-result.service'; import { DialogService } from '../../services/dialog.service'; @@ -50,10 +50,10 @@ export class KeyResultDialogComponent { const value = this.keyResultForm.value; const keyResult = this.isMetricKeyResult() ? ({ ...value, - objective: this.data.objective } as KeyResultMetricDTO) + objective: this.data.objective } as KeyResultMetricDto) : ({ ...value, objective: this.data.objective, - id: this.data.keyResult?.id } as KeyResultOrdinalDTO); + id: this.data.keyResult?.id } as KeyResultOrdinalDto); keyResult.id = this.data.keyResult?.id; keyResult.version = this.data.keyResult?.version!; keyResult.actionList = keyResult.actionList!.filter((action: Action) => action.action !== ''); diff --git a/frontend/src/app/components/key-result-form/key-result-form.component.spec.ts b/frontend/src/app/components/key-result-form/key-result-form.component.spec.ts index 1d5f78a32f..2c5bc21586 100644 --- a/frontend/src/app/components/key-result-form/key-result-form.component.spec.ts +++ b/frontend/src/app/components/key-result-form/key-result-form.component.spec.ts @@ -6,14 +6,14 @@ import { MatInputModule } from '@angular/material/input'; import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; import { provideHttpClientTesting } from '@angular/common/http/testing'; import { MatIconModule } from '@angular/material/icon'; -import { keyResultOrdinal, testUser, users } from '../../shared/testData'; -import { State } from '../../shared/types/enums/State'; +import { keyResultOrdinal, testUser, users } from '../../shared/test-data'; +import { State } from '../../shared/types/enums/state'; import { Observable, of } from 'rxjs'; import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { MatSelectModule } from '@angular/material/select'; import { MatRadioModule } from '@angular/material/radio'; -import { KeyResultObjective } from '../../shared/types/model/KeyResultObjective'; -import { User } from '../../shared/types/model/User'; +import { KeyResultObjective } from '../../shared/types/model/key-result-objective'; +import { User } from '../../shared/types/model/user'; import { OAuthService } from 'angular-oauth2-oidc'; import { KeyResultTypeComponent } from '../key-result-type/key-result-type.component'; import { ActionPlanComponent } from '../action-plan/action-plan.component'; @@ -21,16 +21,16 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { DragDropModule } from '@angular/cdk/drag-drop'; import { UserService } from '../../services/user.service'; import { KeyResultFormComponent } from './key-result-form.component'; -import { Action } from '../../shared/types/model/Action'; -import { KeyResultMetric } from '../../shared/types/model/KeyResultMetric'; -import { KeyResultOrdinal } from '../../shared/types/model/KeyResultOrdinal'; +import { Action } from '../../shared/types/model/action'; +import { KeyResultMetric } from '../../shared/types/model/key-result-metric'; +import { KeyResultOrdinal } from '../../shared/types/model/key-result-ordinal'; import { TranslateTestingModule } from 'ngx-translate-testing'; // @ts-ignore import * as de from '../../../assets/i18n/de.json'; import { provideRouter } from '@angular/router'; import { provideHttpClient } from '@angular/common/http'; import { DialogTemplateCoreComponent } from '../../shared/custom/dialog-template-core/dialog-template-core.component'; -import { Quarter } from '../../shared/types/model/Quarter'; +import { Quarter } from '../../shared/types/model/quarter'; describe('KeyResultFormComponent', () => { let component: KeyResultFormComponent; diff --git a/frontend/src/app/components/key-result-form/key-result-form.component.ts b/frontend/src/app/components/key-result-form/key-result-form.component.ts index 6f88e55fef..bd6150a648 100644 --- a/frontend/src/app/components/key-result-form/key-result-form.component.ts +++ b/frontend/src/app/components/key-result-form/key-result-form.component.ts @@ -1,12 +1,12 @@ import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { getFullNameOfUser, User } from '../../shared/types/model/User'; -import { KeyResult } from '../../shared/types/model/KeyResult'; -import { KeyResultMetric } from '../../shared/types/model/KeyResultMetric'; -import { KeyResultOrdinal } from '../../shared/types/model/KeyResultOrdinal'; +import { getFullNameOfUser, User } from '../../shared/types/model/user'; +import { KeyResult } from '../../shared/types/model/key-result'; +import { KeyResultMetric } from '../../shared/types/model/key-result-metric'; +import { KeyResultOrdinal } from '../../shared/types/model/key-result-ordinal'; import { BehaviorSubject, filter, map, Observable, of, startWith, Subject, switchMap, takeUntil } from 'rxjs'; import { UserService } from '../../services/user.service'; -import { Action } from '../../shared/types/model/Action'; +import { Action } from '../../shared/types/model/action'; import { formInputCheck, hasFormFieldErrors } from '../../shared/common'; import { TranslateService } from '@ngx-translate/core'; diff --git a/frontend/src/app/components/key-result-type/key-result-type.component.spec.ts b/frontend/src/app/components/key-result-type/key-result-type.component.spec.ts index 2650b4e0c3..e12c041f58 100644 --- a/frontend/src/app/components/key-result-type/key-result-type.component.spec.ts +++ b/frontend/src/app/components/key-result-type/key-result-type.component.spec.ts @@ -2,12 +2,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import * as de from '../../../assets/i18n/de.json'; import { KeyResultTypeComponent } from './key-result-type.component'; -import { KeyResult } from '../../shared/types/model/KeyResult'; -import { keyResultMetric, keyResultOrdinal, testUser } from '../../shared/testData'; +import { KeyResult } from '../../shared/types/model/key-result'; +import { keyResultMetric, keyResultOrdinal, testUser } from '../../shared/test-data'; import { TranslateTestingModule } from 'ngx-translate-testing'; import { By } from '@angular/platform-browser'; import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; -import { User } from '../../shared/types/model/User'; +import { User } from '../../shared/types/model/user'; describe('KeyResultTypeComponent', () => { let component: KeyResultTypeComponent; diff --git a/frontend/src/app/components/key-result-type/key-result-type.component.ts b/frontend/src/app/components/key-result-type/key-result-type.component.ts index 6015b9b135..973d335988 100644 --- a/frontend/src/app/components/key-result-type/key-result-type.component.ts +++ b/frontend/src/app/components/key-result-type/key-result-type.component.ts @@ -1,9 +1,9 @@ import { Component, Input, OnInit } from '@angular/core'; -import { KeyResult } from '../../shared/types/model/KeyResult'; +import { KeyResult } from '../../shared/types/model/key-result'; import { FormGroup, Validators } from '@angular/forms'; -import { KeyResultMetric } from '../../shared/types/model/KeyResultMetric'; -import { KeyResultOrdinal } from '../../shared/types/model/KeyResultOrdinal'; -import { Unit } from '../../shared/types/enums/Unit'; +import { KeyResultMetric } from '../../shared/types/model/key-result-metric'; +import { KeyResultOrdinal } from '../../shared/types/model/key-result-ordinal'; +import { Unit } from '../../shared/types/enums/unit'; import { formInputCheck, hasFormFieldErrors } from '../../shared/common'; import { TranslateService } from '@ngx-translate/core'; diff --git a/frontend/src/app/components/key-result/key-result.component.spec.ts b/frontend/src/app/components/key-result/key-result.component.spec.ts index b1d5df7555..9619efdb22 100644 --- a/frontend/src/app/components/key-result/key-result.component.spec.ts +++ b/frontend/src/app/components/key-result/key-result.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { KeyResultComponent } from './key-result.component'; -import { keyResultMetricMin } from '../../shared/testData'; +import { keyResultMetricMin } from '../../shared/test-data'; import { MatDialogModule } from '@angular/material/dialog'; import { ScoringComponent } from '../../shared/custom/scoring/scoring.component'; import { ConfidenceComponent } from '../confidence/confidence.component'; diff --git a/frontend/src/app/components/key-result/key-result.component.ts b/frontend/src/app/components/key-result/key-result.component.ts index f6bc1d016b..d7da9506a8 100644 --- a/frontend/src/app/components/key-result/key-result.component.ts +++ b/frontend/src/app/components/key-result/key-result.component.ts @@ -1,9 +1,9 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { KeyResultMin } from '../../shared/types/model/KeyResultMin'; +import { KeyResultMin } from '../../shared/types/model/key-result-min'; import { Router } from '@angular/router'; -import { DATE_FORMAT } from '../../shared/constantLibary'; -import { KeyResultMetricMin } from '../../shared/types/model/KeyResultMetricMin'; -import { KeyResultOrdinalMin } from '../../shared/types/model/KeyResultOrdinalMin'; +import { DATE_FORMAT } from '../../shared/constant-library'; +import { KeyResultMetricMin } from '../../shared/types/model/key-result-metric-min'; +import { KeyResultOrdinalMin } from '../../shared/types/model/key-result-ordinal-min'; @Component({ selector: 'app-key-result', diff --git a/frontend/src/app/components/objective-detail/objective-detail.component.spec.ts b/frontend/src/app/components/objective-detail/objective-detail.component.spec.ts index 56bcb79888..7e16517083 100644 --- a/frontend/src/app/components/objective-detail/objective-detail.component.spec.ts +++ b/frontend/src/app/components/objective-detail/objective-detail.component.spec.ts @@ -4,7 +4,7 @@ import { ObjectiveDetailComponent } from './objective-detail.component'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { By } from '@angular/platform-browser'; import { ObjectiveService } from '../../services/objective.service'; -import { objective, objectiveWriteableFalse } from '../../shared/testData'; +import { objective, objectiveWriteableFalse } from '../../shared/test-data'; import { of } from 'rxjs'; import { MatDialogModule } from '@angular/material/dialog'; import { ActivatedRoute } from '@angular/router'; diff --git a/frontend/src/app/components/objective-detail/objective-detail.component.ts b/frontend/src/app/components/objective-detail/objective-detail.component.ts index 9901370500..8bf55439b2 100644 --- a/frontend/src/app/components/objective-detail/objective-detail.component.ts +++ b/frontend/src/app/components/objective-detail/objective-detail.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; -import { Objective } from '../../shared/types/model/Objective'; +import { Objective } from '../../shared/types/model/objective'; import { ObjectiveService } from '../../services/objective.service'; import { BehaviorSubject, catchError, EMPTY } from 'rxjs'; import { RefreshDataService } from '../../services/refresh-data.service'; diff --git a/frontend/src/app/components/objective/ObjectiveMenuActions.ts b/frontend/src/app/components/objective/ObjectiveMenuActions.ts index c270765aef..d7d20c16f8 100644 --- a/frontend/src/app/components/objective/ObjectiveMenuActions.ts +++ b/frontend/src/app/components/objective/ObjectiveMenuActions.ts @@ -1,6 +1,6 @@ import { DialogService } from '../../services/dialog.service'; import { RefreshDataService } from '../../services/refresh-data.service'; -import { ObjectiveMin } from '../../shared/types/model/ObjectiveMin'; +import { ObjectiveMin } from '../../shared/types/model/objective-min'; import { ObjectiveFormComponent } from '../../shared/dialog/objective-dialog/objective-form.component'; import { CompleteDialogComponent } from '../../shared/dialog/complete-dialog/complete-dialog.component'; import { diff --git a/frontend/src/app/components/objective/ObjectiveMenuAfterActions.ts b/frontend/src/app/components/objective/ObjectiveMenuAfterActions.ts index dc525282a0..c06aa38b87 100644 --- a/frontend/src/app/components/objective/ObjectiveMenuAfterActions.ts +++ b/frontend/src/app/components/objective/ObjectiveMenuAfterActions.ts @@ -1,9 +1,9 @@ -import { Objective } from '../../shared/types/model/Objective'; -import { State } from '../../shared/types/enums/State'; -import { Completed } from '../../shared/types/model/Completed'; +import { Objective } from '../../shared/types/model/objective'; +import { State } from '../../shared/types/enums/state'; +import { Completed } from '../../shared/types/model/completed'; import { ObjectiveService } from '../../services/objective.service'; import { RefreshDataService } from '../../services/refresh-data.service'; -import { ObjectiveMin } from '../../shared/types/model/ObjectiveMin'; +import { ObjectiveMin } from '../../shared/types/model/objective-min'; import { CompletedService } from '../../services/completed.servce'; export class ObjectiveMenuAfterActions { diff --git a/frontend/src/app/components/objective/objective.component.spec.ts b/frontend/src/app/components/objective/objective.component.spec.ts index daa6c2c4ff..bfc124194e 100644 --- a/frontend/src/app/components/objective/objective.component.spec.ts +++ b/frontend/src/app/components/objective/objective.component.spec.ts @@ -6,8 +6,8 @@ import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { By } from '@angular/platform-browser'; -import { State } from '../../shared/types/enums/State'; -import { objectiveMin } from '../../shared/testData'; +import { State } from '../../shared/types/enums/state'; +import { objectiveMin } from '../../shared/test-data'; import { MatMenuHarness } from '@angular/material/menu/testing'; import { KeyResultComponent } from '../key-result/key-result.component'; import { MatDialogModule } from '@angular/material/dialog'; diff --git a/frontend/src/app/components/objective/objective.component.ts b/frontend/src/app/components/objective/objective.component.ts index 0bb37dd142..06067fe4e8 100644 --- a/frontend/src/app/components/objective/objective.component.ts +++ b/frontend/src/app/components/objective/objective.component.ts @@ -1,5 +1,5 @@ import { Component, Input, ViewChild } from '@angular/core'; -import { ObjectiveMin } from '../../shared/types/model/ObjectiveMin'; +import { ObjectiveMin } from '../../shared/types/model/objective-min'; import { Router } from '@angular/router'; import { distinct, map, ReplaySubject, take } from 'rxjs'; import { RefreshDataService } from '../../services/refresh-data.service'; @@ -8,7 +8,7 @@ import { KeyResultDialogComponent } from '../key-result-dialog/key-result-dialog import { TranslateService } from '@ngx-translate/core'; import { DialogService } from '../../services/dialog.service'; import { ObjectiveMenuActionsService, ObjectiveMenuEntry } from '../../services/objective-menu-actions.service'; -import { State } from '../../shared/types/enums/State'; +import { State } from '../../shared/types/enums/state'; import { MatMenuTrigger } from '@angular/material/menu'; @Component({ diff --git a/frontend/src/app/components/overview/overview.component.spec.ts b/frontend/src/app/components/overview/overview.component.spec.ts index 799b69f863..6e4e1beb75 100644 --- a/frontend/src/app/components/overview/overview.component.spec.ts +++ b/frontend/src/app/components/overview/overview.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { OverviewComponent } from './overview.component'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { overViewEntity1 } from '../../shared/testData'; +import { overViewEntity1 } from '../../shared/test-data'; import { BehaviorSubject, of, Subject } from 'rxjs'; import { OverviewService } from '../../services/overview.service'; import { AppRoutingModule } from '../../app-routing.module'; diff --git a/frontend/src/app/components/overview/overview.component.ts b/frontend/src/app/components/overview/overview.component.ts index c0724cbf63..b1ae2baf75 100644 --- a/frontend/src/app/components/overview/overview.component.ts +++ b/frontend/src/app/components/overview/overview.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; -import { OverviewEntity } from '../../shared/types/model/OverviewEntity'; +import { OverviewEntity } from '../../shared/types/model/overview-entity'; import { BehaviorSubject, catchError, diff --git a/frontend/src/app/components/quarter-filter/quarter-filter.component.spec.ts b/frontend/src/app/components/quarter-filter/quarter-filter.component.spec.ts index aae2470805..81a0852f1e 100644 --- a/frontend/src/app/components/quarter-filter/quarter-filter.component.spec.ts +++ b/frontend/src/app/components/quarter-filter/quarter-filter.component.spec.ts @@ -3,7 +3,7 @@ import { QuarterFilterComponent } from './quarter-filter.component'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { OverviewService } from '../../services/overview.service'; import { Observable, of } from 'rxjs'; -import { Quarter } from '../../shared/types/model/Quarter'; +import { Quarter } from '../../shared/types/model/quarter'; import { QuarterService } from '../../services/quarter.service'; import { RouterTestingHarness, RouterTestingModule } from '@angular/router/testing'; import { FormsModule } from '@angular/forms'; diff --git a/frontend/src/app/components/quarter-filter/quarter-filter.component.ts b/frontend/src/app/components/quarter-filter/quarter-filter.component.ts index 5b2fb3da16..6ab753da01 100644 --- a/frontend/src/app/components/quarter-filter/quarter-filter.component.ts +++ b/frontend/src/app/components/quarter-filter/quarter-filter.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, EventEmitter, OnInit, Output } from '@angular/core'; import { QuarterService } from '../../services/quarter.service'; -import { Quarter } from '../../shared/types/model/Quarter'; +import { Quarter } from '../../shared/types/model/quarter'; import { BehaviorSubject, forkJoin } from 'rxjs'; import { ActivatedRoute, Router } from '@angular/router'; import { RefreshDataService } from '../../services/refresh-data.service'; diff --git a/frontend/src/app/components/team-filter/team-filter.component.spec.ts b/frontend/src/app/components/team-filter/team-filter.component.spec.ts index 7a5c3debc6..5fc20379ac 100644 --- a/frontend/src/app/components/team-filter/team-filter.component.spec.ts +++ b/frontend/src/app/components/team-filter/team-filter.component.spec.ts @@ -7,11 +7,11 @@ import { MatChipsModule } from '@angular/material/chips'; import { TeamService } from '../../services/team.service'; import { RefreshDataService } from '../../services/refresh-data.service'; import { BehaviorSubject, of, Subject } from 'rxjs'; -import { team1, team2, team3, teamList, testUser } from '../../shared/testData'; +import { team1, team2, team3, teamList, testUser } from '../../shared/test-data'; import { Router } from '@angular/router'; import { MatIconModule } from '@angular/material/icon'; import { UserService } from '../../services/user.service'; -import { extractTeamsFromUser } from '../../shared/types/model/User'; +import { extractTeamsFromUser } from '../../shared/types/model/user'; import { ApplicationBannerComponent } from '../application-banner/application-banner.component'; const teamServiceMock = { diff --git a/frontend/src/app/components/team-filter/team-filter.component.ts b/frontend/src/app/components/team-filter/team-filter.component.ts index f4dd5ea46d..107e7e8b08 100644 --- a/frontend/src/app/components/team-filter/team-filter.component.ts +++ b/frontend/src/app/components/team-filter/team-filter.component.ts @@ -1,12 +1,12 @@ import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core'; import { BehaviorSubject, filter, Subject, Subscription, takeUntil } from 'rxjs'; -import { Team } from '../../shared/types/model/Team'; +import { Team } from '../../shared/types/model/team'; import { TeamService } from '../../services/team.service'; import { ActivatedRoute, Router } from '@angular/router'; import { areEqual, getValueFromQuery, optionalReplaceWithNulls, trackByFn } from '../../shared/common'; import { RefreshDataService } from '../../services/refresh-data.service'; import { UserService } from '../../services/user.service'; -import { extractTeamsFromUser } from '../../shared/types/model/User'; +import { extractTeamsFromUser } from '../../shared/types/model/user'; import { BreakpointObserver } from '@angular/cdk/layout'; @Component({ diff --git a/frontend/src/app/components/team/team.component.spec.ts b/frontend/src/app/components/team/team.component.spec.ts index c86612e161..847656468c 100644 --- a/frontend/src/app/components/team/team.component.spec.ts +++ b/frontend/src/app/components/team/team.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TeamComponent } from './team.component'; import { MatIcon } from '@angular/material/icon'; -import { overViewEntity1, overViewEntity2 } from '../../shared/testData'; +import { overViewEntity1, overViewEntity2 } from '../../shared/test-data'; import { ObjectiveComponent } from '../objective/objective.component'; import { RouterTestingModule } from '@angular/router/testing'; import { MatMenuModule } from '@angular/material/menu'; diff --git a/frontend/src/app/components/team/team.component.ts b/frontend/src/app/components/team/team.component.ts index be241e4d3d..1502ffec9c 100644 --- a/frontend/src/app/components/team/team.component.ts +++ b/frontend/src/app/components/team/team.component.ts @@ -1,13 +1,13 @@ import { ChangeDetectionStrategy, Component, Input, TrackByFunction } from '@angular/core'; -import { OverviewEntity } from '../../shared/types/model/OverviewEntity'; +import { OverviewEntity } from '../../shared/types/model/overview-entity'; import { ObjectiveFormComponent } from '../../shared/dialog/objective-dialog/objective-form.component'; import { RefreshDataService } from '../../services/refresh-data.service'; -import { Objective } from '../../shared/types/model/Objective'; +import { Objective } from '../../shared/types/model/objective'; import { KeyResultDialogComponent } from '../key-result-dialog/key-result-dialog.component'; -import { ObjectiveMin } from '../../shared/types/model/ObjectiveMin'; +import { ObjectiveMin } from '../../shared/types/model/objective-min'; import { DialogService } from '../../services/dialog.service'; import { ConfigService } from '../../services/config.service'; -import { ClientConfig } from '../../shared/types/model/ClientConfig'; +import { ClientConfig } from '../../shared/types/model/client-config'; import { BehaviorSubject, first } from 'rxjs'; @Component({ diff --git a/frontend/src/app/interceptors/error.interceptor.spec.ts b/frontend/src/app/interceptors/error.interceptor.spec.ts index 49428c969b..e0749352b2 100644 --- a/frontend/src/app/interceptors/error.interceptor.spec.ts +++ b/frontend/src/app/interceptors/error.interceptor.spec.ts @@ -5,8 +5,8 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { Router } from '@angular/router'; import { ToastrModule } from 'ngx-toastr'; import '../../global'; -import { HttpType } from '../shared/types/enums/HttpType'; -import { ToasterType } from '../shared/types/enums/ToasterType'; +import { HttpType } from '../shared/types/enums/http-type'; +import { ToasterType } from '../shared/types/enums/toaster-type'; describe('ErrorInterceptor', () => { let interceptor: ErrorInterceptor; diff --git a/frontend/src/app/interceptors/error.interceptor.ts b/frontend/src/app/interceptors/error.interceptor.ts index 16fe5adce3..db351019f2 100644 --- a/frontend/src/app/interceptors/error.interceptor.ts +++ b/frontend/src/app/interceptors/error.interceptor.ts @@ -8,11 +8,11 @@ import { GJ_REGEX_PATTERN, SUCCESS_MESSAGE_KEY_PREFIX, SUCCESS_MESSAGE_MAP -} from '../shared/constantLibary'; +} from '../shared/constant-library'; import { ToasterService } from '../services/toaster.service'; import { TranslateService } from '@ngx-translate/core'; -import { HttpType } from '../shared/types/enums/HttpType'; -import { ToasterType } from '../shared/types/enums/ToasterType'; +import { HttpType } from '../shared/types/enums/http-type'; +import { ToasterType } from '../shared/types/enums/toaster-type'; @Injectable() export class ErrorInterceptor implements HttpInterceptor { diff --git a/frontend/src/app/services/action.service.ts b/frontend/src/app/services/action.service.ts index 55599c73f4..44706f7da6 100644 --- a/frontend/src/app/services/action.service.ts +++ b/frontend/src/app/services/action.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { Action } from '../shared/types/model/Action'; +import { Action } from '../shared/types/model/action'; @Injectable({ providedIn: 'root' diff --git a/frontend/src/app/services/check-in.service.spec.ts b/frontend/src/app/services/check-in.service.spec.ts index 876cb583fe..bb420f4c5c 100644 --- a/frontend/src/app/services/check-in.service.spec.ts +++ b/frontend/src/app/services/check-in.service.spec.ts @@ -2,8 +2,8 @@ import { TestBed } from '@angular/core/testing'; import { CheckInService } from './check-in.service'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { firstCheckIn, keyResultMetricWithIdEight, secondCheckIn } from '../shared/testData'; -import { CheckInMetricMin } from '../shared/types/model/CheckInMetricMin'; +import { firstCheckIn, keyResultMetricWithIdEight, secondCheckIn } from '../shared/test-data'; +import { CheckInMetricMin } from '../shared/types/model/check-in-metric-min'; describe('CheckInService', () => { let service: CheckInService; diff --git a/frontend/src/app/services/check-in.service.ts b/frontend/src/app/services/check-in.service.ts index 150d48f7b3..803200f62d 100644 --- a/frontend/src/app/services/check-in.service.ts +++ b/frontend/src/app/services/check-in.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { CheckInMin } from '../shared/types/model/CheckInMin'; +import { CheckInMin } from '../shared/types/model/check-in-min'; import { Observable } from 'rxjs'; -import { CheckIn } from '../shared/types/model/CheckIn'; +import { CheckIn } from '../shared/types/model/check-in'; @Injectable({ providedIn: 'root' diff --git a/frontend/src/app/services/completed.servce.ts b/frontend/src/app/services/completed.servce.ts index 5cfd95f666..bd8c3409f0 100644 --- a/frontend/src/app/services/completed.servce.ts +++ b/frontend/src/app/services/completed.servce.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { Completed } from '../shared/types/model/Completed'; +import { Completed } from '../shared/types/model/completed'; @Injectable({ providedIn: 'root' diff --git a/frontend/src/app/services/config.service.ts b/frontend/src/app/services/config.service.ts index 4d128def97..71c6c06bfd 100644 --- a/frontend/src/app/services/config.service.ts +++ b/frontend/src/app/services/config.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable, shareReplay } from 'rxjs'; -import { ClientConfig } from '../shared/types/model/ClientConfig'; +import { ClientConfig } from '../shared/types/model/client-config'; @Injectable({ providedIn: 'root' diff --git a/frontend/src/app/services/customization.service.spec.ts b/frontend/src/app/services/customization.service.spec.ts index e6130449df..cfb02ee7ae 100644 --- a/frontend/src/app/services/customization.service.spec.ts +++ b/frontend/src/app/services/customization.service.spec.ts @@ -1,6 +1,6 @@ import { CustomizationService } from './customization.service'; import { BehaviorSubject } from 'rxjs'; -import { ClientConfig } from '../shared/types/model/ClientConfig'; +import { ClientConfig } from '../shared/types/model/client-config'; import { ConfigService } from './config.service'; class CallRecorder { diff --git a/frontend/src/app/services/customization.service.ts b/frontend/src/app/services/customization.service.ts index fb083b2756..9975639ae5 100644 --- a/frontend/src/app/services/customization.service.ts +++ b/frontend/src/app/services/customization.service.ts @@ -1,6 +1,6 @@ import { Inject, Injectable } from '@angular/core'; import { DOCUMENT } from '@angular/common'; -import { CustomizationConfig, CustomStyles } from '../shared/types/model/ClientConfig'; +import { CustomizationConfig, CustomStyles } from '../shared/types/model/client-config'; import { ConfigService } from './config.service'; @Injectable({ diff --git a/frontend/src/app/services/dialog.service.spec.ts b/frontend/src/app/services/dialog.service.spec.ts index f6bb8ce798..a9929daddf 100644 --- a/frontend/src/app/services/dialog.service.spec.ts +++ b/frontend/src/app/services/dialog.service.spec.ts @@ -7,7 +7,7 @@ import { ConfirmDialogComponent } from '../shared/dialog/confirm-dialog/confirm- import { AddEditTeamDialogComponent } from '../team-management/add-edit-team-dialog/add-edit-team-dialog.component'; import { provideHttpClientTesting } from '@angular/common/http/testing'; import { provideHttpClient } from '@angular/common/http'; -import { ButtonState } from '../shared/types/enums/ButtonState'; +import { ButtonState } from '../shared/types/enums/button-state'; describe('DialogService', () => { let service: DialogService; diff --git a/frontend/src/app/services/dialog.service.ts b/frontend/src/app/services/dialog.service.ts index b0d1eb49a2..69613306fc 100644 --- a/frontend/src/app/services/dialog.service.ts +++ b/frontend/src/app/services/dialog.service.ts @@ -3,7 +3,7 @@ import { MatDialog, MatDialogConfig, MatDialogRef } from '@angular/material/dial import { ComponentType } from '@angular/cdk/overlay'; import { ConfirmDialogComponent } from '../shared/dialog/confirm-dialog/confirm-dialog.component'; import { TranslateService } from '@ngx-translate/core'; -import { ButtonState } from '../shared/types/enums/ButtonState'; +import { ButtonState } from '../shared/types/enums/button-state'; export interface ConfirmDialogData { title: string; diff --git a/frontend/src/app/services/key-result.service.ts b/frontend/src/app/services/key-result.service.ts index 663cb2a35f..7523e38cc3 100644 --- a/frontend/src/app/services/key-result.service.ts +++ b/frontend/src/app/services/key-result.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { KeyResult } from '../shared/types/model/KeyResult'; +import { KeyResult } from '../shared/types/model/key-result'; import { map, Observable } from 'rxjs'; -import { KeyResultDTO } from '../shared/types/DTOs/KeyResultDTO'; +import { KeyResultDto } from '../shared/types/DTOs/key-result-dto'; @Injectable({ providedIn: 'root' @@ -18,7 +18,7 @@ export class KeyResultService { })); } - saveKeyResult(keyResultDTO: KeyResultDTO): Observable { + saveKeyResult(keyResultDTO: KeyResultDto): Observable { if (keyResultDTO.id) { return this.httpClient.put('/api/v2/keyresults/' + keyResultDTO.id, keyResultDTO); } else { diff --git a/frontend/src/app/services/objective-menu-actions.service.spec.ts b/frontend/src/app/services/objective-menu-actions.service.spec.ts index 70b57d8dcf..328ca3cb10 100644 --- a/frontend/src/app/services/objective-menu-actions.service.spec.ts +++ b/frontend/src/app/services/objective-menu-actions.service.spec.ts @@ -5,9 +5,9 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { provideRouter } from '@angular/router'; import { provideHttpClient } from '@angular/common/http'; import { provideHttpClientTesting } from '@angular/common/http/testing'; -import { ObjectiveMin } from '../shared/types/model/ObjectiveMin'; -import { State } from '../shared/types/enums/State'; -import { objectiveMin } from '../shared/testData'; +import { ObjectiveMin } from '../shared/types/model/objective-min'; +import { State } from '../shared/types/enums/state'; +import { objectiveMin } from '../shared/test-data'; describe('ObjectiveMenuActionsService', () => { let service: ObjectiveMenuActionsService; diff --git a/frontend/src/app/services/objective-menu-actions.service.ts b/frontend/src/app/services/objective-menu-actions.service.ts index d901307294..d6471f0702 100644 --- a/frontend/src/app/services/objective-menu-actions.service.ts +++ b/frontend/src/app/services/objective-menu-actions.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; import { DialogService } from './dialog.service'; import { MatDialogRef } from '@angular/material/dialog'; -import { ObjectiveMin } from '../shared/types/model/ObjectiveMin'; -import { State } from '../shared/types/enums/State'; +import { ObjectiveMin } from '../shared/types/model/objective-min'; +import { State } from '../shared/types/enums/state'; import { ObjectiveMenuAfterActions } from '../components/objective/ObjectiveMenuAfterActions'; import { ObjectiveService } from './objective.service'; import { RefreshDataService } from './refresh-data.service'; import { ObjectiveMenuActions } from '../components/objective/ObjectiveMenuActions'; -import { GJ_REGEX_PATTERN } from '../shared/constantLibary'; +import { GJ_REGEX_PATTERN } from '../shared/constant-library'; import { CompletedService } from './completed.servce'; export type ObjectiveMenuAction = () => MatDialogRef; diff --git a/frontend/src/app/services/objective.service.ts b/frontend/src/app/services/objective.service.ts index 894f4c23a1..daa28f321f 100644 --- a/frontend/src/app/services/objective.service.ts +++ b/frontend/src/app/services/objective.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { Objective } from '../shared/types/model/Objective'; +import { Objective } from '../shared/types/model/objective'; import { Observable } from 'rxjs'; -import { KeyResultDTO } from '../shared/types/DTOs/KeyResultDTO'; -import { User } from '../shared/types/model/User'; -import { CheckIn } from '../shared/types/model/CheckIn'; -import { Action } from '../shared/types/model/Action'; +import { KeyResultDto } from '../shared/types/DTOs/key-result-dto'; +import { User } from '../shared/types/model/user'; +import { CheckIn } from '../shared/types/model/check-in'; +import { Action } from '../shared/types/model/action'; @Injectable({ providedIn: 'root' @@ -17,8 +17,8 @@ export class ObjectiveService { return this.httpClient.get('/api/v2/objectives/' + id); } - getAllKeyResultsByObjective(id: number): Observable { - return this.httpClient.get('api/v2/objectives/' + id + '/keyResults'); + getAllKeyResultsByObjective(id: number): Observable { + return this.httpClient.get('api/v2/objectives/' + id + '/keyResults'); } createObjective(objectiveDTO: Objective): Observable { diff --git a/frontend/src/app/services/overview.service.spec.ts b/frontend/src/app/services/overview.service.spec.ts index 6afb1bb09d..ca9f0154aa 100644 --- a/frontend/src/app/services/overview.service.spec.ts +++ b/frontend/src/app/services/overview.service.spec.ts @@ -4,7 +4,7 @@ import { OverviewService } from './overview.service'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { of } from 'rxjs'; import { HttpClient } from '@angular/common/http'; -import { overviews } from '../shared/testData'; +import { overviews } from '../shared/test-data'; const httpClient = { get: jest.fn() diff --git a/frontend/src/app/services/overview.service.ts b/frontend/src/app/services/overview.service.ts index 74ec7bcb41..6b366a0892 100644 --- a/frontend/src/app/services/overview.service.ts +++ b/frontend/src/app/services/overview.service.ts @@ -2,8 +2,8 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { map, Observable } from 'rxjs'; import { optionalValue } from '../shared/common'; -import { State } from '../shared/types/enums/State'; -import { OverviewEntity } from '../shared/types/model/OverviewEntity'; +import { State } from '../shared/types/enums/state'; +import { OverviewEntity } from '../shared/types/model/overview-entity'; @Injectable({ providedIn: 'root' diff --git a/frontend/src/app/services/quarter.service.ts b/frontend/src/app/services/quarter.service.ts index 4a03acb815..74e5f4a018 100644 --- a/frontend/src/app/services/quarter.service.ts +++ b/frontend/src/app/services/quarter.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { Quarter } from '../shared/types/model/Quarter'; +import { Quarter } from '../shared/types/model/quarter'; import { map, Observable } from 'rxjs'; @Injectable({ diff --git a/frontend/src/app/services/refresh-data.service.ts b/frontend/src/app/services/refresh-data.service.ts index 4b4e5d86d5..f2ca60262c 100644 --- a/frontend/src/app/services/refresh-data.service.ts +++ b/frontend/src/app/services/refresh-data.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, Subject } from 'rxjs'; -import { DEFAULT_HEADER_HEIGHT_PX } from '../shared/constantLibary'; +import { DEFAULT_HEADER_HEIGHT_PX } from '../shared/constant-library'; @Injectable({ providedIn: 'root' diff --git a/frontend/src/app/services/team.service.ts b/frontend/src/app/services/team.service.ts index 76c52a0c72..9511f4180a 100644 --- a/frontend/src/app/services/team.service.ts +++ b/frontend/src/app/services/team.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { Team } from '../shared/types/model/Team'; +import { Team } from '../shared/types/model/team'; import { BehaviorSubject, Observable, tap } from 'rxjs'; -import { User } from '../shared/types/model/User'; -import { UserTeam } from '../shared/types/model/UserTeam'; +import { User } from '../shared/types/model/user'; +import { UserTeam } from '../shared/types/model/user-team'; @Injectable({ providedIn: 'root' diff --git a/frontend/src/app/services/toaster.service.spec.ts b/frontend/src/app/services/toaster.service.spec.ts index b75c3992dd..6d5fc31b23 100644 --- a/frontend/src/app/services/toaster.service.spec.ts +++ b/frontend/src/app/services/toaster.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing'; import { ToasterService } from './toaster.service'; import { ToastrModule, ToastrService } from 'ngx-toastr'; -import { ToasterType } from '../shared/types/enums/ToasterType'; +import { ToasterType } from '../shared/types/enums/toaster-type'; describe('ToasterService', () => { let service: ToasterService; diff --git a/frontend/src/app/services/toaster.service.ts b/frontend/src/app/services/toaster.service.ts index 0fce4c106f..b3a4defb42 100644 --- a/frontend/src/app/services/toaster.service.ts +++ b/frontend/src/app/services/toaster.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { ToastrService } from 'ngx-toastr'; -import { ToasterType } from '../shared/types/enums/ToasterType'; +import { ToasterType } from '../shared/types/enums/toaster-type'; @Injectable({ providedIn: 'root' diff --git a/frontend/src/app/services/user.service.spec.ts b/frontend/src/app/services/user.service.spec.ts index 50f960fdb0..068e31e232 100644 --- a/frontend/src/app/services/user.service.spec.ts +++ b/frontend/src/app/services/user.service.spec.ts @@ -1,7 +1,7 @@ import { fakeAsync, getTestBed, TestBed, tick } from '@angular/core/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { UserService } from './user.service'; -import { testUser, users } from '../shared/testData'; +import { testUser, users } from '../shared/test-data'; describe('UserService', () => { let service: UserService; diff --git a/frontend/src/app/services/user.service.ts b/frontend/src/app/services/user.service.ts index 65fad6cbb8..d649e45266 100644 --- a/frontend/src/app/services/user.service.ts +++ b/frontend/src/app/services/user.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, Observable, of, tap } from 'rxjs'; import { HttpClient } from '@angular/common/http'; -import { User } from '../shared/types/model/User'; -import { NewUser } from '../shared/types/model/NewUser'; -import { UserOkrData } from '../shared/types/model/UserOkrData'; +import { User } from '../shared/types/model/user'; +import { NewUser } from '../shared/types/model/new-user'; +import { UserOkrData } from '../shared/types/model/user-okr-data'; @Injectable({ providedIn: 'root' diff --git a/frontend/src/app/shared/common.spec.ts b/frontend/src/app/shared/common.spec.ts index 2a92a36ffc..205eb8cd7e 100644 --- a/frontend/src/app/shared/common.spec.ts +++ b/frontend/src/app/shared/common.spec.ts @@ -10,8 +10,8 @@ import { sanitize } from './common'; import { FormControl, FormGroup, Validators } from '@angular/forms'; -import { keyResultMetricMinScoring, keyResultOrdinalMinScoring } from './testData'; -import { KeyResultMetricMin } from './types/model/KeyResultMetricMin'; +import { keyResultMetricMinScoring, keyResultOrdinalMinScoring } from './test-data'; +import { KeyResultMetricMin } from './types/model/key-result-metric-min'; describe('test common functions', () => { describe('getNumberOrNull', () => { diff --git a/frontend/src/app/shared/common.ts b/frontend/src/app/shared/common.ts index b77d641991..c31af01f17 100644 --- a/frontend/src/app/shared/common.ts +++ b/frontend/src/app/shared/common.ts @@ -1,5 +1,5 @@ import { FormGroup } from '@angular/forms'; -import { KeyResultMetricMin } from './types/model/KeyResultMetricMin'; +import { KeyResultMetricMin } from './types/model/key-result-metric-min'; export function getNumberOrNull(str: string | null | undefined): number | null { if (str === null || str === undefined || str.toString() diff --git a/frontend/src/app/shared/constantLibary.ts b/frontend/src/app/shared/constant-library.ts similarity index 93% rename from frontend/src/app/shared/constantLibary.ts rename to frontend/src/app/shared/constant-library.ts index da60551f3b..ef3a71f7e5 100644 --- a/frontend/src/app/shared/constantLibary.ts +++ b/frontend/src/app/shared/constant-library.ts @@ -1,5 +1,5 @@ -import { HttpType } from './types/enums/HttpType'; -import { ToasterType } from './types/enums/ToasterType'; +import { HttpType } from './types/enums/http-type'; +import { ToasterType } from './types/enums/toaster-type'; import { HttpStatusCode } from '@angular/common/http'; type MessageKeyMap = Record { let component: ScoringComponent; diff --git a/frontend/src/app/shared/custom/scoring/scoring.component.ts b/frontend/src/app/shared/custom/scoring/scoring.component.ts index f9e81b63a7..4a5f71d15e 100644 --- a/frontend/src/app/shared/custom/scoring/scoring.component.ts +++ b/frontend/src/app/shared/custom/scoring/scoring.component.ts @@ -10,12 +10,12 @@ import { SimpleChanges, ViewChild } from '@angular/core'; -import { Zone } from '../../types/enums/Zone'; -import { KeyResultMetricMin } from '../../types/model/KeyResultMetricMin'; +import { Zone } from '../../types/enums/zone'; +import { KeyResultMetricMin } from '../../types/model/key-result-metric-min'; import { Observable, of } from 'rxjs'; import { calculateCurrentPercentage } from '../../common'; -import { KeyResultOrdinalMin } from '../../types/model/KeyResultOrdinalMin'; -import { CheckInOrdinalMin } from '../../types/model/CheckInOrdinalMin'; +import { KeyResultOrdinalMin } from '../../types/model/key-result-ordinal-min'; +import { CheckInOrdinalMin } from '../../types/model/check-in-ordinal-min'; @Component({ selector: 'app-scoring', diff --git a/frontend/src/app/shared/dialog/confirm-dialog/confirm-dialog.component.ts b/frontend/src/app/shared/dialog/confirm-dialog/confirm-dialog.component.ts index 781a09f528..eefe7e573b 100644 --- a/frontend/src/app/shared/dialog/confirm-dialog/confirm-dialog.component.ts +++ b/frontend/src/app/shared/dialog/confirm-dialog/confirm-dialog.component.ts @@ -1,7 +1,7 @@ import { Component, Inject, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { ConfirmDialogData } from '../../../services/dialog.service'; -import { ButtonState } from '../../types/enums/ButtonState'; +import { ButtonState } from '../../types/enums/button-state'; @Component({ selector: 'app-confirm-dialog', diff --git a/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.spec.ts b/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.spec.ts index 6740d47ec5..8d56e08dea 100644 --- a/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.spec.ts +++ b/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.spec.ts @@ -9,15 +9,15 @@ import { MatSelectModule } from '@angular/material/select'; import { ReactiveFormsModule } from '@angular/forms'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ObjectiveService } from '../../../services/objective.service'; -import { keyResult, objective, quarter, quarterList } from '../../testData'; +import { keyResult, objective, quarter, quarterList } from '../../test-data'; import { Observable, of } from 'rxjs'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { HarnessLoader } from '@angular/cdk/testing'; import { MatCheckboxModule } from '@angular/material/checkbox'; -import { Quarter } from '../../types/model/Quarter'; +import { Quarter } from '../../types/model/quarter'; import { QuarterService } from '../../../services/quarter.service'; import { TeamService } from '../../../services/team.service'; -import { State } from '../../types/enums/State'; +import { State } from '../../types/enums/state'; import { By } from '@angular/platform-browser'; import { MatCheckboxHarness } from '@angular/material/checkbox/testing'; import { RouterTestingHarness } from '@angular/router/testing'; @@ -29,7 +29,7 @@ import { provideHttpClient } from '@angular/common/http'; import { provideHttpClientTesting } from '@angular/common/http/testing'; import { DialogTemplateCoreComponent } from '../../custom/dialog-template-core/dialog-template-core.component'; import { MatDividerModule } from '@angular/material/divider'; -import { Team } from '../../types/model/Team'; +import { Team } from '../../types/model/team'; const objectiveService = { getFullObjective: jest.fn(), diff --git a/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.ts b/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.ts index 93d708be75..1b67bc4046 100644 --- a/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.ts +++ b/frontend/src/app/shared/dialog/objective-dialog/objective-form.component.ts @@ -1,21 +1,21 @@ import { ChangeDetectionStrategy, Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { FormArray, FormControl, FormGroup, Validators } from '@angular/forms'; -import { Quarter } from '../../types/model/Quarter'; +import { Quarter } from '../../types/model/quarter'; import { TeamService } from '../../../services/team.service'; -import { Team } from '../../types/model/Team'; +import { Team } from '../../types/model/team'; import { QuarterService } from '../../../services/quarter.service'; import { forkJoin, Observable, of, Subject, takeUntil } from 'rxjs'; import { ObjectiveService } from '../../../services/objective.service'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { State } from '../../types/enums/State'; -import { ObjectiveMin } from '../../types/model/ObjectiveMin'; -import { Objective } from '../../types/model/Objective'; +import { State } from '../../types/enums/state'; +import { ObjectiveMin } from '../../types/model/objective-min'; +import { Objective } from '../../types/model/objective'; import { formInputCheck, getValueFromQuery, hasFormFieldErrors } from '../../common'; import { ActivatedRoute } from '@angular/router'; -import { GJ_REGEX_PATTERN } from '../../constantLibary'; +import { GJ_REGEX_PATTERN } from '../../constant-library'; import { TranslateService } from '@ngx-translate/core'; import { DialogService } from '../../../services/dialog.service'; -import { KeyResultDTO } from '../../types/DTOs/KeyResultDTO'; +import { KeyResultDto } from '../../types/DTOs/key-result-dto'; @Component({ selector: 'app-objective-form', @@ -54,9 +54,9 @@ export class ObjectiveFormComponent implements OnInit, OnDestroy { state: string | null = null; - keyResults$: Observable = of([]); + keyResults$: Observable = of([]); - keyResults: KeyResultDTO[] = []; + keyResults: KeyResultDto[] = []; version!: number; @@ -126,7 +126,7 @@ export class ObjectiveFormComponent implements OnInit, OnDestroy { objective, quarters, currentQuarter, - keyResults]: [Objective, Quarter[], Quarter, KeyResultDTO[] + keyResults]: [Objective, Quarter[], Quarter, KeyResultDto[] ]) => { this.handleDataInitialization( objective, quarters, currentQuarter, keyResults, this.data.objective.objectiveId != null @@ -138,7 +138,7 @@ export class ObjectiveFormComponent implements OnInit, OnDestroy { objective: Objective, quarters: Quarter[], currentQuarter: Quarter, - keyResults: KeyResultDTO[], + keyResults: KeyResultDto[], isEditing: boolean ): void { this.quarters = quarters; diff --git a/frontend/src/app/shared/pipes/unit-transformation/unit-transformation.pipe.spec.ts b/frontend/src/app/shared/pipes/unit-transformation/unit-transformation.pipe.spec.ts index f43c3e078b..7288bf5668 100644 --- a/frontend/src/app/shared/pipes/unit-transformation/unit-transformation.pipe.spec.ts +++ b/frontend/src/app/shared/pipes/unit-transformation/unit-transformation.pipe.spec.ts @@ -1,5 +1,5 @@ import { UnitTransformationPipe } from './unit-transformation.pipe'; -import { Unit } from '../../types/enums/Unit'; +import { Unit } from '../../types/enums/unit'; describe('UnitTransformationPipe', () => { it('should create an instance', () => { diff --git a/frontend/src/app/shared/pipes/unit-transformation/unit-transformation.pipe.ts b/frontend/src/app/shared/pipes/unit-transformation/unit-transformation.pipe.ts index 7f19df97f4..79b1bd9e90 100644 --- a/frontend/src/app/shared/pipes/unit-transformation/unit-transformation.pipe.ts +++ b/frontend/src/app/shared/pipes/unit-transformation/unit-transformation.pipe.ts @@ -1,4 +1,4 @@ -import { Unit } from '../../types/enums/Unit'; +import { Unit } from '../../types/enums/unit'; import { Pipe, PipeTransform } from '@angular/core'; @Pipe({ diff --git a/frontend/src/app/shared/regexLibrary.ts b/frontend/src/app/shared/regex-library.ts similarity index 100% rename from frontend/src/app/shared/regexLibrary.ts rename to frontend/src/app/shared/regex-library.ts diff --git a/frontend/src/app/shared/routeUtils.ts b/frontend/src/app/shared/route-utils.ts similarity index 100% rename from frontend/src/app/shared/routeUtils.ts rename to frontend/src/app/shared/route-utils.ts diff --git a/frontend/src/app/shared/routeUtils.spec.ts b/frontend/src/app/shared/routeUtils.spec.ts index 28668d669a..ca6d9ee78f 100644 --- a/frontend/src/app/shared/routeUtils.spec.ts +++ b/frontend/src/app/shared/routeUtils.spec.ts @@ -1,4 +1,4 @@ -import { getRouteToTeam, getRouteToUserDetails } from './routeUtils'; +import { getRouteToTeam, getRouteToUserDetails } from './route-utils'; describe('routeUtils', () => { describe('getRouteToUserDetails', () => { diff --git a/frontend/src/app/shared/testData.ts b/frontend/src/app/shared/test-data.ts similarity index 91% rename from frontend/src/app/shared/testData.ts rename to frontend/src/app/shared/test-data.ts index 9e3ba249ab..4ac2544ce7 100644 --- a/frontend/src/app/shared/testData.ts +++ b/frontend/src/app/shared/test-data.ts @@ -1,22 +1,22 @@ -import { State } from './types/enums/State'; -import { KeyResultMetricMin } from './types/model/KeyResultMetricMin'; -import { KeyResultOrdinalMin } from './types/model/KeyResultOrdinalMin'; -import { KeyResultMin } from './types/model/KeyResultMin'; -import { ObjectiveMin } from './types/model/ObjectiveMin'; -import { OverviewEntity } from './types/model/OverviewEntity'; -import { KeyResultObjective } from './types/model/KeyResultObjective'; -import { Quarter } from './types/model/Quarter'; -import { KeyResultOrdinal } from './types/model/KeyResultOrdinal'; -import { Objective } from './types/model/Objective'; -import { User } from './types/model/User'; -import { KeyResultMetric } from './types/model/KeyResultMetric'; -import { Unit } from './types/enums/Unit'; -import { Team } from './types/model/Team'; -import { Action } from './types/model/Action'; -import { CheckInOrdinal } from './types/model/CheckInOrdinal'; -import { CheckInMetric } from './types/model/CheckInMetric'; -import { CheckInOrdinalMin } from './types/model/CheckInOrdinalMin'; -import { CheckInMetricMin } from './types/model/CheckInMetricMin'; +import { State } from './types/enums/state'; +import { KeyResultMetricMin } from './types/model/key-result-metric-min'; +import { KeyResultOrdinalMin } from './types/model/key-result-ordinal-min'; +import { KeyResultMin } from './types/model/key-result-min'; +import { ObjectiveMin } from './types/model/objective-min'; +import { OverviewEntity } from './types/model/overview-entity'; +import { KeyResultObjective } from './types/model/key-result-objective'; +import { Quarter } from './types/model/quarter'; +import { KeyResultOrdinal } from './types/model/key-result-ordinal'; +import { Objective } from './types/model/objective'; +import { User } from './types/model/user'; +import { KeyResultMetric } from './types/model/key-result-metric'; +import { Unit } from './types/enums/unit'; +import { Team } from './types/model/team'; +import { Action } from './types/model/action'; +import { CheckInOrdinal } from './types/model/check-in-ordinal'; +import { CheckInMetric } from './types/model/check-in-metric'; +import { CheckInOrdinalMin } from './types/model/check-in-ordinal-min'; +import { CheckInMetricMin } from './types/model/check-in-metric-min'; export const teamFormObject = { name: 'newTeamName' diff --git a/frontend/src/app/shared/types/DTOs/KeyResultMetricDTO.ts b/frontend/src/app/shared/types/DTOs/KeyResultMetricDTO.ts deleted file mode 100644 index 2c67ce87c4..0000000000 --- a/frontend/src/app/shared/types/DTOs/KeyResultMetricDTO.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { KeyResultDTO } from './KeyResultDTO'; - -export interface KeyResultMetricDTO extends KeyResultDTO { - unit: string | null; - baseline: number | null; - stretchGoal: number | null; -} diff --git a/frontend/src/app/shared/types/DTOs/KeyResultOrdinalDTO.ts b/frontend/src/app/shared/types/DTOs/KeyResultOrdinalDTO.ts deleted file mode 100644 index 0c4fd1d1da..0000000000 --- a/frontend/src/app/shared/types/DTOs/KeyResultOrdinalDTO.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { KeyResultDTO } from './KeyResultDTO'; - -export interface KeyResultOrdinalDTO extends KeyResultDTO { - commitZone: string | undefined; - targetZone: string | undefined; - stretchZone: string | undefined; -} diff --git a/frontend/src/app/shared/types/DTOs/KeyResultDTO.ts b/frontend/src/app/shared/types/DTOs/key-result-dto.ts similarity index 60% rename from frontend/src/app/shared/types/DTOs/KeyResultDTO.ts rename to frontend/src/app/shared/types/DTOs/key-result-dto.ts index a534770c30..3eed8021e0 100644 --- a/frontend/src/app/shared/types/DTOs/KeyResultDTO.ts +++ b/frontend/src/app/shared/types/DTOs/key-result-dto.ts @@ -1,9 +1,9 @@ -import { User } from '../model/User'; -import { Objective } from '../model/Objective'; -import { CheckIn } from '../model/CheckIn'; -import { Action } from '../model/Action'; +import { User } from '../model/user'; +import { Objective } from '../model/objective'; +import { CheckIn } from '../model/check-in'; +import { Action } from '../model/action'; -export interface KeyResultDTO { +export interface KeyResultDto { id: number | undefined; version: number; keyResultType: string | undefined; diff --git a/frontend/src/app/shared/types/DTOs/key-result-metric-dto.ts b/frontend/src/app/shared/types/DTOs/key-result-metric-dto.ts new file mode 100644 index 0000000000..4bbcda4ff4 --- /dev/null +++ b/frontend/src/app/shared/types/DTOs/key-result-metric-dto.ts @@ -0,0 +1,7 @@ +import { KeyResultDto } from './key-result-dto'; + +export interface KeyResultMetricDto extends KeyResultDto { + unit: string | null; + baseline: number | null; + stretchGoal: number | null; +} diff --git a/frontend/src/app/shared/types/DTOs/key-result-ordinal-dto.ts b/frontend/src/app/shared/types/DTOs/key-result-ordinal-dto.ts new file mode 100644 index 0000000000..53015d0479 --- /dev/null +++ b/frontend/src/app/shared/types/DTOs/key-result-ordinal-dto.ts @@ -0,0 +1,7 @@ +import { KeyResultDto } from './key-result-dto'; + +export interface KeyResultOrdinalDto extends KeyResultDto { + commitZone: string | undefined; + targetZone: string | undefined; + stretchZone: string | undefined; +} diff --git a/frontend/src/app/shared/types/enums/ButtonState.ts b/frontend/src/app/shared/types/enums/button-state.ts similarity index 100% rename from frontend/src/app/shared/types/enums/ButtonState.ts rename to frontend/src/app/shared/types/enums/button-state.ts diff --git a/frontend/src/app/shared/types/enums/CloseState.ts b/frontend/src/app/shared/types/enums/close-state.ts similarity index 100% rename from frontend/src/app/shared/types/enums/CloseState.ts rename to frontend/src/app/shared/types/enums/close-state.ts diff --git a/frontend/src/app/shared/types/enums/HttpType.ts b/frontend/src/app/shared/types/enums/http-type.ts similarity index 100% rename from frontend/src/app/shared/types/enums/HttpType.ts rename to frontend/src/app/shared/types/enums/http-type.ts diff --git a/frontend/src/app/shared/types/enums/State.ts b/frontend/src/app/shared/types/enums/state.ts similarity index 100% rename from frontend/src/app/shared/types/enums/State.ts rename to frontend/src/app/shared/types/enums/state.ts diff --git a/frontend/src/app/shared/types/enums/ToasterType.ts b/frontend/src/app/shared/types/enums/toaster-type.ts similarity index 100% rename from frontend/src/app/shared/types/enums/ToasterType.ts rename to frontend/src/app/shared/types/enums/toaster-type.ts diff --git a/frontend/src/app/shared/types/enums/Unit.ts b/frontend/src/app/shared/types/enums/unit.ts similarity index 100% rename from frontend/src/app/shared/types/enums/Unit.ts rename to frontend/src/app/shared/types/enums/unit.ts diff --git a/frontend/src/app/shared/types/enums/UserRole.ts b/frontend/src/app/shared/types/enums/user-role.ts similarity index 100% rename from frontend/src/app/shared/types/enums/UserRole.ts rename to frontend/src/app/shared/types/enums/user-role.ts diff --git a/frontend/src/app/shared/types/enums/Zone.ts b/frontend/src/app/shared/types/enums/zone.ts similarity index 100% rename from frontend/src/app/shared/types/enums/Zone.ts rename to frontend/src/app/shared/types/enums/zone.ts diff --git a/frontend/src/app/shared/types/model/Action.ts b/frontend/src/app/shared/types/model/action.ts similarity index 100% rename from frontend/src/app/shared/types/model/Action.ts rename to frontend/src/app/shared/types/model/action.ts diff --git a/frontend/src/app/shared/types/model/CheckInMetricMin.ts b/frontend/src/app/shared/types/model/check-in-metric-min.ts similarity index 65% rename from frontend/src/app/shared/types/model/CheckInMetricMin.ts rename to frontend/src/app/shared/types/model/check-in-metric-min.ts index d29a18aa62..f5b5c3186c 100644 --- a/frontend/src/app/shared/types/model/CheckInMetricMin.ts +++ b/frontend/src/app/shared/types/model/check-in-metric-min.ts @@ -1,4 +1,4 @@ -import { CheckInMin } from './CheckInMin'; +import { CheckInMin } from './check-in-min'; export interface CheckInMetricMin extends CheckInMin { value: number | undefined; diff --git a/frontend/src/app/shared/types/model/CheckInMetric.ts b/frontend/src/app/shared/types/model/check-in-metric.ts similarity index 64% rename from frontend/src/app/shared/types/model/CheckInMetric.ts rename to frontend/src/app/shared/types/model/check-in-metric.ts index ad7da9d1ce..cea2b4c31b 100644 --- a/frontend/src/app/shared/types/model/CheckInMetric.ts +++ b/frontend/src/app/shared/types/model/check-in-metric.ts @@ -1,4 +1,4 @@ -import { CheckIn } from './CheckIn'; +import { CheckIn } from './check-in'; export interface CheckInMetric extends CheckIn { value: number; diff --git a/frontend/src/app/shared/types/model/CheckInMin.ts b/frontend/src/app/shared/types/model/check-in-min.ts similarity index 100% rename from frontend/src/app/shared/types/model/CheckInMin.ts rename to frontend/src/app/shared/types/model/check-in-min.ts diff --git a/frontend/src/app/shared/types/model/CheckInOrdinalMin.ts b/frontend/src/app/shared/types/model/check-in-ordinal-min.ts similarity index 65% rename from frontend/src/app/shared/types/model/CheckInOrdinalMin.ts rename to frontend/src/app/shared/types/model/check-in-ordinal-min.ts index 278e561fd7..b1a7c04c09 100644 --- a/frontend/src/app/shared/types/model/CheckInOrdinalMin.ts +++ b/frontend/src/app/shared/types/model/check-in-ordinal-min.ts @@ -1,4 +1,4 @@ -import { CheckInMin } from './CheckInMin'; +import { CheckInMin } from './check-in-min'; export interface CheckInOrdinalMin extends CheckInMin { zone: string | undefined; diff --git a/frontend/src/app/shared/types/model/CheckInOrdinal.ts b/frontend/src/app/shared/types/model/check-in-ordinal.ts similarity index 64% rename from frontend/src/app/shared/types/model/CheckInOrdinal.ts rename to frontend/src/app/shared/types/model/check-in-ordinal.ts index 23471a041b..86e53c472a 100644 --- a/frontend/src/app/shared/types/model/CheckInOrdinal.ts +++ b/frontend/src/app/shared/types/model/check-in-ordinal.ts @@ -1,4 +1,4 @@ -import { CheckIn } from './CheckIn'; +import { CheckIn } from './check-in'; export interface CheckInOrdinal extends CheckIn { zone: string; diff --git a/frontend/src/app/shared/types/model/CheckIn.ts b/frontend/src/app/shared/types/model/check-in.ts similarity index 100% rename from frontend/src/app/shared/types/model/CheckIn.ts rename to frontend/src/app/shared/types/model/check-in.ts diff --git a/frontend/src/app/shared/types/model/ClientConfig.ts b/frontend/src/app/shared/types/model/client-config.ts similarity index 100% rename from frontend/src/app/shared/types/model/ClientConfig.ts rename to frontend/src/app/shared/types/model/client-config.ts diff --git a/frontend/src/app/shared/types/model/Completed.ts b/frontend/src/app/shared/types/model/completed.ts similarity index 74% rename from frontend/src/app/shared/types/model/Completed.ts rename to frontend/src/app/shared/types/model/completed.ts index 5db6c04e18..8ee65fdbda 100644 --- a/frontend/src/app/shared/types/model/Completed.ts +++ b/frontend/src/app/shared/types/model/completed.ts @@ -1,4 +1,4 @@ -import { Objective } from './Objective'; +import { Objective } from './objective'; export interface Completed { id: number | null; diff --git a/frontend/src/app/shared/types/model/KeyResultMetricMin.ts b/frontend/src/app/shared/types/model/key-result-metric-min.ts similarity index 60% rename from frontend/src/app/shared/types/model/KeyResultMetricMin.ts rename to frontend/src/app/shared/types/model/key-result-metric-min.ts index 13b924a16f..12fad7ad49 100644 --- a/frontend/src/app/shared/types/model/KeyResultMetricMin.ts +++ b/frontend/src/app/shared/types/model/key-result-metric-min.ts @@ -1,5 +1,5 @@ -import { KeyResultMin } from './KeyResultMin'; -import { CheckInMetricMin } from './CheckInMetricMin'; +import { KeyResultMin } from './key-result-min'; +import { CheckInMetricMin } from './check-in-metric-min'; export interface KeyResultMetricMin extends KeyResultMin { baseline: number; diff --git a/frontend/src/app/shared/types/model/KeyResultMetric.ts b/frontend/src/app/shared/types/model/key-result-metric.ts similarity index 62% rename from frontend/src/app/shared/types/model/KeyResultMetric.ts rename to frontend/src/app/shared/types/model/key-result-metric.ts index d8e0645f44..bf23633393 100644 --- a/frontend/src/app/shared/types/model/KeyResultMetric.ts +++ b/frontend/src/app/shared/types/model/key-result-metric.ts @@ -1,5 +1,5 @@ -import { KeyResult } from './KeyResult'; -import { CheckInMetric } from './CheckInMetric'; +import { KeyResult } from './key-result'; +import { CheckInMetric } from './check-in-metric'; export interface KeyResultMetric extends KeyResult { lastCheckIn: CheckInMetric | null; diff --git a/frontend/src/app/shared/types/model/KeyResultMin.ts b/frontend/src/app/shared/types/model/key-result-min.ts similarity index 100% rename from frontend/src/app/shared/types/model/KeyResultMin.ts rename to frontend/src/app/shared/types/model/key-result-min.ts diff --git a/frontend/src/app/shared/types/model/KeyResultObjective.ts b/frontend/src/app/shared/types/model/key-result-objective.ts similarity index 54% rename from frontend/src/app/shared/types/model/KeyResultObjective.ts rename to frontend/src/app/shared/types/model/key-result-objective.ts index f1f2b143b0..fbd6f13aec 100644 --- a/frontend/src/app/shared/types/model/KeyResultObjective.ts +++ b/frontend/src/app/shared/types/model/key-result-objective.ts @@ -1,5 +1,5 @@ -import { State } from '../enums/State'; -import { Quarter } from './Quarter'; +import { State } from '../enums/state'; +import { Quarter } from './quarter'; export interface KeyResultObjective { id: number; diff --git a/frontend/src/app/shared/types/model/KeyResultOrdinalMin.ts b/frontend/src/app/shared/types/model/key-result-ordinal-min.ts similarity index 61% rename from frontend/src/app/shared/types/model/KeyResultOrdinalMin.ts rename to frontend/src/app/shared/types/model/key-result-ordinal-min.ts index 1938a9b404..347b4e8c85 100644 --- a/frontend/src/app/shared/types/model/KeyResultOrdinalMin.ts +++ b/frontend/src/app/shared/types/model/key-result-ordinal-min.ts @@ -1,5 +1,5 @@ -import { KeyResultMin } from './KeyResultMin'; -import { CheckInOrdinalMin } from './CheckInOrdinalMin'; +import { KeyResultMin } from './key-result-min'; +import { CheckInOrdinalMin } from './check-in-ordinal-min'; export interface KeyResultOrdinalMin extends KeyResultMin { commitZone: string; diff --git a/frontend/src/app/shared/types/model/KeyResultOrdinal.ts b/frontend/src/app/shared/types/model/key-result-ordinal.ts similarity index 63% rename from frontend/src/app/shared/types/model/KeyResultOrdinal.ts rename to frontend/src/app/shared/types/model/key-result-ordinal.ts index bdc6ee563a..507ed1fdb3 100644 --- a/frontend/src/app/shared/types/model/KeyResultOrdinal.ts +++ b/frontend/src/app/shared/types/model/key-result-ordinal.ts @@ -1,5 +1,5 @@ -import { KeyResult } from './KeyResult'; -import { CheckInOrdinal } from './CheckInOrdinal'; +import { KeyResult } from './key-result'; +import { CheckInOrdinal } from './check-in-ordinal'; export interface KeyResultOrdinal extends KeyResult { lastCheckIn: CheckInOrdinal | null; diff --git a/frontend/src/app/shared/types/model/KeyResult.ts b/frontend/src/app/shared/types/model/key-result.ts similarity index 68% rename from frontend/src/app/shared/types/model/KeyResult.ts rename to frontend/src/app/shared/types/model/key-result.ts index ee240564c7..9cb9c9e7a7 100644 --- a/frontend/src/app/shared/types/model/KeyResult.ts +++ b/frontend/src/app/shared/types/model/key-result.ts @@ -1,6 +1,6 @@ -import { KeyResultObjective } from './KeyResultObjective'; -import { User } from './User'; -import { Action } from './Action'; +import { KeyResultObjective } from './key-result-objective'; +import { User } from './user'; +import { Action } from './action'; export interface KeyResult { id: number; diff --git a/frontend/src/app/shared/types/model/NewUserForm.ts b/frontend/src/app/shared/types/model/new-user-form.ts similarity index 100% rename from frontend/src/app/shared/types/model/NewUserForm.ts rename to frontend/src/app/shared/types/model/new-user-form.ts diff --git a/frontend/src/app/shared/types/model/NewUser.ts b/frontend/src/app/shared/types/model/new-user.ts similarity index 100% rename from frontend/src/app/shared/types/model/NewUser.ts rename to frontend/src/app/shared/types/model/new-user.ts diff --git a/frontend/src/app/shared/types/model/ObjectiveMin.ts b/frontend/src/app/shared/types/model/objective-min.ts similarity index 53% rename from frontend/src/app/shared/types/model/ObjectiveMin.ts rename to frontend/src/app/shared/types/model/objective-min.ts index 83d494e3b6..a8eeae4490 100644 --- a/frontend/src/app/shared/types/model/ObjectiveMin.ts +++ b/frontend/src/app/shared/types/model/objective-min.ts @@ -1,6 +1,6 @@ -import { KeyResultMin } from './KeyResultMin'; -import { QuarterMin } from './QuarterMin'; -import { State } from '../enums/State'; +import { KeyResultMin } from './key-result-min'; +import { QuarterMin } from './quarter-min'; +import { State } from '../enums/state'; export interface ObjectiveMin { id: number; diff --git a/frontend/src/app/shared/types/model/Objective.ts b/frontend/src/app/shared/types/model/objective.ts similarity index 79% rename from frontend/src/app/shared/types/model/Objective.ts rename to frontend/src/app/shared/types/model/objective.ts index 5f3228c0b0..1a87e93faa 100644 --- a/frontend/src/app/shared/types/model/Objective.ts +++ b/frontend/src/app/shared/types/model/objective.ts @@ -1,5 +1,5 @@ -import { State } from '../enums/State'; -import { User } from './User'; +import { State } from '../enums/state'; +import { User } from './user'; export interface Objective { id: number; diff --git a/frontend/src/app/shared/types/model/OverviewEntity.ts b/frontend/src/app/shared/types/model/overview-entity.ts similarity index 55% rename from frontend/src/app/shared/types/model/OverviewEntity.ts rename to frontend/src/app/shared/types/model/overview-entity.ts index ad28459b90..5771a68466 100644 --- a/frontend/src/app/shared/types/model/OverviewEntity.ts +++ b/frontend/src/app/shared/types/model/overview-entity.ts @@ -1,5 +1,5 @@ -import { ObjectiveMin } from './ObjectiveMin'; -import { TeamMin } from './TeamMin'; +import { ObjectiveMin } from './objective-min'; +import { TeamMin } from './team-min'; export interface OverviewEntity { team: TeamMin; diff --git a/frontend/src/app/shared/types/model/QuarterMin.ts b/frontend/src/app/shared/types/model/quarter-min.ts similarity index 100% rename from frontend/src/app/shared/types/model/QuarterMin.ts rename to frontend/src/app/shared/types/model/quarter-min.ts diff --git a/frontend/src/app/shared/types/model/Quarter.ts b/frontend/src/app/shared/types/model/quarter.ts similarity index 100% rename from frontend/src/app/shared/types/model/Quarter.ts rename to frontend/src/app/shared/types/model/quarter.ts diff --git a/frontend/src/app/shared/types/model/TeamMin.ts b/frontend/src/app/shared/types/model/team-min.ts similarity index 100% rename from frontend/src/app/shared/types/model/TeamMin.ts rename to frontend/src/app/shared/types/model/team-min.ts diff --git a/frontend/src/app/shared/types/model/Team.ts b/frontend/src/app/shared/types/model/team.ts similarity index 100% rename from frontend/src/app/shared/types/model/Team.ts rename to frontend/src/app/shared/types/model/team.ts diff --git a/frontend/src/app/shared/types/model/UserOkrData.ts b/frontend/src/app/shared/types/model/user-okr-data.ts similarity index 100% rename from frontend/src/app/shared/types/model/UserOkrData.ts rename to frontend/src/app/shared/types/model/user-okr-data.ts diff --git a/frontend/src/app/shared/types/model/UserTableEntry.ts b/frontend/src/app/shared/types/model/user-table-entry.ts similarity index 93% rename from frontend/src/app/shared/types/model/UserTableEntry.ts rename to frontend/src/app/shared/types/model/user-table-entry.ts index e667294ba3..204a1d523d 100644 --- a/frontend/src/app/shared/types/model/UserTableEntry.ts +++ b/frontend/src/app/shared/types/model/user-table-entry.ts @@ -1,6 +1,6 @@ -import { User } from './User'; -import { UserRole } from '../enums/UserRole'; -import { UserTeam } from './UserTeam'; +import { User } from './user'; +import { UserRole } from '../enums/user-role'; +import { UserTeam } from './user-team'; export interface UserTableEntry { id: number; diff --git a/frontend/src/app/shared/types/model/UserTeam.ts b/frontend/src/app/shared/types/model/user-team.ts similarity index 73% rename from frontend/src/app/shared/types/model/UserTeam.ts rename to frontend/src/app/shared/types/model/user-team.ts index aaca2eeaaf..adbc458a90 100644 --- a/frontend/src/app/shared/types/model/UserTeam.ts +++ b/frontend/src/app/shared/types/model/user-team.ts @@ -1,4 +1,4 @@ -import { Team } from './Team'; +import { Team } from './team'; export interface UserTeam { id?: number; diff --git a/frontend/src/app/shared/types/model/User.ts b/frontend/src/app/shared/types/model/user.ts similarity index 80% rename from frontend/src/app/shared/types/model/User.ts rename to frontend/src/app/shared/types/model/user.ts index 0fe87fbe6b..d329646f42 100644 --- a/frontend/src/app/shared/types/model/User.ts +++ b/frontend/src/app/shared/types/model/user.ts @@ -1,5 +1,5 @@ -import { UserTeam } from './UserTeam'; -import { UserTableEntry } from './UserTableEntry'; +import { UserTeam } from './user-team'; +import { UserTableEntry } from './user-table-entry'; export interface User { id: number; diff --git a/frontend/src/app/shared/validators.ts b/frontend/src/app/shared/validators.ts index 1bd6ab32f3..1b7dc8698e 100644 --- a/frontend/src/app/shared/validators.ts +++ b/frontend/src/app/shared/validators.ts @@ -1,6 +1,6 @@ import { AbstractControl, NG_VALIDATORS, ValidationErrors, Validator, ValidatorFn } from '@angular/forms'; import { Directive, Input } from '@angular/core'; -import { NUMBER_REGEX, PERCENT_REGEX } from './regexLibrary'; +import { NUMBER_REGEX, PERCENT_REGEX } from './regex-library'; @Directive({ selector: '[unitValueValidator]', diff --git a/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.spec.ts b/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.spec.ts index 6658e063fc..eae848c9d3 100644 --- a/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.spec.ts +++ b/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.spec.ts @@ -10,8 +10,8 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { TeamService } from '../../services/team.service'; import { of } from 'rxjs'; -import { marketingTeamWriteable, teamFormObject } from '../../shared/testData'; -import { Team } from '../../shared/types/model/Team'; +import { marketingTeamWriteable, teamFormObject } from '../../shared/test-data'; +import { Team } from '../../shared/types/model/team'; import { TranslateService } from '@ngx-translate/core'; import { DialogService } from '../../services/dialog.service'; import { provideRouter } from '@angular/router'; diff --git a/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.ts b/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.ts index 0e5fa4f008..a22a1c601e 100644 --- a/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.ts +++ b/frontend/src/app/team-management/add-edit-team-dialog/add-edit-team-dialog.component.ts @@ -3,7 +3,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { formInputCheck, hasFormFieldErrors } from '../../shared/common'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { TeamService } from '../../services/team.service'; -import { Team } from '../../shared/types/model/Team'; +import { Team } from '../../shared/types/model/team'; import { TranslateService } from '@ngx-translate/core'; import { UserService } from '../../services/user.service'; import { Router } from '@angular/router'; diff --git a/frontend/src/app/team-management/add-member-to-team-dialog/add-member-to-team-dialog.component.spec.ts b/frontend/src/app/team-management/add-member-to-team-dialog/add-member-to-team-dialog.component.spec.ts index bab83efc1a..1adcdc219d 100644 --- a/frontend/src/app/team-management/add-member-to-team-dialog/add-member-to-team-dialog.component.spec.ts +++ b/frontend/src/app/team-management/add-member-to-team-dialog/add-member-to-team-dialog.component.spec.ts @@ -4,11 +4,11 @@ import { TeamService } from '../../services/team.service'; import { AddMemberToTeamDialogComponent } from './add-member-to-team-dialog.component'; import { SharedModule } from '../../shared/shared.module'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; -import { team1, users } from '../../shared/testData'; +import { team1, users } from '../../shared/test-data'; import { BehaviorSubject, of, skip } from 'rxjs'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatAutocompleteModule } from '@angular/material/autocomplete'; -import { User } from '../../shared/types/model/User'; +import { User } from '../../shared/types/model/user'; import { MatTable } from '@angular/material/table'; describe('AddMemberToTeamDialogComponent', () => { diff --git a/frontend/src/app/team-management/add-member-to-team-dialog/add-member-to-team-dialog.component.ts b/frontend/src/app/team-management/add-member-to-team-dialog/add-member-to-team-dialog.component.ts index 370a5b7618..a2b6e22f05 100644 --- a/frontend/src/app/team-management/add-member-to-team-dialog/add-member-to-team-dialog.component.ts +++ b/frontend/src/app/team-management/add-member-to-team-dialog/add-member-to-team-dialog.component.ts @@ -1,13 +1,13 @@ import { Component, Inject, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { BehaviorSubject, combineLatest, filter, map, Observable, startWith, Subject, takeUntil } from 'rxjs'; -import { Team } from '../../shared/types/model/Team'; +import { Team } from '../../shared/types/model/team'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { User } from '../../shared/types/model/User'; +import { User } from '../../shared/types/model/user'; import { UserService } from '../../services/user.service'; import { FormControl } from '@angular/forms'; import { MatTable, MatTableDataSource } from '@angular/material/table'; import { TeamService } from '../../services/team.service'; -import { UserTableEntry } from '../../shared/types/model/UserTableEntry'; +import { UserTableEntry } from '../../shared/types/model/user-table-entry'; export interface AddMemberToTeamDialogComponentData { team: Team; diff --git a/frontend/src/app/team-management/add-user-team/add-user-team.component.spec.ts b/frontend/src/app/team-management/add-user-team/add-user-team.component.spec.ts index fcf11ff8cd..bcc818434e 100644 --- a/frontend/src/app/team-management/add-user-team/add-user-team.component.spec.ts +++ b/frontend/src/app/team-management/add-user-team/add-user-team.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AddUserTeamComponent } from './add-user-team.component'; import { TeamService } from '../../services/team.service'; -import { team1, team2, team3, testUser } from '../../shared/testData'; +import { team1, team2, team3, testUser } from '../../shared/test-data'; import { of } from 'rxjs'; describe('AddUserTeamComponent', () => { diff --git a/frontend/src/app/team-management/add-user-team/add-user-team.component.ts b/frontend/src/app/team-management/add-user-team/add-user-team.component.ts index 54e0cb450e..61881fc2b4 100644 --- a/frontend/src/app/team-management/add-user-team/add-user-team.component.ts +++ b/frontend/src/app/team-management/add-user-team/add-user-team.component.ts @@ -1,8 +1,8 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; -import { Team } from '../../shared/types/model/Team'; +import { Team } from '../../shared/types/model/team'; import { TeamService } from '../../services/team.service'; import { combineLatest, map, Observable, Subject, takeUntil } from 'rxjs'; -import { UserTeam } from '../../shared/types/model/UserTeam'; +import { UserTeam } from '../../shared/types/model/user-team'; @Component({ selector: 'app-add-user-team', diff --git a/frontend/src/app/team-management/delete-user/delete-user.component.spec.ts b/frontend/src/app/team-management/delete-user/delete-user.component.spec.ts index 15977ba8ea..1ab2b056d2 100644 --- a/frontend/src/app/team-management/delete-user/delete-user.component.spec.ts +++ b/frontend/src/app/team-management/delete-user/delete-user.component.spec.ts @@ -2,12 +2,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { UserService } from '../../services/user.service'; import { DeleteUserComponent } from './delete-user.component'; import { of, Subject } from 'rxjs'; -import { testUser } from '../../shared/testData'; +import { testUser } from '../../shared/test-data'; import { MatDialogRef } from '@angular/material/dialog'; import { ConfirmDialogComponent } from '../../shared/dialog/confirm-dialog/confirm-dialog.component'; import { DialogService } from '../../services/dialog.service'; import { Location } from '@angular/common'; -import { ButtonState } from '../../shared/types/enums/ButtonState'; +import { ButtonState } from '../../shared/types/enums/button-state'; describe('DeleteUserComponent', () => { let component: DeleteUserComponent; diff --git a/frontend/src/app/team-management/delete-user/delete-user.component.ts b/frontend/src/app/team-management/delete-user/delete-user.component.ts index 8fc8643c9a..48ecfdef05 100644 --- a/frontend/src/app/team-management/delete-user/delete-user.component.ts +++ b/frontend/src/app/team-management/delete-user/delete-user.component.ts @@ -1,12 +1,12 @@ import { Component, Input, OnInit, OnDestroy } from '@angular/core'; import { UserService } from '../../services/user.service'; -import { getFullNameOfUser, User } from '../../shared/types/model/User'; +import { getFullNameOfUser, User } from '../../shared/types/model/user'; import { Location } from '@angular/common'; import { Observable, Subject, takeUntil, tap } from 'rxjs'; -import { UserTeam } from '../../shared/types/model/UserTeam'; +import { UserTeam } from '../../shared/types/model/user-team'; import { ConfirmDialogData, DialogService } from '../../services/dialog.service'; -import { ButtonState } from '../../shared/types/enums/ButtonState'; -import { UserOkrData } from '../../shared/types/model/UserOkrData'; +import { ButtonState } from '../../shared/types/enums/button-state'; +import { UserOkrData } from '../../shared/types/model/user-okr-data'; @Component({ selector: 'app-delete-user', diff --git a/frontend/src/app/team-management/edit-okr-champion/edit-okr-champion.component.ts b/frontend/src/app/team-management/edit-okr-champion/edit-okr-champion.component.ts index a4a5dbfe9d..28628a4883 100644 --- a/frontend/src/app/team-management/edit-okr-champion/edit-okr-champion.component.ts +++ b/frontend/src/app/team-management/edit-okr-champion/edit-okr-champion.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectorRef, Component, ElementRef, EventEmitter, HostListener, Input, Output } from '@angular/core'; -import { User } from '../../shared/types/model/User'; +import { User } from '../../shared/types/model/user'; import { UserService } from '../../services/user.service'; import { TeamService } from '../../services/team.service'; diff --git a/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.spec.ts b/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.spec.ts index eec79520b7..8852f806bd 100644 --- a/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.spec.ts +++ b/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.spec.ts @@ -7,7 +7,7 @@ import { NewUserComponent } from '../new-user/new-user.component'; import { PuzzleIconComponent } from '../../shared/custom/puzzle-icon/puzzle-icon.component'; import { PuzzleIconButtonComponent } from '../../shared/custom/puzzle-icon-button/puzzle-icon-button.component'; import { UserService } from '../../services/user.service'; -import { testUser } from '../../shared/testData'; +import { testUser } from '../../shared/test-data'; import { DialogRef } from '@angular/cdk/dialog'; import { of } from 'rxjs'; import { UniqueEmailValidator } from '../new-user/unique-mail.validator'; diff --git a/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.ts b/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.ts index 2b6770f138..f3dc5b6189 100644 --- a/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.ts +++ b/frontend/src/app/team-management/invite-user-dialog/invite-user-dialog.component.ts @@ -1,9 +1,9 @@ import { Component } from '@angular/core'; -import { NewUser } from '../../shared/types/model/NewUser'; +import { NewUser } from '../../shared/types/model/new-user'; import { FormArray, FormControl, FormGroup, NonNullableFormBuilder, Validators } from '@angular/forms'; import { UserService } from '../../services/user.service'; import { DialogRef } from '@angular/cdk/dialog'; -import { NewUserForm } from '../../shared/types/model/NewUserForm'; +import { NewUserForm } from '../../shared/types/model/new-user-form'; import { UniqueEmailValidator } from '../new-user/unique-mail.validator'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; diff --git a/frontend/src/app/team-management/member-detail/member-detail.component.spec.ts b/frontend/src/app/team-management/member-detail/member-detail.component.spec.ts index 24213edc02..50de1e51d6 100644 --- a/frontend/src/app/team-management/member-detail/member-detail.component.spec.ts +++ b/frontend/src/app/team-management/member-detail/member-detail.component.spec.ts @@ -6,7 +6,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { BrowserModule } from '@angular/platform-browser'; import { SharedModule } from '../../shared/shared.module'; import { UserService } from '../../services/user.service'; -import { testUser } from '../../shared/testData'; +import { testUser } from '../../shared/test-data'; import { AddUserTeamComponent } from '../add-user-team/add-user-team.component'; import { MatTableModule } from '@angular/material/table'; import { MatIconModule } from '@angular/material/icon'; diff --git a/frontend/src/app/team-management/member-detail/member-detail.component.ts b/frontend/src/app/team-management/member-detail/member-detail.component.ts index 58fc05281e..ef23b676d1 100644 --- a/frontend/src/app/team-management/member-detail/member-detail.component.ts +++ b/frontend/src/app/team-management/member-detail/member-detail.component.ts @@ -1,10 +1,10 @@ import { ChangeDetectorRef, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { UserService } from '../../services/user.service'; import { BehaviorSubject, filter, mergeMap, Subject, takeUntil, tap } from 'rxjs'; -import { getFullNameOfUser, User } from '../../shared/types/model/User'; +import { getFullNameOfUser, User } from '../../shared/types/model/user'; import { ActivatedRoute, ParamMap, Router } from '@angular/router'; -import { Team } from '../../shared/types/model/Team'; -import { UserTeam } from '../../shared/types/model/UserTeam'; +import { Team } from '../../shared/types/model/team'; +import { UserTeam } from '../../shared/types/model/user-team'; import { TranslateService } from '@ngx-translate/core'; import { MatTable } from '@angular/material/table'; import { TeamService } from '../../services/team.service'; diff --git a/frontend/src/app/team-management/member-list/member-list-mobile/member-list-mobile.component.spec.ts b/frontend/src/app/team-management/member-list/member-list-mobile/member-list-mobile.component.spec.ts index 83848a4591..f0cd5d56f0 100644 --- a/frontend/src/app/team-management/member-list/member-list-mobile/member-list-mobile.component.spec.ts +++ b/frontend/src/app/team-management/member-list/member-list-mobile/member-list-mobile.component.spec.ts @@ -1,10 +1,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MemberListMobileComponent } from './member-list-mobile.component'; -import { Team } from '../../../shared/types/model/Team'; +import { Team } from '../../../shared/types/model/team'; import { BehaviorSubject } from 'rxjs'; -import { team1 } from '../../../shared/testData'; -import { UserTableEntry } from '../../../shared/types/model/UserTableEntry'; +import { team1 } from '../../../shared/test-data'; +import { UserTableEntry } from '../../../shared/types/model/user-table-entry'; import { MatTableDataSource } from '@angular/material/table'; describe('MemberListMobileComponent', () => { diff --git a/frontend/src/app/team-management/member-list/member-list-mobile/member-list-mobile.component.ts b/frontend/src/app/team-management/member-list/member-list-mobile/member-list-mobile.component.ts index f75d2584e0..40a825ddb0 100644 --- a/frontend/src/app/team-management/member-list/member-list-mobile/member-list-mobile.component.ts +++ b/frontend/src/app/team-management/member-list/member-list-mobile/member-list-mobile.component.ts @@ -1,10 +1,10 @@ import { Component, Input } from '@angular/core'; -import { UserTableEntry } from '../../../shared/types/model/UserTableEntry'; +import { UserTableEntry } from '../../../shared/types/model/user-table-entry'; import { MatTableDataSource } from '@angular/material/table'; import { BehaviorSubject } from 'rxjs'; -import { Team } from '../../../shared/types/model/Team'; -import { getFullNameOfUser } from '../../../shared/types/model/User'; -import { getRouteToUserDetails } from '../../../shared/routeUtils'; +import { Team } from '../../../shared/types/model/team'; +import { getFullNameOfUser } from '../../../shared/types/model/user'; +import { getRouteToUserDetails } from '../../../shared/route-utils'; @Component({ selector: 'app-member-list-mobile', diff --git a/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.spec.ts b/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.spec.ts index 6c00e9edd6..64ef678895 100644 --- a/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.spec.ts +++ b/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.spec.ts @@ -1,12 +1,12 @@ import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { MemberListTableComponent } from './member-list-table.component'; -import { team1, testUser } from '../../../shared/testData'; +import { team1, testUser } from '../../../shared/test-data'; import { BehaviorSubject, of } from 'rxjs'; -import { UserTableEntry } from '../../../shared/types/model/UserTableEntry'; +import { UserTableEntry } from '../../../shared/types/model/user-table-entry'; import { UserService } from '../../../services/user.service'; import { TeamService } from '../../../services/team.service'; -import { Team } from '../../../shared/types/model/Team'; +import { Team } from '../../../shared/types/model/team'; import { MatTableModule } from '@angular/material/table'; import { DialogService } from '../../../services/dialog.service'; diff --git a/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.ts b/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.ts index dff5c15284..684e7bf040 100644 --- a/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.ts +++ b/frontend/src/app/team-management/member-list/member-list-table/member-list-table.component.ts @@ -1,13 +1,13 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { MatTableDataSource } from '@angular/material/table'; -import { UserTableEntry } from '../../../shared/types/model/UserTableEntry'; -import { User } from '../../../shared/types/model/User'; -import { Team } from '../../../shared/types/model/Team'; +import { UserTableEntry } from '../../../shared/types/model/user-table-entry'; +import { User } from '../../../shared/types/model/user'; +import { Team } from '../../../shared/types/model/team'; import { TeamService } from '../../../services/team.service'; import { UserService } from '../../../services/user.service'; -import { getRouteToUserDetails } from '../../../shared/routeUtils'; +import { getRouteToUserDetails } from '../../../shared/route-utils'; import { BehaviorSubject, filter, mergeMap, Subject, takeUntil } from 'rxjs'; -import { UserTeam } from '../../../shared/types/model/UserTeam'; +import { UserTeam } from '../../../shared/types/model/user-team'; import { DialogService } from '../../../services/dialog.service'; @Component({ diff --git a/frontend/src/app/team-management/member-list/member-list.component.spec.ts b/frontend/src/app/team-management/member-list/member-list.component.spec.ts index e7f53563db..a783d5ad7a 100644 --- a/frontend/src/app/team-management/member-list/member-list.component.spec.ts +++ b/frontend/src/app/team-management/member-list/member-list.component.spec.ts @@ -5,10 +5,10 @@ import { of } from 'rxjs'; import { MemberListComponent } from './member-list.component'; import { UserService } from '../../services/user.service'; import { provideHttpClientTesting } from '@angular/common/http/testing'; -import { User } from '../../shared/types/model/User'; -import { team1, team2, team3, testUser, users } from '../../shared/testData'; -import { convertFromUser, convertFromUsers, UserTableEntry } from '../../shared/types/model/UserTableEntry'; -import { UserRole } from '../../shared/types/enums/UserRole'; +import { User } from '../../shared/types/model/user'; +import { team1, team2, team3, testUser, users } from '../../shared/test-data'; +import { convertFromUser, convertFromUsers, UserTableEntry } from '../../shared/types/model/user-table-entry'; +import { UserRole } from '../../shared/types/enums/user-role'; import { TeamService } from '../../services/team.service'; import { AddMemberToTeamDialogComponent } from '../add-member-to-team-dialog/add-member-to-team-dialog.component'; import { AddEditTeamDialogComponent } from '../add-edit-team-dialog/add-edit-team-dialog.component'; diff --git a/frontend/src/app/team-management/member-list/member-list.component.ts b/frontend/src/app/team-management/member-list/member-list.component.ts index 01fd726f98..e6097462b4 100644 --- a/frontend/src/app/team-management/member-list/member-list.component.ts +++ b/frontend/src/app/team-management/member-list/member-list.component.ts @@ -2,10 +2,10 @@ import { AfterViewInit, ChangeDetectorRef, Component, OnDestroy } from '@angular import { UserService } from '../../services/user.service'; import { ActivatedRoute, Router } from '@angular/router'; import { BehaviorSubject, combineLatest, filter, map, mergeMap, ReplaySubject, Subject, takeUntil } from 'rxjs'; -import { User } from '../../shared/types/model/User'; -import { convertFromUsers, UserTableEntry } from '../../shared/types/model/UserTableEntry'; +import { User } from '../../shared/types/model/user'; +import { convertFromUsers, UserTableEntry } from '../../shared/types/model/user-table-entry'; import { TeamService } from '../../services/team.service'; -import { Team } from '../../shared/types/model/Team'; +import { Team } from '../../shared/types/model/team'; import { AddMemberToTeamDialogComponent } from '../add-member-to-team-dialog/add-member-to-team-dialog.component'; import { AddEditTeamDialogComponent } from '../add-edit-team-dialog/add-edit-team-dialog.component'; import { MatTableDataSource } from '@angular/material/table'; diff --git a/frontend/src/app/team-management/new-user/new-user.component.spec.ts b/frontend/src/app/team-management/new-user/new-user.component.spec.ts index cf87240b91..ffdbb9d0b4 100644 --- a/frontend/src/app/team-management/new-user/new-user.component.spec.ts +++ b/frontend/src/app/team-management/new-user/new-user.component.spec.ts @@ -6,7 +6,7 @@ import { SharedModule } from '../../shared/shared.module'; import { PuzzleIconButtonComponent } from '../../shared/custom/puzzle-icon-button/puzzle-icon-button.component'; import { PuzzleIconComponent } from '../../shared/custom/puzzle-icon/puzzle-icon.component'; import { CommonModule } from '@angular/common'; -import { NewUserForm } from '../../shared/types/model/NewUserForm'; +import { NewUserForm } from '../../shared/types/model/new-user-form'; describe('NewUserComponent', () => { let component: NewUserComponent; diff --git a/frontend/src/app/team-management/new-user/new-user.component.ts b/frontend/src/app/team-management/new-user/new-user.component.ts index 8f2379cda2..5ae00cb4f2 100644 --- a/frontend/src/app/team-management/new-user/new-user.component.ts +++ b/frontend/src/app/team-management/new-user/new-user.component.ts @@ -8,7 +8,7 @@ import { ViewChild } from '@angular/core'; import { ControlContainer, FormControl, FormGroup, NgForm } from '@angular/forms'; -import { NewUserForm } from '../../shared/types/model/NewUserForm'; +import { NewUserForm } from '../../shared/types/model/new-user-form'; @Component({ selector: 'app-new-user', diff --git a/frontend/src/app/team-management/new-user/unique-mail.directive.spec.ts b/frontend/src/app/team-management/new-user/unique-mail.directive.spec.ts index 8b56f6115a..8aaddb4eb0 100644 --- a/frontend/src/app/team-management/new-user/unique-mail.directive.spec.ts +++ b/frontend/src/app/team-management/new-user/unique-mail.directive.spec.ts @@ -1,5 +1,5 @@ import { UniqueEmailValidator } from './unique-mail.validator'; -import { users } from '../../shared/testData'; +import { users } from '../../shared/test-data'; import { TestBed } from '@angular/core/testing'; import { of } from 'rxjs'; import { AbstractControl } from '@angular/forms'; diff --git a/frontend/src/app/team-management/roles.pipe.ts b/frontend/src/app/team-management/roles.pipe.ts index 620ff0a6f6..962a9c630f 100644 --- a/frontend/src/app/team-management/roles.pipe.ts +++ b/frontend/src/app/team-management/roles.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { UserRole } from '../shared/types/enums/UserRole'; +import { UserRole } from '../shared/types/enums/user-role'; import { TranslateService } from '@ngx-translate/core'; @Pipe({ diff --git a/frontend/src/app/team-management/search-team-management/search-team-management.component.spec.ts b/frontend/src/app/team-management/search-team-management/search-team-management.component.spec.ts index 36a1d53410..93a995d60b 100644 --- a/frontend/src/app/team-management/search-team-management/search-team-management.component.spec.ts +++ b/frontend/src/app/team-management/search-team-management/search-team-management.component.spec.ts @@ -14,8 +14,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { TeamService } from '../../services/team.service'; import { UserService } from '../../services/user.service'; import { of } from 'rxjs'; -import { Team } from '../../shared/types/model/Team'; -import { User } from '../../shared/types/model/User'; +import { Team } from '../../shared/types/model/team'; +import { User } from '../../shared/types/model/user'; import { ActivatedRoute, ActivatedRouteSnapshot, Router } from '@angular/router'; import Spy = jasmine.Spy; diff --git a/frontend/src/app/team-management/search-team-management/search-team-management.component.ts b/frontend/src/app/team-management/search-team-management/search-team-management.component.ts index d4475ddd20..99627e300f 100644 --- a/frontend/src/app/team-management/search-team-management/search-team-management.component.ts +++ b/frontend/src/app/team-management/search-team-management/search-team-management.component.ts @@ -2,11 +2,11 @@ import { Component } from '@angular/core'; import { FormControl } from '@angular/forms'; import { UserService } from '../../services/user.service'; import { TeamService } from '../../services/team.service'; -import { Team } from '../../shared/types/model/Team'; -import { User } from '../../shared/types/model/User'; +import { Team } from '../../shared/types/model/team'; +import { User } from '../../shared/types/model/user'; import { BehaviorSubject, combineLatest, debounceTime, distinctUntilChanged, map } from 'rxjs'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; -import { getRouteToTeam, getRouteToUserDetails } from '../../shared/routeUtils'; +import { getRouteToTeam, getRouteToUserDetails } from '../../shared/route-utils'; import { ActivatedRoute, Router } from '@angular/router'; export interface FilteredUser extends User { diff --git a/frontend/src/app/team-management/show-edit-role/show-edit-role.component.spec.ts b/frontend/src/app/team-management/show-edit-role/show-edit-role.component.spec.ts index 0cf62465ad..ee59aaa73b 100644 --- a/frontend/src/app/team-management/show-edit-role/show-edit-role.component.spec.ts +++ b/frontend/src/app/team-management/show-edit-role/show-edit-role.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { ShowEditRoleComponent } from './show-edit-role.component'; -import { testUser } from '../../shared/testData'; +import { testUser } from '../../shared/test-data'; import { TranslateTestingModule } from 'ngx-translate-testing'; // @ts-ignore import * as de from '../../../assets/i18n/de.json'; diff --git a/frontend/src/app/team-management/show-edit-role/show-edit-role.component.ts b/frontend/src/app/team-management/show-edit-role/show-edit-role.component.ts index 06e4ce09f2..729fd9705b 100644 --- a/frontend/src/app/team-management/show-edit-role/show-edit-role.component.ts +++ b/frontend/src/app/team-management/show-edit-role/show-edit-role.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectorRef, Component, ElementRef, EventEmitter, HostListener, Input, Output } from '@angular/core'; -import { UserTeam } from '../../shared/types/model/UserTeam'; +import { UserTeam } from '../../shared/types/model/user-team'; import { TranslateService } from '@ngx-translate/core'; @Component({ diff --git a/frontend/src/app/team-management/team-list/team-list.component.ts b/frontend/src/app/team-management/team-list/team-list.component.ts index 1e0734c69c..de33819a23 100644 --- a/frontend/src/app/team-management/team-list/team-list.component.ts +++ b/frontend/src/app/team-management/team-list/team-list.component.ts @@ -1,7 +1,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { TeamService } from '../../services/team.service'; import { Observable, Subject, takeUntil } from 'rxjs'; -import { Team } from '../../shared/types/model/Team'; +import { Team } from '../../shared/types/model/team'; import { ActivatedRoute } from '@angular/router'; @Component({ diff --git a/frontend/src/app/team-management/team-management-mobile-filter/team-management-mobile-filter.component.spec.ts b/frontend/src/app/team-management/team-management-mobile-filter/team-management-mobile-filter.component.spec.ts index 3a432fbd1f..5f7d84642a 100644 --- a/frontend/src/app/team-management/team-management-mobile-filter/team-management-mobile-filter.component.spec.ts +++ b/frontend/src/app/team-management/team-management-mobile-filter/team-management-mobile-filter.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testin import { TeamManagementMobileFilterComponent } from './team-management-mobile-filter.component'; import { TeamService } from '../../services/team.service'; -import { team1, teamList } from '../../shared/testData'; +import { team1, teamList } from '../../shared/test-data'; import { BehaviorSubject, of } from 'rxjs'; import { ActivatedRoute, Router } from '@angular/router'; import { SearchTeamManagementComponent } from '../search-team-management/search-team-management.component'; @@ -17,7 +17,7 @@ import { MatIconModule } from '@angular/material/icon'; import { BrowserModule } from '@angular/platform-browser'; import { MatInputModule } from '@angular/material/input'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { getRouteToAllTeams, getRouteToTeam } from '../../shared/routeUtils'; +import { getRouteToAllTeams, getRouteToTeam } from '../../shared/route-utils'; describe('TeamManagementMobileFilterComponent', () => { let component: TeamManagementMobileFilterComponent; diff --git a/frontend/src/app/team-management/team-management-mobile-filter/team-management-mobile-filter.component.ts b/frontend/src/app/team-management/team-management-mobile-filter/team-management-mobile-filter.component.ts index b4eb421be3..8b155d3ef9 100644 --- a/frontend/src/app/team-management/team-management-mobile-filter/team-management-mobile-filter.component.ts +++ b/frontend/src/app/team-management/team-management-mobile-filter/team-management-mobile-filter.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; import { TeamService } from '../../services/team.service'; -import { Team } from '../../shared/types/model/Team'; +import { Team } from '../../shared/types/model/team'; import { ActivatedRoute, ParamMap, Router } from '@angular/router'; -import { getRouteToAllTeams, getRouteToTeam } from '../../shared/routeUtils'; +import { getRouteToAllTeams, getRouteToTeam } from '../../shared/route-utils'; import { combineLatest } from 'rxjs'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; diff --git a/frontend/src/app/team-management/team-management.component.spec.ts b/frontend/src/app/team-management/team-management.component.spec.ts index 92d190f08e..117d1c0ef3 100644 --- a/frontend/src/app/team-management/team-management.component.spec.ts +++ b/frontend/src/app/team-management/team-management.component.spec.ts @@ -21,7 +21,7 @@ import { MemberListTableComponent } from './member-list/member-list-table/member import { MemberListMobileComponent } from './member-list/member-list-mobile/member-list-mobile.component'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatTableModule } from '@angular/material/table'; -import { testUser, users } from '../shared/testData'; +import { testUser, users } from '../shared/test-data'; import { UserService } from '../services/user.service'; import { ConfigService } from '../services/config.service';