[Monitor Dashboard | Trunk]: 1. Pachage json remove /dashboard base url for dev. 2. Indicators change section title input to bordeless and h5 style

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@60739 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
Konstantinos Triantafyllou 2021-03-29 08:19:33 +00:00
parent 483f2d0c00
commit 8f4980276c
2 changed files with 27 additions and 18 deletions

View File

@ -18,7 +18,7 @@
"build": "ng build", "build": "ng build",
"build:client-and-server-bundles": "ng build --prod --sourceMap --stats-json=true --base-href /dashboard/ && ng run ng-universal-demo:server:production", "build:client-and-server-bundles": "ng build --prod --sourceMap --stats-json=true --base-href /dashboard/ && ng run ng-universal-demo:server:production",
"build:client-and-server-bundles-beta": "ng build --configuration=beta --sourceMap --stats-json=true --base-href /dashboard/ && ng run ng-universal-demo:server:beta", "build:client-and-server-bundles-beta": "ng build --configuration=beta --sourceMap --stats-json=true --base-href /dashboard/ && ng run ng-universal-demo:server:beta",
"build:client-and-server-bundles-dev": "ng build --configuration=development --sourceMap --stats-json=true --base-href /dashboard/ && ng run ng-universal-demo:server:development", "build:client-and-server-bundles-dev": "ng build --configuration=development --sourceMap --stats-json=true && ng run ng-universal-demo:server:development",
"build:prerender": "npm run build:client-and-server-bundles && npm run webpack:server && npm run generate:prerender", "build:prerender": "npm run build:client-and-server-bundles && npm run webpack:server && npm run generate:prerender",
"build:ssr": "npm run build:client-and-server-bundles && npm run webpack:server", "build:ssr": "npm run build:client-and-server-bundles && npm run webpack:server",
"build:prerender-beta": "npm run build:client-and-server-bundles-beta && npm run webpack:server && npm run generate:prerender", "build:prerender-beta": "npm run build:client-and-server-bundles-beta && npm run webpack:server && npm run generate:prerender",

View File

@ -31,8 +31,8 @@
<div *ngIf="numberSections.at(i)" <div *ngIf="numberSections.at(i)"
class="uk-width-1-1 uk-margin-medium-bottom disable-sortable uk-sortable-nodrag"> class="uk-width-1-1 uk-margin-medium-bottom disable-sortable uk-sortable-nodrag">
<div dashboard-input [formInput]="numberSections.at(i).get('title')" <div dashboard-input [formInput]="numberSections.at(i).get('title')"
[extraLeft]="false" class="uk-width-1-3" [extraLeft]="false" class="uk-width-1-3@m uk-width-1-1" placeholder="Title"
placeholder="Write a title for this section"> inputClass="input-borderless uk-h5">
<div [class.uk-invisible]="numberSections.at(i).get('title').pristine"> <div [class.uk-invisible]="numberSections.at(i).get('title').pristine">
<button class="uk-button uk-button-secondary" [disabled]="editing" <button class="uk-button uk-button-secondary" [disabled]="editing"
(click)="saveSection(numberSections.at(i).value, i, 'number')"> (click)="saveSection(numberSections.at(i).value, i, 'number')">
@ -135,8 +135,8 @@
<div *ngIf="chartSections.at(i)" <div *ngIf="chartSections.at(i)"
class="uk-width-1-1 uk-margin-medium-bottom disable-sortable uk-sortable-nodrag"> class="uk-width-1-1 uk-margin-medium-bottom disable-sortable uk-sortable-nodrag">
<div dashboard-input [formInput]="chartSections.at(i).get('title')" <div dashboard-input [formInput]="chartSections.at(i).get('title')"
[extraLeft]="false" class="uk-width-1-3" [extraLeft]="false" class="uk-width-1-3@m uk-width-1-1" placeholder="Title"
placeholder="Write a title for this section"> inputClass="input-borderless uk-h5">
<div [class.uk-invisible]="chartSections.at(i).get('title').pristine"> <div [class.uk-invisible]="chartSections.at(i).get('title').pristine">
<button class="uk-button uk-button-secondary" [disabled]="editing" <button class="uk-button uk-button-secondary" [disabled]="editing"
(click)="saveSection(chartSections.at(i).value, i)"> (click)="saveSection(chartSections.at(i).value, i)">
@ -190,7 +190,8 @@
<div *ngIf="properties.disableFrameLoad && <div *ngIf="properties.disableFrameLoad &&
indicator.indicatorPaths[0].source !== indicator.indicatorPaths[0].source !==
'image'" class="uk-alert uk-alert-danger uk-text-center">I frames 'image'" class="uk-alert uk-alert-danger uk-text-center">I frames
preview is disabled</div> preview is disabled
</div>
<div *ngIf="indicator.indicatorPaths[0] && indicator.indicatorPaths[0].source === 'image'"> <div *ngIf="indicator.indicatorPaths[0] && indicator.indicatorPaths[0].source === 'image'">
<img [class]="' uk-width-1-1 uk-height-' + <img [class]="' uk-width-1-1 uk-height-' +
(indicator.height?indicator.height.toLowerCase():'medium')" (indicator.height?indicator.height.toLowerCase():'medium')"
@ -231,7 +232,8 @@
[okDisabled]="numberIndicatorFb && (numberIndicatorFb.invalid || numberIndicatorFb.pristine)"> [okDisabled]="numberIndicatorFb && (numberIndicatorFb.invalid || numberIndicatorFb.pristine)">
<div class="uk-padding-small"> <div class="uk-padding-small">
<div *ngIf="numberIndicatorFb" class="uk-grid" [formGroup]="numberIndicatorFb" uk-grid> <div *ngIf="numberIndicatorFb" class="uk-grid" [formGroup]="numberIndicatorFb" uk-grid>
<div dashboard-input class="uk-width-1-1" [formInput]="numberIndicatorFb.get('name')" placeholder="Write a title" label="Title"></div> <div dashboard-input class="uk-width-1-1" [formInput]="numberIndicatorFb.get('name')" placeholder="Write a title"
label="Title"></div>
<div dashboard-input class="uk-width-1-1" *ngIf="stakeholder.defaultId !=-1 && ( (indicator.description && <div dashboard-input class="uk-width-1-1" *ngIf="stakeholder.defaultId !=-1 && ( (indicator.description &&
indicator.description.length > 0) || !stakeholder.defaultId)" indicator.description.length > 0) || !stakeholder.defaultId)"
[formInput]="numberIndicatorFb.get('description')" [formInput]="numberIndicatorFb.get('description')"
@ -265,7 +267,8 @@
<div *ngIf="showCheckForSchemaEnhancements" class=" uk-width-1-1 "> <div *ngIf="showCheckForSchemaEnhancements" class=" uk-width-1-1 ">
<div class="uk-alert uk-alert-warning"> <div class="uk-alert uk-alert-warning">
There are schema enchancements that can be applied in this query. <a There are schema enchancements that can be applied in this query. <a
(click)="indicatorPath.get('url').setValue(indicatorUtils.applySchemaEnhancements(indicatorPath.get('url').value)); indicatorPath.get('url').markAsDirty()">Apply now</a> (click)="indicatorPath.get('url').setValue(indicatorUtils.applySchemaEnhancements(indicatorPath.get('url').value)); indicatorPath.get('url').markAsDirty()">Apply
now</a>
</div> </div>
</div> </div>
<div class="uk-width-1-1"> <div class="uk-width-1-1">
@ -280,7 +283,8 @@
<h6 class="uk-text-bold uk-flex uk-flex-middle uk-margin-remove-bottom"> <h6 class="uk-text-bold uk-flex uk-flex-middle uk-margin-remove-bottom">
<span>JSON Path</span> <span>JSON Path</span>
</h6> </h6>
<div *ngIf="numberIndicatorPaths.at(i).get('result').invalid && numberIndicatorPaths.at(i).get('result').errors.required"> <div
*ngIf="numberIndicatorPaths.at(i).get('result').invalid && numberIndicatorPaths.at(i).get('result').errors.required">
<div class="uk-text-danger uk-text-small"> <div class="uk-text-danger uk-text-small">
This JSON path is not valid or the result has not been calculated yet. This JSON path is not valid or the result has not been calculated yet.
Please press calculate on box below to see the result. Please press calculate on box below to see the result.
@ -301,8 +305,9 @@
(click)="removeJsonPath(i, j)"> (click)="removeJsonPath(i, j)">
<icon name="close"></icon> <icon name="close"></icon>
</span> </span>
<span class="uk-text-center uk-margin-left"> <span class="uk-text-center uk-margin-left">
<icon *ngIf="indicator.defaultId === null || j < (getJsonPath(i).controls.length - 1)" name="arrow_right"></icon> <icon *ngIf="indicator.defaultId === null || j < (getJsonPath(i).controls.length - 1)"
name="arrow_right"></icon>
</span> </span>
</div> </div>
</div> </div>
@ -318,10 +323,12 @@
<div class="uk-width-1-1 uk-flex uk-flex-center"> <div class="uk-width-1-1 uk-flex uk-flex-center">
<div class="uk-flex uk-position-relative"> <div class="uk-flex uk-position-relative">
<span class="uk-padding number number-preview uk-text-center"> <span class="uk-padding number number-preview uk-text-center">
<span *ngIf="numberIndicatorPaths.at(i).get('result').valid && numberIndicatorPaths.at(i).get('result').value !== 0"> <span
*ngIf="numberIndicatorPaths.at(i).get('result').valid && numberIndicatorPaths.at(i).get('result').value !== 0">
{{numberIndicatorPaths.at(i).get('result').value | number}} {{numberIndicatorPaths.at(i).get('result').value | number}}
</span> </span>
<span *ngIf="numberIndicatorPaths.at(i).get('result').valid && numberIndicatorPaths.at(i).get('result').value === 0"> <span
*ngIf="numberIndicatorPaths.at(i).get('result').valid && numberIndicatorPaths.at(i).get('result').value === 0">
-- --
</span> </span>
</span> </span>
@ -355,7 +362,8 @@
[okDisabled]="chartIndicatorFb && (chartIndicatorFb.invalid || chartIndicatorFb.pristine)"> [okDisabled]="chartIndicatorFb && (chartIndicatorFb.invalid || chartIndicatorFb.pristine)">
<div class="uk-padding-small"> <div class="uk-padding-small">
<div *ngIf="chartIndicatorFb" [formGroup]="chartIndicatorFb" class="uk-grid" uk-grid> <div *ngIf="chartIndicatorFb" [formGroup]="chartIndicatorFb" class="uk-grid" uk-grid>
<div dashboard-input class="uk-width-1-1" [formInput]="chartIndicatorFb.get('name')" placeholder="Write a title" label="Title"></div> <div dashboard-input class="uk-width-1-1" [formInput]="chartIndicatorFb.get('name')" placeholder="Write a title"
label="Title"></div>
<div dashboard-input class="uk-width-1-1" *ngIf="stakeholder.defaultId !=-1 && ( (indicator.description && <div dashboard-input class="uk-width-1-1" *ngIf="stakeholder.defaultId !=-1 && ( (indicator.description &&
indicator.description.length > 0) || !stakeholder.defaultId)" indicator.description.length > 0) || !stakeholder.defaultId)"
[formInput]="chartIndicatorFb.get('description')" placeholder="Write a description" [formInput]="chartIndicatorFb.get('description')" placeholder="Write a description"
@ -387,8 +395,9 @@
label="Chart URL"></div> label="Chart URL"></div>
<div *ngIf="showCheckForSchemaEnhancements" class=" uk-width-1-1 "> <div *ngIf="showCheckForSchemaEnhancements" class=" uk-width-1-1 ">
<div class="uk-alert uk-alert-warning"> <div class="uk-alert uk-alert-warning">
There are schema enchancements that can be applied in this query. <a There are schema enchancements that can be applied in this query. <a
(click)="indicatorPath.get('url').setValue(indicatorUtils.applySchemaEnhancements(indicatorPath.get('url').value)); indicatorPath.get('url').markAsDirty()">Apply now</a> (click)="indicatorPath.get('url').setValue(indicatorUtils.applySchemaEnhancements(indicatorPath.get('url').value)); indicatorPath.get('url').markAsDirty()">Apply
now</a>
</div> </div>
</div> </div>
<div class="uk-width-1-1" formArrayName="parameters"> <div class="uk-width-1-1" formArrayName="parameters">
@ -465,8 +474,8 @@
<iframe *ngIf="indicator.indicatorPaths[i].source !== 'image'" <iframe *ngIf="indicator.indicatorPaths[i].source !== 'image'"
[src]="indicator.indicatorPaths[i].safeResourceUrl" [src]="indicator.indicatorPaths[i].safeResourceUrl"
class="uk-width-1-1 uk-height-large"></iframe> class="uk-width-1-1 uk-height-large"></iframe>
<!-- <div *ngIf="properties.disableFrameLoad && indicator.indicatorPaths[i].source !== 'image'" class="uk-alert uk-alert-danger uk-text-center">I frames--> <!-- <div *ngIf="properties.disableFrameLoad && indicator.indicatorPaths[i].source !== 'image'" class="uk-alert uk-alert-danger uk-text-center">I frames-->
<!-- preview is disabled</div>--> <!-- preview is disabled</div>-->
<div *ngIf="indicator.indicatorPaths[i].source === 'image'"> <div *ngIf="indicator.indicatorPaths[i].source === 'image'">
<img class="uk-width-1-1 uk-height-large" [src]="indicator.indicatorPaths[i].url"> <img class="uk-width-1-1 uk-height-large" [src]="indicator.indicatorPaths[i].url">
</div> </div>