From 147b1fafb47a8effaf3fde8a630b0b98f883f828 Mon Sep 17 00:00:00 2001 From: Jacob Yi Date: Fri, 8 Dec 2023 21:04:15 -0600 Subject: [PATCH 01/14] closed accordion on default and changed label --- .../df-service-details/df-service-details.component.html | 4 ++-- .../df-service-details/df-service-details.component.ts | 1 + src/assets/i18n/services/en.json | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/adf-services/df-service-details/df-service-details.component.html b/src/app/adf-services/df-service-details/df-service-details.component.html index 751a0027..61d371fb 100644 --- a/src/app/adf-services/df-service-details/df-service-details.component.html +++ b/src/app/adf-services/df-service-details/df-service-details.component.html @@ -58,9 +58,9 @@ - + {{ - 'services.config' | transloco + 'services.options' | transloco }}
diff --git a/src/app/adf-services/df-service-details/df-service-details.component.ts b/src/app/adf-services/df-service-details/df-service-details.component.ts index 7f1d6314..affb8821 100644 --- a/src/app/adf-services/df-service-details/df-service-details.component.ts +++ b/src/app/adf-services/df-service-details/df-service-details.component.ts @@ -110,6 +110,7 @@ export class DfServiceDetailsComponent implements OnInit { const { data, serviceTypes, groups } = route; const licenseType = env.platform?.license; this.serviceTypes = serviceTypes; + console.log('serviceTypes', this.serviceData); if (licenseType === 'SILVER') { this.serviceTypes.push( ...GOLD_SERVICES.filter(s => groups.includes(s.group)) diff --git a/src/assets/i18n/services/en.json b/src/assets/i18n/services/en.json index b2b81f17..8202996e 100644 --- a/src/assets/i18n/services/en.json +++ b/src/assets/i18n/services/en.json @@ -2,6 +2,7 @@ "details": "Details", "definition": "Service Definition", "config": "Configuration", + "options": "Advanced Options", "controls": { "serviceType": { "label": "Service Type", From a06a89b9aff20ab60057421635944cf6b5bcd09a Mon Sep 17 00:00:00 2001 From: Jacob Yi Date: Fri, 8 Dec 2023 21:10:54 -0600 Subject: [PATCH 02/14] removed console log --- .../df-service-details/df-service-details.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/adf-services/df-service-details/df-service-details.component.ts b/src/app/adf-services/df-service-details/df-service-details.component.ts index affb8821..7f1d6314 100644 --- a/src/app/adf-services/df-service-details/df-service-details.component.ts +++ b/src/app/adf-services/df-service-details/df-service-details.component.ts @@ -110,7 +110,6 @@ export class DfServiceDetailsComponent implements OnInit { const { data, serviceTypes, groups } = route; const licenseType = env.platform?.license; this.serviceTypes = serviceTypes; - console.log('serviceTypes', this.serviceData); if (licenseType === 'SILVER') { this.serviceTypes.push( ...GOLD_SERVICES.filter(s => groups.includes(s.group)) From a6c5cef8b389855b80d020b27c37845519643d0a Mon Sep 17 00:00:00 2001 From: Jacob Yi Date: Fri, 8 Dec 2023 21:29:04 -0600 Subject: [PATCH 03/14] changed logs to logstash --- src/assets/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index c5bef890..596446d7 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -290,7 +290,7 @@ } }, "logs": { - "nav": "Logs", + "nav": "Logstash", "header": "{{nav.system-settings.logs.nav}}", "create": { "header": "Create Log" From cc26d31af2f71234362d405dc4d866c60eee0e28 Mon Sep 17 00:00:00 2001 From: Jacob Yi Date: Mon, 11 Dec 2023 15:22:35 -0600 Subject: [PATCH 04/14] added search button on the lefthand navigation --- .../df-service-details.component.html | 8 +++---- .../df-service-details.component.ts | 2 +- .../df-side-nav/df-side-nav.component.html | 16 +++++++------- .../df-side-nav/df-side-nav.component.scss | 22 +++++++++++++++++++ src/assets/i18n/en.json | 2 +- 5 files changed, 36 insertions(+), 14 deletions(-) diff --git a/src/app/adf-services/df-service-details/df-service-details.component.html b/src/app/adf-services/df-service-details/df-service-details.component.html index 61d371fb..49437856 100644 --- a/src/app/adf-services/df-service-details/df-service-details.component.html +++ b/src/app/adf-services/df-service-details/df-service-details.component.html @@ -58,10 +58,10 @@ - - {{ - 'services.options' | transloco - }} + + {{ 'services.options' | transloco }} +
{ - this.router.navigate(['../'], { relativeTo: this.activatedRoute }); + this.router.navigate(['/api-connections/api-docs']); }); } } diff --git a/src/app/shared/components/df-side-nav/df-side-nav.component.html b/src/app/shared/components/df-side-nav/df-side-nav.component.html index a629cac6..f3cf8f76 100644 --- a/src/app/shared/components/df-side-nav/df-side-nav.component.html +++ b/src/app/shared/components/df-side-nav/df-side-nav.component.html @@ -12,12 +12,6 @@ - Date: Mon, 11 Dec 2023 15:24:04 -0600 Subject: [PATCH 05/14] added search bar on the left navbar --- .../components/df-side-nav/df-side-nav.component.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/shared/components/df-side-nav/df-side-nav.component.scss b/src/app/shared/components/df-side-nav/df-side-nav.component.scss index d4ed8127..be4f7a64 100644 --- a/src/app/shared/components/df-side-nav/df-side-nav.component.scss +++ b/src/app/shared/components/df-side-nav/df-side-nav.component.scss @@ -30,15 +30,15 @@ $red-palette: mat.define-palette(mat.$red-palette); color: var(--mat-expansion-container-text-color); cursor: pointer; display: flex; - align-items: center; + align-items: center; - span { - margin-left: 6px; - } + span { + margin-left: 6px; + } } .profile-icon { - color: #0f0761; + color: #0f0761; } .sidenav-container { From 1e7c642ebdf55c0a93eb9b5d63960ec75c324a86 Mon Sep 17 00:00:00 2001 From: Jacob Yi Date: Mon, 11 Dec 2023 15:47:35 -0600 Subject: [PATCH 06/14] Updated column layout for forms --- .../df-service-details.component.html | 11 ++++++++--- .../components/df-side-nav/df-side-nav.component.scss | 10 +++++----- src/styles.scss | 6 ++++++ 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/app/adf-services/df-service-details/df-service-details.component.html b/src/app/adf-services/df-service-details/df-service-details.component.html index 49437856..43069126 100644 --- a/src/app/adf-services/df-service-details/df-service-details.component.html +++ b/src/app/adf-services/df-service-details/df-service-details.component.html @@ -1,5 +1,5 @@
- + {{ 'services.controls.serviceType.label' | transloco }} @@ -16,7 +16,7 @@ {{ 'services.controls.namespace.label' | transloco }} @@ -58,7 +58,12 @@ - + {{ 'services.options' | transloco }} diff --git a/src/app/shared/components/df-side-nav/df-side-nav.component.scss b/src/app/shared/components/df-side-nav/df-side-nav.component.scss index d4ed8127..be4f7a64 100644 --- a/src/app/shared/components/df-side-nav/df-side-nav.component.scss +++ b/src/app/shared/components/df-side-nav/df-side-nav.component.scss @@ -30,15 +30,15 @@ $red-palette: mat.define-palette(mat.$red-palette); color: var(--mat-expansion-container-text-color); cursor: pointer; display: flex; - align-items: center; + align-items: center; - span { - margin-left: 6px; - } + span { + margin-left: 6px; + } } .profile-icon { - color: #0f0761; + color: #0f0761; } .sidenav-container { diff --git a/src/styles.scss b/src/styles.scss index 4664bf00..b8088527 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -108,6 +108,12 @@ mat-form-field { & .half-width { width: calc(50% - 8px); } + & .fourth-width { + width: calc(24.6% - 8px); + .small & { + width: calc(50% - 8px); + } + } & .dynamic-width { width: calc(50% - 8px); .small & { From 4e23941bccadfbaa4ef894ba355e6303fd3b3aaf Mon Sep 17 00:00:00 2001 From: Jasjeet Mavi <42419193+judgemavi@users.noreply.github.com> Date: Thu, 14 Dec 2023 10:30:57 -0500 Subject: [PATCH 07/14] update writeValue method for schema type object --- .../df-table-details/df-table-details.types.ts | 1 - .../df-field-array/df-array-field.component.ts | 13 ++++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app/adf-schema/df-table-details/df-table-details.types.ts b/src/app/adf-schema/df-table-details/df-table-details.types.ts index 29e40aca..36bd7fc2 100644 --- a/src/app/adf-schema/df-table-details/df-table-details.types.ts +++ b/src/app/adf-schema/df-table-details/df-table-details.types.ts @@ -1,4 +1,3 @@ -// TODO fix all any types export interface TableDetailsType { alias?: string; name: string; diff --git a/src/app/shared/components/df-field-array/df-array-field.component.ts b/src/app/shared/components/df-field-array/df-array-field.component.ts index 8d805bbc..4aca066a 100644 --- a/src/app/shared/components/df-field-array/df-array-field.component.ts +++ b/src/app/shared/components/df-field-array/df-array-field.component.ts @@ -133,15 +133,22 @@ export class DfArrayFieldComponent implements OnInit, ControlValueAccessor { this.fieldArray = this.fb.array([]); } - writeValue(value?: Array): void { - if (value && this.schema.type === 'array') { + writeValue(value?: Array | { [key: string]: any }): void { + if (value && Array.isArray(value) && this.schema.type === 'array') { if (this.schema.items === 'string') { this.fieldArray = this.fb.array(value.map(v => new FormControl(v))); } else { this.fieldArray = this.fb.array(value.map(v => this.createGroup(v))); } } else if (value && this.schema.type === 'object') { - // TODO do something + this.fieldArray = this.fb.array( + Object.keys(value).map(key => + this.createGroup({ + key, + value: (value as { [key: string]: any })[key], + }) + ) + ); } this.fieldArray.valueChanges .pipe( From 696a4dd64ce94678001310f92bde1dd613836f5f Mon Sep 17 00:00:00 2001 From: Jasjeet Mavi <42419193+judgemavi@users.noreply.github.com> Date: Thu, 14 Dec 2023 11:11:36 -0500 Subject: [PATCH 08/14] Add df-alert component to df-role-details component --- .../df-role-details.component.html | 7 +++- .../df-role-details.component.ts | 32 +++++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/app/adf-roles/df-role-details/df-role-details.component.html b/src/app/adf-roles/df-role-details/df-role-details.component.html index 62ac8ea8..a5134279 100644 --- a/src/app/adf-roles/df-role-details/df-role-details.component.html +++ b/src/app/adf-roles/df-role-details/df-role-details.component.html @@ -1,7 +1,12 @@

{{ 'roles.rolesOverview.description' | transloco }}

- + + {{ alertMsg }} + {{ 'name' | transloco }} diff --git a/src/app/adf-roles/df-role-details/df-role-details.component.ts b/src/app/adf-roles/df-role-details/df-role-details.component.ts index 26477e1d..4b93e57b 100644 --- a/src/app/adf-roles/df-role-details/df-role-details.component.ts +++ b/src/app/adf-roles/df-role-details/df-role-details.component.ts @@ -25,6 +25,11 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatButtonModule } from '@angular/material/button'; import { DfRolesAccessComponent } from '../df-roles-access/df-roles-access.component'; import { UntilDestroy } from '@ngneat/until-destroy'; +import { + AlertType, + DfAlertComponent, +} from 'src/app/shared/components/df-alert/df-alert.component'; +import { catchError, throwError } from 'rxjs'; @UntilDestroy({ checkProperties: true }) @Component({ selector: 'df-role-details', @@ -42,11 +47,15 @@ import { UntilDestroy } from '@ngneat/until-destroy'; MatButtonModule, DfRolesAccessComponent, NgIf, + DfAlertComponent, ], }) export class DfRoleDetailsComponent implements OnInit { roleForm: FormGroup; type = ''; + alertMsg = ''; + showAlert = false; + alertType: AlertType = 'error'; constructor( @Inject(ROLE_SERVICE_TOKEN) @@ -137,6 +146,12 @@ export class DfRoleDetailsComponent implements OnInit { return result; } + triggerAlert(type: AlertType, msg: string) { + this.alertType = type; + this.alertMsg = msg; + this.showAlert = true; + } + onSubmit() { if (this.roleForm.invalid) return; @@ -168,7 +183,12 @@ export class DfRoleDetailsComponent implements OnInit { if (this.type === 'edit' && payload.id) { this.roleService .update(payload.id, payload) - + .pipe( + catchError(err => { + this.triggerAlert('error', err.error.error.message); + return throwError(() => new Error(err)); + }) + ) .subscribe(() => { this.goBack(); }); @@ -178,7 +198,15 @@ export class DfRoleDetailsComponent implements OnInit { fields: '*', related: 'role_service_access_by_role_id,lookup_by_role_id', }) - + .pipe( + catchError(err => { + this.triggerAlert( + 'error', + err.error.error.context.resource[0].message + ); + return throwError(() => new Error(err)); + }) + ) .subscribe(() => { this.goBack(); }); From ca18855101e7be801b173f78f2d9802bcf35a0d4 Mon Sep 17 00:00:00 2001 From: Jacob Yi Date: Thu, 14 Dec 2023 21:28:30 -0600 Subject: [PATCH 09/14] changed breadcrumb --- .../components/df-manage-table/df-manage-table.component.ts | 2 +- .../shared/components/df-side-nav/df-side-nav.component.ts | 2 ++ src/app/shared/utilities/route.ts | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/shared/components/df-manage-table/df-manage-table.component.ts b/src/app/shared/components/df-manage-table/df-manage-table.component.ts index 0612c5d9..0ba1641a 100644 --- a/src/app/shared/components/df-manage-table/df-manage-table.component.ts +++ b/src/app/shared/components/df-manage-table/df-manage-table.component.ts @@ -211,7 +211,7 @@ export abstract class DfManageTableComponent } viewRow(row: T): void { - this.router.navigate([(row as any).id], { + this.router.navigate([`${(row as any).id}-${(row as any).label}`], { relativeTo: this._activatedRoute, }); } diff --git a/src/app/shared/components/df-side-nav/df-side-nav.component.ts b/src/app/shared/components/df-side-nav/df-side-nav.component.ts index d457208e..2aa44f6e 100644 --- a/src/app/shared/components/df-side-nav/df-side-nav.component.ts +++ b/src/app/shared/components/df-side-nav/df-side-nav.component.ts @@ -32,6 +32,7 @@ import { of, switchMap } from 'rxjs'; import { MatDialog, MatDialogModule } from '@angular/material/dialog'; import { DfSearchDialogComponent } from '../df-search-dialog/df-search-dialog.component'; import { UntilDestroy } from '@ngneat/until-destroy'; +import { CommonModule } from '@angular/common'; @UntilDestroy({ checkProperties: true }) @Component({ selector: 'df-side-nav', @@ -53,6 +54,7 @@ import { UntilDestroy } from '@ngneat/until-destroy'; NgFor, NgTemplateOutlet, MatDialogModule, + CommonModule ], }) export class DfSideNavComponent implements OnInit { diff --git a/src/app/shared/utilities/route.ts b/src/app/shared/utilities/route.ts index 1b810013..258e5af7 100644 --- a/src/app/shared/utilities/route.ts +++ b/src/app/shared/utilities/route.ts @@ -156,11 +156,14 @@ export function generateBreadcrumb( return true; } } else { + const translationKeySegment = isDynamic ? path.slice(1) : path; const translationKey = [...translationKeySoFar, translationKeySegment] .join('.') .replace(/\//g, '.'); - const breadcrumb: Breadcrumb = { label: currentSegment }; + const parts = currentSegment.split('-'); + const requiredText = parts[parts.length - 1]; + const breadcrumb: Breadcrumb = { label: requiredText }; if (index !== urlSegments.length - 1) { breadcrumb.path = newPath.join('/'); From ae8813d5382278cee5fa2b70686e640ff75ae603 Mon Sep 17 00:00:00 2001 From: Jacob Yi Date: Fri, 15 Dec 2023 13:36:57 -0600 Subject: [PATCH 10/14] updated route name --- .../df-manage-table/df-manage-table.component.ts | 2 +- .../components/df-side-nav/df-side-nav.component.scss | 10 +++++----- .../components/df-side-nav/df-side-nav.component.ts | 3 +-- src/app/shared/utilities/route.ts | 1 - 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/app/shared/components/df-manage-table/df-manage-table.component.ts b/src/app/shared/components/df-manage-table/df-manage-table.component.ts index 0ba1641a..98ae97f1 100644 --- a/src/app/shared/components/df-manage-table/df-manage-table.component.ts +++ b/src/app/shared/components/df-manage-table/df-manage-table.component.ts @@ -211,7 +211,7 @@ export abstract class DfManageTableComponent } viewRow(row: T): void { - this.router.navigate([`${(row as any).id}-${(row as any).label}`], { + this.router.navigate([`${(row as any).id}-${(row as any).name}`], { relativeTo: this._activatedRoute, }); } diff --git a/src/app/shared/components/df-side-nav/df-side-nav.component.scss b/src/app/shared/components/df-side-nav/df-side-nav.component.scss index d4ed8127..be4f7a64 100644 --- a/src/app/shared/components/df-side-nav/df-side-nav.component.scss +++ b/src/app/shared/components/df-side-nav/df-side-nav.component.scss @@ -30,15 +30,15 @@ $red-palette: mat.define-palette(mat.$red-palette); color: var(--mat-expansion-container-text-color); cursor: pointer; display: flex; - align-items: center; + align-items: center; - span { - margin-left: 6px; - } + span { + margin-left: 6px; + } } .profile-icon { - color: #0f0761; + color: #0f0761; } .sidenav-container { diff --git a/src/app/shared/components/df-side-nav/df-side-nav.component.ts b/src/app/shared/components/df-side-nav/df-side-nav.component.ts index 2aa44f6e..7c3fabb0 100644 --- a/src/app/shared/components/df-side-nav/df-side-nav.component.ts +++ b/src/app/shared/components/df-side-nav/df-side-nav.component.ts @@ -32,7 +32,7 @@ import { of, switchMap } from 'rxjs'; import { MatDialog, MatDialogModule } from '@angular/material/dialog'; import { DfSearchDialogComponent } from '../df-search-dialog/df-search-dialog.component'; import { UntilDestroy } from '@ngneat/until-destroy'; -import { CommonModule } from '@angular/common'; + @UntilDestroy({ checkProperties: true }) @Component({ selector: 'df-side-nav', @@ -54,7 +54,6 @@ import { CommonModule } from '@angular/common'; NgFor, NgTemplateOutlet, MatDialogModule, - CommonModule ], }) export class DfSideNavComponent implements OnInit { diff --git a/src/app/shared/utilities/route.ts b/src/app/shared/utilities/route.ts index 258e5af7..480340fc 100644 --- a/src/app/shared/utilities/route.ts +++ b/src/app/shared/utilities/route.ts @@ -156,7 +156,6 @@ export function generateBreadcrumb( return true; } } else { - const translationKeySegment = isDynamic ? path.slice(1) : path; const translationKey = [...translationKeySoFar, translationKeySegment] .join('.') From 233fb8af48fc3070b94f58180f8a4074f6997e4c Mon Sep 17 00:00:00 2001 From: Jacob Yi Date: Fri, 15 Dec 2023 20:42:22 -0600 Subject: [PATCH 11/14] updated redirect o redirect direct to the specific docs --- .../df-service-details/df-service-details.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/adf-services/df-service-details/df-service-details.component.ts b/src/app/adf-services/df-service-details/df-service-details.component.ts index a30a6b6f..0193469d 100644 --- a/src/app/adf-services/df-service-details/df-service-details.component.ts +++ b/src/app/adf-services/df-service-details/df-service-details.component.ts @@ -226,7 +226,7 @@ export class DfServiceDetailsComponent implements OnInit { } ) .subscribe(() => { - this.router.navigate(['/api-connections/api-docs']); + this.router.navigate([`/api-connections/api-docs/${data.name}`]); }); } } From 9b0b5e7c5e622aaded2408b61dc58c379ead2303 Mon Sep 17 00:00:00 2001 From: Jacob Yi Date: Mon, 18 Dec 2023 21:12:13 -0600 Subject: [PATCH 12/14] added graphics and updated login page --- .../df-login/df-login.component.html | 10 ++++--- .../df-side-nav/df-side-nav.component.html | 23 +++++++++++++++ .../df-side-nav/df-side-nav.component.scss | 27 ++++++++++++++++++ src/assets/img/API.gif | Bin 0 -> 2842059 bytes src/assets/img/Browser.gif | Bin 0 -> 501363 bytes src/assets/img/Server-Stack.gif | Bin 0 -> 2524670 bytes src/assets/img/Tools.gif | Bin 0 -> 324632 bytes 7 files changed, 56 insertions(+), 4 deletions(-) create mode 100644 src/assets/img/API.gif create mode 100644 src/assets/img/Browser.gif create mode 100644 src/assets/img/Server-Stack.gif create mode 100644 src/assets/img/Tools.gif diff --git a/src/app/adf-user-management/df-login/df-login.component.html b/src/app/adf-user-management/df-login/df-login.component.html index b74967b2..3c134266 100644 --- a/src/app/adf-user-management/df-login/df-login.component.html +++ b/src/app/adf-user-management/df-login/df-login.component.html @@ -22,7 +22,7 @@ - + {{ 'userManagement.controls.services.label' | transloco @@ -37,7 +37,9 @@ - + {{ 'userManagement.controls.email.label' | transloco }} @@ -59,7 +61,7 @@ {{ 'userManagement.controls.username.altLabel' | transloco @@ -72,7 +74,7 @@ - + {{ 'userManagement.controls.password.label' | transloco }} diff --git a/src/app/shared/components/df-side-nav/df-side-nav.component.html b/src/app/shared/components/df-side-nav/df-side-nav.component.html index f3cf8f76..5019b45b 100644 --- a/src/app/shared/components/df-side-nav/df-side-nav.component.html +++ b/src/app/shared/components/df-side-nav/df-side-nav.component.html @@ -59,6 +59,29 @@ [opened]="(isSmallScreen | async) === false" class="sidenav" [mode]="(isSmallScreen | async) ? 'over' : 'side'"> + + +