From 3c4fb2781501c13dcc974daaf7dceca03ed2f5aa Mon Sep 17 00:00:00 2001 From: datomo Date: Sun, 17 Mar 2024 01:21:51 +0100 Subject: [PATCH] various cleanup and reformattings --- package-lock.json | 13 +++-- package.json | 2 +- .../data-card/data-card.component.html | 49 ++++++++++------- .../data-graph/data-graph.component.html | 31 ++++++----- .../data-table/data-table.component.html | 55 +++++++++++-------- .../json-text/json-text.component.html | 2 +- .../json-text/json-text.component.ts | 6 +- .../render-item/render-item.component.html | 48 ++++++++-------- .../json/json-editor.component.html | 39 +++++++------ .../json/json-editor.component.scss | 4 -- .../components/json/json-editor.component.ts | 3 - .../json/json-elem/json-elem.component.html | 25 ++++----- .../json/json-elem/json-elem.component.scss | 6 +- .../json/json-elem/json-elem.component.ts | 6 ++ .../edit-columns/edit-columns.component.html | 6 +- .../graph-edit-graph.component.html | 19 ++++--- src/app/views/views.module.ts | 6 +- 17 files changed, 178 insertions(+), 142 deletions(-) diff --git a/package-lock.json b/package-lock.json index 84eb92a4..640a0a45 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "hammer": "0.0.5", "hammerjs": "^2.0.8", "highlight.js": "^11.8.0", - "jquery": "^3.5.1", + "jquery": "3.7.1", "jquery-ui": "^1.13.0", "katex": "^0.16.0", "lodash": "^4.17.20", @@ -9209,9 +9209,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", - "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "dev": true, "funding": [ { @@ -10591,8 +10591,9 @@ } }, "node_modules/jquery": { - "version": "3.5.1", - "license": "MIT" + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", + "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" }, "node_modules/jquery-ui": { "version": "1.13.2", diff --git a/package.json b/package.json index 9ae594e2..432c6856 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "hammer": "0.0.5", "hammerjs": "^2.0.8", "highlight.js": "^11.8.0", - "jquery": "^3.5.1", + "jquery": "3.7.1", "jquery-ui": "^1.13.0", "katex": "^0.16.0", "lodash": "^4.17.20", diff --git a/src/app/components/data-view/data-card/data-card.component.html b/src/app/components/data-view/data-card/data-card.component.html index fd2a33ce..d0d9c29e 100644 --- a/src/app/components/data-view/data-card/data-card.component.html +++ b/src/app/components/data-view/data-card/data-card.component.html @@ -5,10 +5,12 @@
- - @@ -42,7 +44,7 @@ - {{h.name}}: + {{ h.name }}: @@ -55,7 +57,7 @@ - {{h.name}}: + {{ h.name }}: @@ -74,11 +76,17 @@
  • - - + + + + + + + @@ -98,11 +106,11 @@ - Insert data + Insert Data
    • -
    • - - + + + + + + @@ -143,7 +154,7 @@ [disabled]="p.disabled" [active]="p.active"> {{p.label}} + [routerLink]>{{ p.label }}
      • diff --git a/src/app/components/data-view/data-graph/data-graph.component.html b/src/app/components/data-view/data-graph/data-graph.component.html index f9dc9a0e..c7fdc3d0 100644 --- a/src/app/components/data-view/data-graph/data-graph.component.html +++ b/src/app/components/data-view/data-graph/data-graph.component.html @@ -8,14 +8,14 @@
      - {{detail.id}} + {{ detail.id }} {{label}} + [style]="{ 'background-color': getLabelColor(label) }">{{ label }}
      -

      {{entry.key}}: {{entry.value}}

      +

      {{ entry.key }}: {{ entry.value }}

       @@ -39,7 +39,7 @@ - Insert data + Insert Data
      • @@ -54,18 +54,23 @@ [json]="insertValues.get(h.name)" (valueChange)="inputChange(h.name, $event)">
        • -
      • - - +
      • + + + + + + -
      @@ -14,7 +15,8 @@ {{ h.name }} - @@ -74,14 +76,16 @@ - - + + + + @@ -99,8 +103,9 @@ - + @@ -122,15 +127,19 @@ - - - + + + + + + @@ -145,7 +154,9 @@
    • - {{p.label}} + {{ p.label }}
      • diff --git a/src/app/components/data-view/json-text/json-text.component.html b/src/app/components/data-view/json-text/json-text.component.html index def7c0af..e565e719 100644 --- a/src/app/components/data-view/json-text/json-text.component.html +++ b/src/app/components/data-view/json-text/json-text.component.html @@ -1,3 +1,3 @@
      - +
      diff --git a/src/app/components/data-view/json-text/json-text.component.ts b/src/app/components/data-view/json-text/json-text.component.ts index 9152a063..6c918437 100644 --- a/src/app/components/data-view/json-text/json-text.component.ts +++ b/src/app/components/data-view/json-text/json-text.component.ts @@ -8,7 +8,7 @@ import {Component, Input, OnInit} from '@angular/core'; export class JsonTextComponent implements OnInit { @Input() text?: string; - testing; + json: {}; constructor() { } @@ -18,10 +18,10 @@ export class JsonTextComponent implements OnInit { if (regex.test(this.text)) { return; } - this.testing = this.parse(this.text); + this.json = this.parse(this.text); } - parse(text: string) { + parse(text: string): {} { try { return JSON.parse(text); } catch (e) { diff --git a/src/app/components/information-manager/render-item/render-item.component.html b/src/app/components/information-manager/render-item/render-item.component.html index 905aa3ff..50a35002 100644 --- a/src/app/components/information-manager/render-item/render-item.component.html +++ b/src/app/components/information-manager/render-item/render-item.component.html @@ -1,11 +1,11 @@ - {{li.label}} + {{ li.label }} - {{li.label}} + {{ li.label }} @@ -17,12 +17,12 @@ - + - +
      {{l}}{{ l }}
      {{data}}{{ data }}
      @@ -38,16 +38,18 @@
      - {{li.label}} + {{ li.label }}
      - {{displayProgressValue( li )}} + {{ displayProgressValue(li) }}
      - {{li.value}}% - + + {{ li.value }}% + +
      @@ -65,7 +67,7 @@
      -
      {{p.key}}
      +
      {{ p.key }}
      @@ -75,19 +77,19 @@ #tooltip="bs-tooltip" (mouseenter)="parameterWarning(li, tooltip)" (mouseleave)="tooltip.hide()"> - {{li.label}} + {{ li.label }}
      -
      +
      - total time: {{displayTime( li.duration )}} + total time: {{ displayTime(li.duration) }}
      - {{li.name}}: {{displayTime( li.duration )}} + {{ li.name }}: {{ displayTime(li.duration) }}
      - total {{duration.duration}} + total {{ duration.duration }}
      - {{duration.name}}: {{displayTime( duration.duration )}} + {{ duration.name }}: {{ displayTime(duration.duration) }}
      @@ -135,8 +137,8 @@ - - + +
      {{p.key}}{{p.value}}{{ p.key }}{{ p.value }}
      @@ -144,7 +146,7 @@ -

      {{li.text}}

      +

      {{ li.text }}

       @@ -152,11 +154,11 @@ -

      {{e.detailMessage}}

      -

      {{e.message}}

      +

      {{ e.detailMessage }}

      +

      {{ e.message }}

        -
      • at {{s.declaringClass}}.{{s.methodName}}({{s.fileName}}:{{s.lineNumber}}) +
      • at {{ s.declaringClass }}.{{ s.methodName }}({{ s.fileName }}:{{ s.lineNumber }})
      diff --git a/src/app/components/json/json-editor.component.html b/src/app/components/json/json-editor.component.html index 0d74620e..78289422 100644 --- a/src/app/components/json/json-editor.component.html +++ b/src/app/components/json/json-editor.component.html @@ -10,24 +10,27 @@ (add)="addColumn($event)" (validChanged)="validChanged()"> -
      -
      - -
        -
      • -
        - Add Key-Value -
        -
        • -
      • -
        - Add Key-Object -
        -
        • -
      -
      +
      + + + + + +
      diff --git a/src/app/components/json/json-editor.component.scss b/src/app/components/json/json-editor.component.scss index 305d598c..afa2fb22 100644 --- a/src/app/components/json/json-editor.component.scss +++ b/src/app/components/json/json-editor.component.scss @@ -1,7 +1,3 @@ -.json-dropdown { - display: block; -} - .show-error { display: block !important; } diff --git a/src/app/components/json/json-editor.component.ts b/src/app/components/json/json-editor.component.ts index 733270cd..ea76f66d 100644 --- a/src/app/components/json/json-editor.component.ts +++ b/src/app/components/json/json-editor.component.ts @@ -1,7 +1,6 @@ import {Component, EventEmitter, Input, OnInit, Output,} from '@angular/core'; - @Component({ selector: 'app-json-editor', templateUrl: './json-editor.component.html', @@ -10,8 +9,6 @@ import {Component, EventEmitter, Input, OnInit, Output,} from '@angular/core'; export class JsonEditorComponent implements OnInit { @Output() valid: boolean; - dupblKeyError = 'Document has duplicate key.'; - constructor() { this.data = []; } diff --git a/src/app/components/json/json-elem/json-elem.component.html b/src/app/components/json/json-elem/json-elem.component.html index bd6d60dd..b9a309d6 100644 --- a/src/app/components/json/json-elem/json-elem.component.html +++ b/src/app/components/json/json-elem/json-elem.component.html @@ -1,44 +1,43 @@
      - -
      - -
        +
        • -
          +
          Remove
        • -
          +
          Add Key-Value
        • -
          +
          Add Key-Object
        • -
          +
        • -
          +
          Move Up
        • -
          +
          Move Down
        -
      + @@ -50,7 +49,7 @@ Column Placements
      - + + +
      - + + +
      @@ -46,8 +49,8 @@
      Placements
      - - + +
      {{ _catalog.getAdapter(placement.adapterId)?.name}}{{ _catalog.getAdapter(placement.adapterId)?.adapterName}}{{ _catalog.getAdapter(placement.adapterId)?.name }}{{ _catalog.getAdapter(placement.adapterId)?.adapterName }} diff --git a/src/app/views/views.module.ts b/src/app/views/views.module.ts index a1b2a08a..9f084e7a 100644 --- a/src/app/views/views.module.ts +++ b/src/app/views/views.module.ts @@ -85,6 +85,8 @@ import { ModalTitleDirective, ModalToggleDirective, PlaceholderDirective, + ProgressBarComponent, + ProgressComponent, RowComponent, RowDirective, SpinnerComponent, @@ -158,7 +160,9 @@ import {TreeModule} from "@ali-hm/angular-tree-component"; BadgeComponent, FormCheckComponent, TreeModule, - PlaceholderDirective + PlaceholderDirective, + ProgressComponent, + ProgressBarComponent ], declarations: [ EditColumnsComponent,