-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
11 changed files
with
1,595 additions
and
908 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
...c/app/features/dashboard/profile/components/modals/add-metrics/add-metrics.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <div class="add-metrics"> | ||
| <span class="ft-24-700 title">{{ 'metric.add-metrics.text' | translate | titlecase }}</span> | ||
|
|
||
| <div class="json-editor-container"> | ||
| <json-editor | ||
| #metricsEditor | ||
| [options]="options" | ||
| ></json-editor> | ||
| </div> | ||
|
|
||
| <div class="button-container"> | ||
| <button class="shared-modal--modal-btn" mat-raised-button (click)="onCancelClick()"> | ||
| {{ 'global.cancel.text' | translate }} | ||
| </button> | ||
| <button | ||
| mat-raised-button | ||
| class="shared-modal--modal-btn default-button" | ||
| [ngClass]="{ 'default-button--disabled': metricsEditorError }" | ||
| [disabled]="metricsEditorError" | ||
| (click)="addMetrics()" | ||
| > | ||
| {{ 'global.save.text' | translate }} | ||
| </button> | ||
| </div> | ||
| </div> |
37 changes: 37 additions & 0 deletions
37
...c/app/features/dashboard/profile/components/modals/add-metrics/add-metrics.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| .add-metrics { | ||
| .title { | ||
| display: block; | ||
| padding: 40px 40px 0; | ||
| height: 108px; | ||
| } | ||
|
|
||
| .json-editor-container { | ||
| margin-top: 20px; | ||
| padding: 0 36px 20px; | ||
| height: 300px; | ||
| } | ||
|
|
||
| ::ng-deep .jsoneditor { | ||
| border: 0; | ||
| height: 300px; | ||
| } | ||
|
|
||
| ::ng-deep .jsoneditor-menu { | ||
| display: none; | ||
| } | ||
|
|
||
| ::ng-deep .ace-jsoneditor .ace_gutter { | ||
| border-right: 1px solid var(--blue); | ||
| } | ||
|
|
||
| ::ng-deep .ace-jsoneditor .ace_gutter-active-line, | ||
| ::ng-deep .ace-jsoneditor .ace_marker-layer .ace_active-line { | ||
| background-color: var(--blue); | ||
| } | ||
|
|
||
| .button-container { | ||
| display: flex; | ||
| justify-content: flex-end; | ||
| padding: 0 40px 40px; | ||
| } | ||
| } |
37 changes: 37 additions & 0 deletions
37
...pp/features/dashboard/profile/components/modals/add-metrics/add-metrics.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import { async, ComponentFixture, TestBed } from '@angular/core/testing'; | ||
|
|
||
| import { AddMetricsComponent } from './add-metrics.component'; | ||
| import { TestingModule } from '../../../../../../../testing/testing.module'; | ||
| import { AnalysisService } from '../../../../../../core/analysis/analysis.service'; | ||
| import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; | ||
| import { NgJsonEditorModule } from 'ang-jsoneditor'; | ||
|
|
||
| xdescribe('AddMetricsComponent', () => { | ||
| let component: AddMetricsComponent; | ||
| let fixture: ComponentFixture<AddMetricsComponent>; | ||
|
|
||
| beforeEach(async(() => { | ||
| TestBed.configureTestingModule({ | ||
| declarations: [AddMetricsComponent], | ||
| imports: [TestingModule, NgJsonEditorModule], | ||
| providers: [ | ||
| AnalysisService, | ||
| { provide: MatDialogRef, useValue: {} }, | ||
| { | ||
| provide: MAT_DIALOG_DATA, | ||
| useValue: {}, | ||
| }, | ||
| ], | ||
| }).compileComponents(); | ||
| })); | ||
|
|
||
| beforeEach(() => { | ||
| fixture = TestBed.createComponent(AddMetricsComponent); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
| }); | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
| }); |
51 changes: 51 additions & 0 deletions
51
...src/app/features/dashboard/profile/components/modals/add-metrics/add-metrics.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| import { Component, OnInit, ViewChild } from '@angular/core'; | ||
| import { JsonEditorOptions, JsonEditorComponent } from 'ang-jsoneditor'; | ||
| import { MatDialogRef } from '@angular/material/dialog'; | ||
| import { AnalysisService } from '../../../../../../core/analysis/analysis.service'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-add-metrics', | ||
| templateUrl: './add-metrics.component.html', | ||
| styleUrls: ['./add-metrics.component.scss'], | ||
| }) | ||
| export class AddMetricsComponent implements OnInit { | ||
| options = new JsonEditorOptions(); | ||
| metricsEditorError = false; | ||
| @ViewChild('metricsEditor', { static: false }) metricsEditor: JsonEditorComponent; | ||
| constructor(private dialogRef: MatDialogRef<AddMetricsComponent>, private analysisService: AnalysisService) {} | ||
|
|
||
| ngOnInit() { | ||
| this.options = new JsonEditorOptions(); | ||
| this.options.mode = 'code'; | ||
| this.options.statusBar = false; | ||
|
|
||
| this.options.onChange = () => { | ||
| try { | ||
| this.metricsEditor.get(); | ||
| this.metricsEditorError = false; | ||
| } catch (e) { | ||
| this.metricsEditorError = true; | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| onCancelClick(): void { | ||
| this.dialogRef.close(); | ||
| } | ||
|
|
||
| addMetrics() { | ||
| const json = this.metricsEditor.get(); | ||
| let data: any = {}; | ||
| if (Array.isArray(json)) { | ||
| data = { | ||
| metricUnit: json, | ||
| }; | ||
| } else { | ||
| data = { | ||
| metricUnit: [json], | ||
| }; | ||
| } | ||
| this.analysisService.upsertMetrics(data); | ||
| this.onCancelClick(); | ||
| } | ||
| } |
42 changes: 42 additions & 0 deletions
42
...e/src/app/features/dashboard/profile/components/modals/add-metrics/add-metrics.theme.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| @use '@angular/material' as mat; | ||
|
|
||
| @mixin add-metrics-component-theme($theme) { | ||
| $background: map-get($theme, background); | ||
| $foreground: map-get($theme, foreground); | ||
|
|
||
| .add-metrics { | ||
| .title { | ||
| box-shadow: 0 0 8px 0 mat.get-color-from-palette($background, shadow-color); | ||
| } | ||
|
|
||
| .ace-jsoneditor .ace_scroller { | ||
| background-color: mat.get-color-from-palette($background, background); | ||
| } | ||
|
|
||
| .ace-jsoneditor .ace_gutter { | ||
| background-color: mat.get-color-from-palette($background, background); | ||
| color: mat.get-color-from-palette($foreground, text); | ||
| } | ||
|
|
||
| .ace-jsoneditor .ace_text-layer { | ||
| color: mat.get-color-from-palette($foreground, text); | ||
| } | ||
|
|
||
| .ace-jsoneditor .ace_variable { | ||
| color: mat.get-color-from-palette($foreground, text); | ||
| } | ||
|
|
||
| .ace-jsoneditor .ace_gutter-active-line { | ||
| color: mat.get-color-from-palette($foreground, text); | ||
| } | ||
|
|
||
| .ace-jsoneditor .ace_marker-layer .ace_active-line { | ||
| color: mat.get-color-from-palette($foreground, text); | ||
| } | ||
|
|
||
| .ace-jsoneditor .ace_string { | ||
| color: mat.get-color-from-palette($foreground, text); | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters