Commit c3d858f5 authored by Julien BOUYER's avatar Julien BOUYER
Browse files

ci : correction du build npm

parent 9954d9d7
......@@ -3,7 +3,7 @@
<h2>
<span id="health-page-heading" v-text="$t('health.title')">Health Checks</span>
<button class="btn btn-primary float-right" v-on:click="refresh()" :disabled="updatingHealth">
<font-awesome-icon icon="sync"></font-awesome-icon> <span v-text="$t('health[\'refresh.button\']')">Refresh</span>
<!-- <font-awesome-icon icon="sync"></font-awesome-icon> <span v-text="$t('health[\'refresh.button\']')">Refresh</span> -->
</button>
</h2>
<div class="table-responsive">
......@@ -25,7 +25,7 @@
</td>
<td class="text-center">
<a class="hand" v-on:click="showHealth(health)" v-if="health.details || health.error">
<font-awesome-icon icon="eye"></font-awesome-icon>
<!-- <font-awesome-icon icon="eye"></font-awesome-icon> -->
</a>
</td>
</tr>
......
......@@ -3,7 +3,7 @@
<h2>
<span id="metrics-page-heading" v-text="$t('metrics.title')">Application Metrics</span>
<button class="btn btn-primary float-right" v-on:click="refresh()">
<font-awesome-icon icon="sync"></font-awesome-icon> <span v-text="$t('metrics[\'refresh.button\']')">Refresh</span>
<!-- <font-awesome-icon icon="sync"></font-awesome-icon> <span v-text="$t('metrics[\'refresh.button\']')">Refresh</span> -->
</button>
</h2>
......@@ -20,50 +20,50 @@
<span>{{ key }}</span> {{ formatNumber1(entry.used / 1048576) }}M
</span>
<div>Committed : {{ formatNumber1(entry.committed / 1048576) }}M</div>
<b-progress v-if="entry.max !== -1" variant="success" animated :max="entry.max" striped>
<!-- <b-progress v-if="entry.max !== -1" variant="success" animated :max="entry.max" striped>
<b-progress-bar :value="entry.used" :label="formatNumber1((entry.used * 100) / entry.max) + '%'"></b-progress-bar>
</b-progress>
</b-progress> -->
</div>
</div>
</div>
<div class="col-md-4">
<h4 v-text="$t('metrics.jvm.threads.title')">Threads</h4>
<span><span v-text="$t('metrics.jvm.threads.runnable')">Runnable</span> {{ threadStats.threadDumpRunnable }}</span>
<b-progress variant="success" :max="threadStats.threadDumpAll" striped>
<!-- <b-progress variant="success" :max="threadStats.threadDumpAll" striped>
<b-progress-bar
:value="threadStats.threadDumpRunnable"
:label="formatNumber1((threadStats.threadDumpRunnable * 100) / threadStats.threadDumpAll) + '%'"
></b-progress-bar>
</b-progress>
</b-progress> -->
<span><span v-text="$t('metrics.jvm.threads.timedwaiting')">Timed Waiting</span> ({{ threadStats.threadDumpTimedWaiting }})</span>
<b-progress variant="success" :max="threadStats.threadDumpAll" striped>
<!-- <b-progress variant="success" :max="threadStats.threadDumpAll" striped>
<b-progress-bar
:value="threadStats.threadDumpTimedWaiting"
:label="formatNumber1((threadStats.threadDumpTimedWaiting * 100) / threadStats.threadDumpAll) + '%'"
></b-progress-bar>
</b-progress>
</b-progress> -->
<span><span v-text="$t('metrics.jvm.threads.waiting')">Waiting</span> ({{ threadStats.threadDumpWaiting }})</span>
<b-progress variant="success" :max="threadStats.threadDumpAll" striped>
<!-- <b-progress variant="success" :max="threadStats.threadDumpAll" striped>
<b-progress-bar
:value="threadStats.threadDumpWaiting"
:label="formatNumber1((threadStats.threadDumpWaiting * 100) / threadStats.threadDumpAll) + '%'"
></b-progress-bar>
</b-progress>
</b-progress> -->
<span><span v-text="$t('metrics.jvm.threads.blocked')">Blocked</span> ({{ threadStats.threadDumpBlocked }})</span>
<b-progress variant="success" :max="threadStats.threadDumpAll" striped>
<!-- <b-progress variant="success" :max="threadStats.threadDumpAll" striped>
<b-progress-bar
:value="threadStats.threadDumpBlocked"
:label="formatNumber1((threadStats.threadDumpBlocked * 100) / threadStats.threadDumpAll) + '%'"
></b-progress-bar>
</b-progress>
</b-progress> -->
<span
>Total: {{ threadStats.threadDumpAll }}
<a class="hand" v-b-modal.metricsModal data-toggle="modal" v-on:click="openModal()" data-target="#threadDump">
<font-awesome-icon icon="eye"></font-awesome-icon>
<!-- <font-awesome-icon icon="eye"></font-awesome-icon> -->
</a>
</span>
</div>
......@@ -81,24 +81,24 @@
<div class="col-md-9">Process CPU usage</div>
<div class="col-md-3 text-right">{{ formatNumber2(100 * metrics.processMetrics['process.cpu.usage']) }} %</div>
</div>
<b-progress variant="success" :max="100" striped>
<!-- <b-progress variant="success" :max="100" striped>
<b-progress-bar
:value="100 * metrics.processMetrics['process.cpu.usage']"
:label="formatNumber1(100 * metrics.processMetrics['process.cpu.usage']) + '%'"
>
</b-progress-bar>
</b-progress>
</b-progress> -->
<div class="row" v-if="!updatingMetrics">
<div class="col-md-9">System CPU usage</div>
<div class="col-md-3 text-right">{{ formatNumber2(100 * metrics.processMetrics['system.cpu.usage']) }} %</div>
</div>
<b-progress variant="success" :max="100" striped>
<!-- <b-progress variant="success" :max="100" striped>
<b-progress-bar
:value="100 * metrics.processMetrics['system.cpu.usage']"
:label="formatNumber1(100 * metrics.processMetrics['system.cpu.usage']) + '%'"
>
</b-progress-bar>
</b-progress>
</b-progress> -->
<div class="row" v-if="!updatingMetrics">
<div class="col-md-9">System CPU count</div>
<div class="col-md-3 text-right">{{ metrics.processMetrics['system.cpu.count'] }}</div>
......@@ -126,7 +126,7 @@
GC Live Data Size/GC Max Data Size ({{ formatNumber1(metrics.garbageCollector['jvm.gc.live.data.size'] / 1048576) }}M /
{{ formatNumber1(metrics.garbageCollector['jvm.gc.max.data.size'] / 1048576) }}M)
</span>
<b-progress variant="success" :max="metrics.garbageCollector['jvm.gc.max.data.size']" striped>
<!-- <b-progress variant="success" :max="metrics.garbageCollector['jvm.gc.max.data.size']" striped>
<b-progress-bar
:value="metrics.garbageCollector['jvm.gc.live.data.size']"
:label="
......@@ -136,7 +136,7 @@
"
>
</b-progress-bar>
</b-progress>
</b-progress> -->
</div>
</div>
<div class="col-md-4">
......@@ -145,7 +145,7 @@
GC Memory Promoted/GC Memory Allocated ({{ formatNumber1(metrics.garbageCollector['jvm.gc.memory.promoted'] / 1048576) }}M /
{{ formatNumber1(metrics.garbageCollector['jvm.gc.memory.allocated'] / 1048576) }}M)
</span>
<b-progress variant="success" :max="metrics.garbageCollector['jvm.gc.memory.allocated']" striped>
<!-- <b-progress variant="success" :max="metrics.garbageCollector['jvm.gc.memory.allocated']" striped>
<b-progress-bar
:value="metrics.garbageCollector['jvm.gc.memory.promoted']"
:label="
......@@ -155,7 +155,7 @@
"
>
</b-progress-bar>
</b-progress>
</b-progress> -->
</div>
</div>
<div class="col-md-4">
......@@ -214,9 +214,9 @@
<tr v-for="(entry, key) of metrics['http.server.requests']['percode']" :key="key">
<td>{{ key }}</td>
<td>
<b-progress variant="success" animated :max="metrics['http.server.requests']['all'].count" striped>
<!-- <b-progress variant="success" animated :max="metrics['http.server.requests']['all'].count" striped>
<b-progress-bar :value="entry.count" :label="formatNumber1(entry.count)"></b-progress-bar>
</b-progress>
</b-progress> -->
</td>
<td class="text-right">
{{ formatNumber2(filterNaN(entry.mean)) }}
......@@ -343,10 +343,10 @@
</table>
</div>
<b-modal ref="metricsModal" size="lg">
<!-- <b-modal ref="metricsModal" size="lg">
<h4 slot="modal-title" class="modal-title" id="showMetricsLabel" v-text="$t('metrics.jvm.threads.dump.title')">Threads dump</h4>
<metrics-modal :thread-dump="threadData"></metrics-modal>
</b-modal>
</b-modal> -->
</div>
</template>
......
<template>
<font-awesome-icon :icon="currentOrder === fieldName ? (reverse ? 'sort-down' : 'sort-up') : 'sort'"></font-awesome-icon>
<div></div>
<!-- <font-awesome-icon :icon="currentOrder === fieldName ? (reverse ? 'sort-down' : 'sort-up') : 'sort'"></font-awesome-icon> -->
</template>
<script lang="ts" src="./jhi-sort-indicator.component.ts"></script>
import { Component, Inject, Vue } from 'vue-property-decorator';
import HeaderService from '@/shared/service/header-service';
import ScreenService from '@/entities/screen/screen.service';
import ScreenService from '@/services/screen.service';
import { IScreen, Screen, screenValidate } from '@/shared/model/screen.model';
import { TABS } from '@/shared/service/tabs-constants';
......
......@@ -8,7 +8,6 @@ const localVue = createLocalVue();
config.initVueApp(localVue);
configAdmin.initVueAdmin(localVue);
const i18n = config.initI18N(localVue);
localVue.component('font-awesome-icon', {});
const healthsService = { getBaseName: jest.fn(), getSubSystemName: jest.fn() };
describe('Health Modal Component', () => {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment