diff --git a/.github/workflows/angular-prettier.yml b/.github/workflows/angular-prettier.yml index 6148de764..0e6592790 100644 --- a/.github/workflows/angular-prettier.yml +++ b/.github/workflows/angular-prettier.yml @@ -19,7 +19,7 @@ jobs: run: npm ci - name: Run prettier working-directory: ui - run: npm run prettier:format + run: npm run prettier - name: add and commit any files that have changed id: add_and_commit uses: EndBug/add-and-commit@c8bfb4ff65642c4c54445500822f6e7da558994a diff --git a/ui/.eslintrc.json b/ui/.eslintrc.json index db226e9d7..1d6e2c032 100644 --- a/ui/.eslintrc.json +++ b/ui/.eslintrc.json @@ -1,13 +1,9 @@ { "root": true, - "ignorePatterns": [ - "projects/**/*" - ], + "ignorePatterns": ["projects/**/*"], "overrides": [ { - "files": [ - "*.ts" - ], + "files": ["*.ts"], "extends": [ "eslint:recommended", "plugin:@typescript-eslint/recommended", @@ -34,9 +30,7 @@ } }, { - "files": [ - "*.html" - ], + "files": ["*.html"], "extends": [ "plugin:@angular-eslint/template/recommended", "plugin:@angular-eslint/template/accessibility" diff --git a/ui/angular.json b/ui/angular.json index bbc0313f1..f3ade9fbd 100644 --- a/ui/angular.json +++ b/ui/angular.json @@ -23,14 +23,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets", - "src/content/images" - ], - "styles": [ - "src/content/scss/global.scss" - ], + "assets": ["src/favicon.ico", "src/assets", "src/content/images"], + "styles": ["src/content/scss/global.scss"], "scripts": [] }, "configurations": { @@ -96,23 +90,15 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/content/scss/global.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/content/scss/global.scss"], "scripts": [] } }, "lint": { "builder": "@angular-eslint/builder:lint", "options": { - "lintFilePatterns": [ - "src/**/*.ts", - "src/**/*.html" - ] + "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"] } } } @@ -120,8 +106,6 @@ }, "cli": { "analytics": false, - "schematicCollections": [ - "@angular-eslint/schematics" - ] + "schematicCollections": ["@angular-eslint/schematics"] } } diff --git a/ui/karma.conf.js b/ui/karma.conf.js index e4f96d35d..089680626 100644 --- a/ui/karma.conf.js +++ b/ui/karma.conf.js @@ -3,14 +3,14 @@ module.exports = function (config) { config.set({ - basePath: '', - frameworks: ['jasmine', '@angular-devkit/build-angular'], + basePath: "", + frameworks: ["jasmine", "@angular-devkit/build-angular"], plugins: [ - require('karma-jasmine'), - require('karma-chrome-launcher'), - require('karma-jasmine-html-reporter'), - require('karma-coverage'), - require('@angular-devkit/build-angular/plugins/karma') + require("karma-jasmine"), + require("karma-chrome-launcher"), + require("karma-jasmine-html-reporter"), + require("karma-coverage"), + require("@angular-devkit/build-angular/plugins/karma"), ], client: { jasmine: { @@ -19,26 +19,23 @@ module.exports = function (config) { // for example, you can disable the random execution with `random: false` // or set a specific seed with `seed: 4321` }, - clearContext: false // leave Jasmine Spec Runner output visible in browser + clearContext: false, // leave Jasmine Spec Runner output visible in browser }, jasmineHtmlReporter: { - suppressAll: true // removes the duplicated traces + suppressAll: true, // removes the duplicated traces }, coverageReporter: { - dir: require('path').join(__dirname, './coverage/gateway'), - subdir: '.', - reporters: [ - { type: 'html' }, - { type: 'text-summary' } - ] + dir: require("path").join(__dirname, "./coverage/gateway"), + subdir: ".", + reporters: [{ type: "html" }, { type: "text-summary" }], }, - reporters: ['progress', 'kjhtml'], + reporters: ["progress", "kjhtml"], port: 9876, colors: true, logLevel: config.LOG_INFO, autoWatch: true, - browsers: ['ChromeHeadless'], + browsers: ["ChromeHeadless"], singleRun: true, - restartOnFileChange: true + restartOnFileChange: true, }); }; diff --git a/ui/package-lock.json b/ui/package-lock.json index 8904bac84..1c09167b3 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -47,6 +47,7 @@ "karma-coverage": "~2.2.0", "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.0.0", + "prettier": "^3.0.3", "typescript": "~4.9.5" } }, @@ -12461,6 +12462,21 @@ "node": ">= 0.8.0" } }, + "node_modules/prettier": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", + "dev": true, + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/pretty-bytes": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", @@ -24411,6 +24427,12 @@ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true }, + "prettier": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", + "dev": true + }, "pretty-bytes": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", diff --git a/ui/package.json b/ui/package.json index c59b42b56..c216350f9 100644 --- a/ui/package.json +++ b/ui/package.json @@ -8,7 +8,8 @@ "build": "ng build --base-href ./", "watch": "ng build --base-href ./ --watch --configuration development", "test": "ng test", - "lint": "ng lint" + "lint": "ng lint", + "prettier": "npx prettier --write ." }, "private": true, "dependencies": { @@ -51,6 +52,7 @@ "karma-coverage": "~2.2.0", "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.0.0", + "prettier": "^3.0.3", "typescript": "~4.9.5" } -} \ No newline at end of file +} diff --git a/ui/src/.prettierrc b/ui/src/.prettierrc index 47f998fcd..b8db160ba 100644 --- a/ui/src/.prettierrc +++ b/ui/src/.prettierrc @@ -1,7 +1,7 @@ { - "bracketSpacing": true, - "semi": false, - "singleQuote": true, - "trailingComma": "es5", - "printWidth": 80 - } \ No newline at end of file + "bracketSpacing": true, + "semi": false, + "singleQuote": true, + "trailingComma": "es5", + "printWidth": 80 +} diff --git a/ui/src/app/account/account.module.ts b/ui/src/app/account/account.module.ts index ca7072ff5..c06b2283e 100644 --- a/ui/src/app/account/account.module.ts +++ b/ui/src/app/account/account.module.ts @@ -1,18 +1,12 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { LoginComponent } from './login/login.component'; -import { RouterModule, Routes } from '@angular/router'; -import { ReactiveFormsModule } from '@angular/forms'; -import { routes } from './account.route'; +import { NgModule } from '@angular/core' +import { CommonModule } from '@angular/common' +import { LoginComponent } from './login/login.component' +import { RouterModule, Routes } from '@angular/router' +import { ReactiveFormsModule } from '@angular/forms' +import { routes } from './account.route' @NgModule({ - declarations: [ - LoginComponent - ], - imports: [ - CommonModule, - ReactiveFormsModule, - RouterModule.forChild(routes) - ] + declarations: [LoginComponent], + imports: [CommonModule, ReactiveFormsModule, RouterModule.forChild(routes)], }) -export class AccountModule { } +export class AccountModule {} diff --git a/ui/src/app/account/account.route.ts b/ui/src/app/account/account.route.ts index 2c8af5aeb..17978d8b7 100644 --- a/ui/src/app/account/account.route.ts +++ b/ui/src/app/account/account.route.ts @@ -1,12 +1,11 @@ -import { Routes } from "@angular/router"; -import { LoginComponent } from "./login/login.component"; -import { AuthGuard } from "./auth.guard"; -import { HomeComponent } from "../home/home.component"; +import { Routes } from '@angular/router' +import { LoginComponent } from './login/login.component' +import { AuthGuard } from './auth.guard' +import { HomeComponent } from '../home/home.component' export const routes: Routes = [ - { - path: 'login', - component: LoginComponent - } - ]; - \ No newline at end of file + { + path: 'login', + component: LoginComponent, + }, +] diff --git a/ui/src/app/account/auth.guard.ts b/ui/src/app/account/auth.guard.ts index af27a4c6b..dbacf7568 100644 --- a/ui/src/app/account/auth.guard.ts +++ b/ui/src/app/account/auth.guard.ts @@ -1,34 +1,42 @@ -import { inject } from '@angular/core'; -import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router'; +import { inject } from '@angular/core' +import { + ActivatedRouteSnapshot, + Router, + RouterStateSnapshot, +} from '@angular/router' +import { StateStorageService } from './service/state-storage.service' +import { AccountService } from './service/account.service' +import { Observable, filter, map, take } from 'rxjs' -import { StateStorageService } from './service/state-storage.service'; -import { AccountService } from './service/account.service'; -import { Observable, filter, map, take } from 'rxjs'; +export const AuthGuard = ( + route: ActivatedRouteSnapshot, + state: RouterStateSnapshot +): Observable | boolean => { + const authorities = route.data['authorities'] -export const AuthGuard = (route: ActivatedRouteSnapshot, - state: RouterStateSnapshot): Observable | boolean => { - const authorities = route.data['authorities']; - - const router = inject(Router); - const accountService = inject(AccountService); + const router = inject(Router) + const accountService = inject(AccountService) const stateStorageService = inject(StateStorageService) - return accountService.getAccountData().pipe(filter(account => account !== undefined),map(account => { - console.log(authorities, account); + return accountService.getAccountData().pipe( + filter((account) => account !== undefined), + map((account) => { + console.log(authorities, account) - if (account) { - const hasAnyAuthority = accountService.hasAnyAuthority(authorities); - if (hasAnyAuthority) { - return true; + if (account) { + const hasAnyAuthority = accountService.hasAnyAuthority(authorities) + if (hasAnyAuthority) { + return true + } else { + router.navigate(['accessdenied']) + return false + } } else { - router.navigate(['accessdenied']); - return false; + router.navigate(['/login']) + stateStorageService.storeUrl(state.url) + return false } - } else { - router.navigate(['/login']); - stateStorageService.storeUrl(state.url); - return false; - } - })); + }) + ) } diff --git a/ui/src/app/account/index.ts b/ui/src/app/account/index.ts index 469eed4c1..fcd1e286f 100644 --- a/ui/src/app/account/index.ts +++ b/ui/src/app/account/index.ts @@ -2,4 +2,4 @@ export * from './service/account.service' export * from './service/login.service' export * from './service/auth-jwt.service' export * from './service/state-storage.service' -export * from './login/login.component' \ No newline at end of file +export * from './login/login.component' diff --git a/ui/src/app/account/login/login.component.html b/ui/src/app/account/login/login.component.html index 822e7ed86..ebf27f665 100644 --- a/ui/src/app/account/login/login.component.html +++ b/ui/src/app/account/login/login.component.html @@ -1,40 +1,99 @@
-
-
-
-
- Failed to sign in! Please check your credentials and try again. -
-
-
- - - -
-
- - - -
-
-
- Please enter the MFA code from your authenticator app -
-
- Invalid MFA code -
- - -
- -
-

-
- Did you forget your password? -
+
+
+
+
+ Failed to sign in! Please check your credentials and + try again. +
+
+
+ + + +
+
+ + + +
+
+
+ Please enter the MFA code from your authenticator app +
+
+ Invalid MFA code
+ + +
+ +
+

+
+ Did you forget your password?
+
+
diff --git a/ui/src/app/account/model/account.model.ts b/ui/src/app/account/model/account.model.ts index a367bfe03..86497e547 100644 --- a/ui/src/app/account/model/account.model.ts +++ b/ui/src/app/account/model/account.model.ts @@ -1,15 +1,14 @@ export interface IAccount { - activated: boolean, - authorities: string[], - email: string, - firstName: string, - langKey: string, - lastName: string, - imageUrl: string, - salesforceId: string, - loggedAs: boolean, - loginAs: string, - mainContact: boolean, - mfaEnabled: boolean - } - \ No newline at end of file + activated: boolean + authorities: string[] + email: string + firstName: string + langKey: string + lastName: string + imageUrl: string + salesforceId: string + loggedAs: boolean + loginAs: string + mainContact: boolean + mfaEnabled: boolean +} diff --git a/ui/src/app/account/model/login.model.ts b/ui/src/app/account/model/login.model.ts index f8bd80aa6..4fb9169a1 100644 --- a/ui/src/app/account/model/login.model.ts +++ b/ui/src/app/account/model/login.model.ts @@ -1,10 +1,10 @@ export interface ILoginResult { - mfaRequired: boolean; - oauth2AccessToken?: any; + mfaRequired: boolean + oauth2AccessToken?: any } export interface ILoginCredentials { - username?: string; - password?: string; - mfaCode?: string | null; -} \ No newline at end of file + username?: string + password?: string + mfaCode?: string | null +} diff --git a/ui/src/app/account/service/account.service.ts b/ui/src/app/account/service/account.service.ts index 292abc4ff..5093a477e 100644 --- a/ui/src/app/account/service/account.service.ts +++ b/ui/src/app/account/service/account.service.ts @@ -20,12 +20,14 @@ import { IAccount } from '../model/account.model' @Injectable({ providedIn: 'root' }) export class AccountService { - private accountData = new BehaviorSubject(undefined); - private isFetchingAccountData = false; - private stopFetchingAccountData = new Subject(); - private authenticated = false; - private authenticationState = new BehaviorSubject(null); - private logoutAsResourceUrl = SERVER_API_URL + 'services/userservice/api'; + private accountData = new BehaviorSubject( + undefined + ) + private isFetchingAccountData = false + private stopFetchingAccountData = new Subject() + private authenticated = false + private authenticationState = new BehaviorSubject(null) + private logoutAsResourceUrl = SERVER_API_URL + 'services/userservice/api' constructor( // TODO: uncomment when language service is implemented @@ -59,7 +61,7 @@ export class AccountService { this.authenticated = true const account: IAccount = response.body this.accountData.next(account) - + // After retrieve the account info, the language will be changed to // the user's preferred language configured in the account setting if (this.accountData.value?.langKey) { @@ -122,7 +124,7 @@ export class AccountService { !this.authenticated || !this.accountData || !this.accountData.value?.authorities - ) { + ) { return false } @@ -131,7 +133,7 @@ export class AccountService { return true } } - + return false } @@ -148,10 +150,10 @@ export class AccountService { getAccountData(force?: boolean): Observable { if (force) { - // TODO: uncomment when memberservice is added or change the account service so that this logic is absent from the account service + // TODO: uncomment when memberservice is added or change the account service so that this logic is absent from the account service //this.memberService.stopFetchingMemberData.next(); //this.memberService.memberData.next(undefined); - this.stopFetchingAccountData.next(true); + this.stopFetchingAccountData.next(true) } if ((!this.accountData.value && !this.isFetchingAccountData) || force) { this.isFetchingAccountData = true diff --git a/ui/src/app/account/service/auth-jwt.service.ts b/ui/src/app/account/service/auth-jwt.service.ts index 53339386c..20c97d88d 100644 --- a/ui/src/app/account/service/auth-jwt.service.ts +++ b/ui/src/app/account/service/auth-jwt.service.ts @@ -1,24 +1,24 @@ -import { Injectable } from '@angular/core'; -import { HttpClient, HttpResponse } from '@angular/common/http'; -import { Observable } from 'rxjs'; +import { Injectable } from '@angular/core' +import { HttpClient, HttpResponse } from '@angular/common/http' +import { Observable } from 'rxjs' -import { SERVER_API_URL } from '../../../app/app.constants'; -import { ILoginCredentials, ILoginResult } from '../model/login.model'; +import { SERVER_API_URL } from '../../../app/app.constants' +import { ILoginCredentials, ILoginResult } from '../model/login.model' @Injectable({ providedIn: 'root' }) export class AuthServerProvider { constructor(private http: HttpClient) {} getToken() { - return null; + return null } - login(credentials: ILoginCredentials): Observable { - return this.http.post('/auth/login', credentials); + login(credentials: ILoginCredentials): Observable { + return this.http.post('/auth/login', credentials) } // TODO: not being used? -/* loginWithToken(jwt, rememberMe) { + /* loginWithToken(jwt, rememberMe) { if (jwt) { this.storeAuthenticationToken(jwt, rememberMe); return Promise.resolve(jwt); @@ -31,6 +31,6 @@ export class AuthServerProvider { */ logout(): Observable { - return this.http.post(SERVER_API_URL + 'auth/logout', null); + return this.http.post(SERVER_API_URL + 'auth/logout', null) } } diff --git a/ui/src/app/account/service/login.service.ts b/ui/src/app/account/service/login.service.ts index c6ed69f1b..711a6ab32 100644 --- a/ui/src/app/account/service/login.service.ts +++ b/ui/src/app/account/service/login.service.ts @@ -1,30 +1,35 @@ -import { Injectable } from '@angular/core'; -import { AccountService } from './account.service'; -import { AuthServerProvider } from './auth-jwt.service'; -import { Observable } from 'rxjs'; -import { ILoginCredentials, ILoginResult } from '../model/login.model'; +import { Injectable } from '@angular/core' +import { AccountService } from './account.service' +import { AuthServerProvider } from './auth-jwt.service' +import { Observable } from 'rxjs' +import { ILoginCredentials, ILoginResult } from '../model/login.model' @Injectable({ providedIn: 'root' }) export class LoginService { - constructor(private accountService: AccountService, private authServerProvider: AuthServerProvider) {} + constructor( + private accountService: AccountService, + private authServerProvider: AuthServerProvider + ) {} login(credentials: ILoginCredentials): Observable { - return this.authServerProvider.login(credentials); + return this.authServerProvider.login(credentials) } isAuthenticated() { - return this.accountService.isAuthenticated(); + return this.accountService.isAuthenticated() } logoutDirectly() { - this.accountService.authenticate(null); + this.accountService.authenticate(null) } logout() { if (this.accountService.isAuthenticated()) { - this.authServerProvider.logout().subscribe(() => this.accountService.authenticate(null)); + this.authServerProvider + .logout() + .subscribe(() => this.accountService.authenticate(null)) } else { - this.accountService.authenticate(null); + this.accountService.authenticate(null) } } } diff --git a/ui/src/app/account/service/state-storage.service.ts b/ui/src/app/account/service/state-storage.service.ts index dc12e667b..c0877e46d 100644 --- a/ui/src/app/account/service/state-storage.service.ts +++ b/ui/src/app/account/service/state-storage.service.ts @@ -1,38 +1,38 @@ -import { Injectable } from '@angular/core'; -import { SessionStorageService } from 'ngx-webstorage'; +import { Injectable } from '@angular/core' +import { SessionStorageService } from 'ngx-webstorage' @Injectable({ providedIn: 'root' }) export class StateStorageService { constructor(private $sessionStorage: SessionStorageService) {} getPreviousState() { - return this.$sessionStorage.retrieve('previousState'); + return this.$sessionStorage.retrieve('previousState') } resetPreviousState() { - this.$sessionStorage.clear('previousState'); + this.$sessionStorage.clear('previousState') } // TODO: not being used? - /* storePreviousState(previousStateName, previousStateParams) { + /* storePreviousState(previousStateName, previousStateParams) { const previousState = { name: previousStateName, params: previousStateParams }; this.$sessionStorage.store('previousState', previousState); } */ getDestinationState() { - return this.$sessionStorage.retrieve('destinationState'); + return this.$sessionStorage.retrieve('destinationState') } storeUrl(url: string | null) { - this.$sessionStorage.store('previousUrl', url); + this.$sessionStorage.store('previousUrl', url) } getUrl() { - return this.$sessionStorage.retrieve('previousUrl'); + return this.$sessionStorage.retrieve('previousUrl') } // TODO: not being used? -/* storeDestinationState(destinationState, destinationStateParams, fromState) { + /* storeDestinationState(destinationState, destinationStateParams, fromState) { const destinationInfo = { destination: { name: destinationState.name, diff --git a/ui/src/app/app-routing.module.ts b/ui/src/app/app-routing.module.ts index 741325243..79b83e429 100644 --- a/ui/src/app/app-routing.module.ts +++ b/ui/src/app/app-routing.module.ts @@ -1,22 +1,21 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { navbarRoute } from './layout/navbar/navbar.route'; +import { NgModule } from '@angular/core' +import { RouterModule, Routes } from '@angular/router' +import { navbarRoute } from './layout/navbar/navbar.route' const routes: Routes = [ { path: '', loadChildren: () => - import('./account/account.module').then(m => m.AccountModule) + import('./account/account.module').then((m) => m.AccountModule), }, { path: '', - loadChildren: () => - import('./home/home.module').then(m => m.HomeModule) - } -] + loadChildren: () => import('./home/home.module').then((m) => m.HomeModule), + }, +] @NgModule({ imports: [RouterModule.forRoot([...routes, navbarRoute])], - exports: [RouterModule] + exports: [RouterModule], }) -export class AppRoutingModule { } +export class AppRoutingModule {} diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html index 6c24876e4..79070ce79 100644 --- a/ui/src/app/app.component.html +++ b/ui/src/app/app.component.html @@ -1,2 +1 @@ - - \ No newline at end of file + diff --git a/ui/src/app/app.component.spec.ts b/ui/src/app/app.component.spec.ts index 2f0ba86ee..bda37ac2e 100644 --- a/ui/src/app/app.component.spec.ts +++ b/ui/src/app/app.component.spec.ts @@ -1,32 +1,25 @@ -import { TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { AppComponent } from './app.component'; +import { TestBed } from '@angular/core/testing' +import { RouterTestingModule } from '@angular/router/testing' +import { HttpClientTestingModule } from '@angular/common/http/testing' +import { AppComponent } from './app.component' describe('AppComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ - RouterTestingModule, - HttpClientTestingModule - ], - declarations: [ - AppComponent - ], - }).compileComponents(); - }); + imports: [RouterTestingModule, HttpClientTestingModule], + declarations: [AppComponent], + }).compileComponents() + }) it('should create the app', () => { - const fixture = TestBed.createComponent(AppComponent); - const app = fixture.componentInstance; - expect(app).toBeTruthy(); - }); + const fixture = TestBed.createComponent(AppComponent) + const app = fixture.componentInstance + expect(app).toBeTruthy() + }) it(`should have as title 'gateway'`, () => { - const fixture = TestBed.createComponent(AppComponent); - const app = fixture.componentInstance; - expect(app.title).toEqual('gateway'); - }); - - -}); + const fixture = TestBed.createComponent(AppComponent) + const app = fixture.componentInstance + expect(app.title).toEqual('gateway') + }) +}) diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts index 14be6de6a..ada089b47 100644 --- a/ui/src/app/app.component.ts +++ b/ui/src/app/app.component.ts @@ -1,17 +1,13 @@ -import { Component } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; +import { Component } from '@angular/core' +import { HttpClient } from '@angular/common/http' @Component({ selector: 'app-root', templateUrl: './app.component.html', - styleUrls: ['./app.component.scss'] + styleUrls: ['./app.component.scss'], }) export class AppComponent { - title = 'gateway'; + title = 'gateway' - constructor( - private http: HttpClient - ) {} - - + constructor(private http: HttpClient) {} } diff --git a/ui/src/app/app.constants.ts b/ui/src/app/app.constants.ts index 4b69d5677..4455bce9b 100644 --- a/ui/src/app/app.constants.ts +++ b/ui/src/app/app.constants.ts @@ -1,10 +1,10 @@ -export const SERVER_API_URL = 'http://localhost:4200'; +export const SERVER_API_URL = 'http://localhost:4200' -export const VERSION = "test-ui"; +export const VERSION = 'test-ui' export enum EventType { - LOG_IN_SUCCESS = "LOG_IN_SUCCESS", - AFFILIATION_CREATED = "AFFILIATION_CREATED", - AFFILIATION_UPDATED = "AFFILIATION_UPDATED" - // add as we go -} \ No newline at end of file + LOG_IN_SUCCESS = 'LOG_IN_SUCCESS', + AFFILIATION_CREATED = 'AFFILIATION_CREATED', + AFFILIATION_UPDATED = 'AFFILIATION_UPDATED', + // add as we go +} diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts index c9b0b18a7..7ec8d09c2 100644 --- a/ui/src/app/app.module.ts +++ b/ui/src/app/app.module.ts @@ -10,7 +10,7 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome' import { NavbarComponent } from './layout/navbar/navbar.component' import { CommonModule } from '@angular/common' import { NgbModule } from '@ng-bootstrap/ng-bootstrap' -import { HasAnyAuthorityDirective } from './shared/directive/has-any-authority.directive'; +import { HasAnyAuthorityDirective } from './shared/directive/has-any-authority.directive' import { HomeModule } from './home/home.module' @NgModule({ diff --git a/ui/src/app/layout/navbar/navbar.component.html b/ui/src/app/layout/navbar/navbar.component.html index 285425d67..7bba8ab9a 100644 --- a/ui/src/app/layout/navbar/navbar.component.html +++ b/ui/src/app/layout/navbar/navbar.component.html @@ -1,157 +1,358 @@ -
- {{ this.getUserName()}} | - - {{ this.getUserName() }} - - +
+ + + {{ this.getUserName() }} | + + {{ this.getUserName() }} + +
diff --git a/ui/src/app/layout/navbar/navbar.component.ts b/ui/src/app/layout/navbar/navbar.component.ts index 3c125bee3..beaf2cca1 100644 --- a/ui/src/app/layout/navbar/navbar.component.ts +++ b/ui/src/app/layout/navbar/navbar.component.ts @@ -11,7 +11,7 @@ import { faUserPlus, faSignOutAlt, faWrench, - faLock + faLock, } from '@fortawesome/free-solid-svg-icons' import { HttpResponse, HttpErrorResponse } from '@angular/common/http' import { Observable } from 'rxjs' diff --git a/ui/src/app/layout/navbar/navbar.route.ts b/ui/src/app/layout/navbar/navbar.route.ts index 35191434e..c6a25f3ec 100644 --- a/ui/src/app/layout/navbar/navbar.route.ts +++ b/ui/src/app/layout/navbar/navbar.route.ts @@ -1,9 +1,9 @@ -import { Route } from '@angular/router'; +import { Route } from '@angular/router' -import { NavbarComponent } from './navbar.component'; +import { NavbarComponent } from './navbar.component' export const navbarRoute: Route = { path: '', component: NavbarComponent, - outlet: 'navbar' -}; + outlet: 'navbar', +} diff --git a/ui/src/app/shared/model/event.model.ts b/ui/src/app/shared/model/event.model.ts index d4160e609..09f518fba 100644 --- a/ui/src/app/shared/model/event.model.ts +++ b/ui/src/app/shared/model/event.model.ts @@ -1,8 +1,8 @@ -import { EventType } from "src/app/app.constants"; +import { EventType } from 'src/app/app.constants' export class Event { - constructor( - public type: EventType, - public payload: String, - ) {} - } \ No newline at end of file + constructor( + public type: EventType, + public payload: String + ) {} +} diff --git a/ui/src/app/shared/service/event.service.ts b/ui/src/app/shared/service/event.service.ts index 58c419ba5..211e5e248 100644 --- a/ui/src/app/shared/service/event.service.ts +++ b/ui/src/app/shared/service/event.service.ts @@ -5,7 +5,6 @@ import { Event } from '../model/event.model' @Injectable({ providedIn: 'root' }) export class EventService { - private events = new Subject() on(eventType: EventType): Observable { @@ -15,5 +14,4 @@ export class EventService { broadcast(event: Event): void { this.events.next(event) } - } diff --git a/ui/src/index.html b/ui/src/index.html index 1d7176f90..bf0eaea81 100644 --- a/ui/src/index.html +++ b/ui/src/index.html @@ -1,43 +1,58 @@ - + - - + + ORCID Member Portal - - - - + + + + - - - - - + + + + + - - + + - + diff --git a/ui/src/main.ts b/ui/src/main.ts index c7b673cf4..274537fe8 100644 --- a/ui/src/main.ts +++ b/ui/src/main.ts @@ -1,12 +1,13 @@ -import { enableProdMode } from '@angular/core'; -import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; +import { enableProdMode } from '@angular/core' +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic' -import { AppModule } from './app/app.module'; -import { environment } from './environments/environment'; +import { AppModule } from './app/app.module' +import { environment } from './environments/environment' if (environment.production) { - enableProdMode(); + enableProdMode() } -platformBrowserDynamic().bootstrapModule(AppModule) - .catch(err => console.error(err)); +platformBrowserDynamic() + .bootstrapModule(AppModule) + .catch((err) => console.error(err)) diff --git a/ui/src/polyfills.ts b/ui/src/polyfills.ts index 429bb9ef2..5173f2ff9 100644 --- a/ui/src/polyfills.ts +++ b/ui/src/polyfills.ts @@ -45,8 +45,7 @@ /*************************************************************************************************** * Zone JS is required by default for Angular itself. */ -import 'zone.js'; // Included with Angular CLI. - +import 'zone.js' // Included with Angular CLI. /*************************************************************************************************** * APPLICATION IMPORTS diff --git a/ui/src/proxy.conf.json b/ui/src/proxy.conf.json index 167d1b9ab..99d974100 100644 --- a/ui/src/proxy.conf.json +++ b/ui/src/proxy.conf.json @@ -1,16 +1,16 @@ { - "/auth/login": { - "target": "http://localhost:8080", - "secure": false, - "changeOrigin": true, - "logLevel": "debug", - "cookieDomainRewrite": "localhost" - }, - "/services/*": { - "target": "http://localhost:8080", - "secure": false, - "changeOrigin": true, - "logLevel": "debug", - "cookieDomainRewrite": "localhost" - } -} \ No newline at end of file + "/auth/login": { + "target": "http://localhost:8080", + "secure": false, + "changeOrigin": true, + "logLevel": "debug", + "cookieDomainRewrite": "localhost" + }, + "/services/*": { + "target": "http://localhost:8080", + "secure": false, + "changeOrigin": true, + "logLevel": "debug", + "cookieDomainRewrite": "localhost" + } +} diff --git a/ui/src/test.ts b/ui/src/test.ts index 51bb0206a..fa4d2a9c9 100644 --- a/ui/src/test.ts +++ b/ui/src/test.ts @@ -1,14 +1,14 @@ // This file is required by karma.conf.js and loads recursively all the .spec and framework files -import 'zone.js/testing'; -import { getTestBed } from '@angular/core/testing'; +import 'zone.js/testing' +import { getTestBed } from '@angular/core/testing' import { BrowserDynamicTestingModule, - platformBrowserDynamicTesting -} from '@angular/platform-browser-dynamic/testing'; + platformBrowserDynamicTesting, +} from '@angular/platform-browser-dynamic/testing' // First, initialize the Angular testing environment. getTestBed().initTestEnvironment( BrowserDynamicTestingModule, - platformBrowserDynamicTesting(), -); + platformBrowserDynamicTesting() +) diff --git a/ui/tsconfig.app.json b/ui/tsconfig.app.json index 82d91dc4a..ff396d4ce 100644 --- a/ui/tsconfig.app.json +++ b/ui/tsconfig.app.json @@ -5,11 +5,6 @@ "outDir": "./out-tsc/app", "types": [] }, - "files": [ - "src/main.ts", - "src/polyfills.ts" - ], - "include": [ - "src/**/*.d.ts" - ] + "files": ["src/main.ts", "src/polyfills.ts"], + "include": ["src/**/*.d.ts"] } diff --git a/ui/tsconfig.json b/ui/tsconfig.json index 1407cb6e4..c6c687c35 100644 --- a/ui/tsconfig.json +++ b/ui/tsconfig.json @@ -18,10 +18,7 @@ "importHelpers": true, "target": "ES2022", "module": "es2020", - "lib": [ - "es2020", - "dom" - ], + "lib": ["es2020", "dom"], "useDefineForClassFields": false }, "angularCompilerOptions": { diff --git a/ui/tsconfig.spec.json b/ui/tsconfig.spec.json index 092345b02..669344f8d 100644 --- a/ui/tsconfig.spec.json +++ b/ui/tsconfig.spec.json @@ -3,16 +3,8 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/spec", - "types": [ - "jasmine" - ] + "types": ["jasmine"] }, - "files": [ - "src/test.ts", - "src/polyfills.ts" - ], - "include": [ - "src/**/*.spec.ts", - "src/**/*.d.ts" - ] + "files": ["src/test.ts", "src/polyfills.ts"], + "include": ["src/**/*.spec.ts", "src/**/*.d.ts"] }