diff --git a/package-lock.json b/package-lock.json
index 51b80e6b..334c7207 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12158,6 +12158,11 @@
"inherits": "^2.0.1"
}
},
+ "roboto-fontface": {
+ "version": "0.10.0",
+ "resolved": "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.10.0.tgz",
+ "integrity": "sha512-OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g=="
+ },
"run-async": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
diff --git a/package.json b/package.json
index eb8c3d66..017cf948 100644
--- a/package.json
+++ b/package.json
@@ -68,6 +68,7 @@
"ngx-markdown": "^8.2.1",
"reflect-metadata": "^0.1.12",
"reinstall": "^2.0.0",
+ "roboto-fontface": "^0.10.0",
"rxjs": "^6.5.3",
"ts-md5": "^1.2.7",
"tslib": "^1.10.0",
diff --git a/src/VERSION.ts b/src/VERSION.ts
index d9c15e06..f16c6166 100644
--- a/src/VERSION.ts
+++ b/src/VERSION.ts
@@ -1 +1 @@
-export const VERSION = '7.7.034';
+export const VERSION = '7.8.0';
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 8986ec6d..dd57d9c9 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -12,9 +12,10 @@ import { AppRoutingModule } from '@app/app-routing.module';
import { FilterPipe } from '@app/filter.pipe';
import { SafePipe } from '@app/safe.pipe';
import { HtmlPipe } from '@app/html.pipe';
+import { MomentPipe } from './moment.pipe';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HepicMaterialModule } from '@app/app.material-module';
-
+import {MatIconModule} from '@angular/material/icon';
/* @app/components */
// import * as components from '@app/components';
// import * as widgets from '@app/components/widgets';
@@ -49,6 +50,7 @@ import {
ResultWidgetComponent,
RsearchWidgetComponent,
AlertWidgetComponent,
+ SmartInputWidgetComponent,
SettingClockWidgetComponent,
SettingGeneralIframeWidgetComponent,
SettingIframeWidgetComponent,
@@ -59,7 +61,6 @@ import {
SettingResultWidgetComponent,
SettingsAceEditorWidgetComponent,
SettingAlertWidgetComponent,
-
} from '@app/components/widgets';
@@ -96,7 +97,7 @@ import {
TabLogsComponent,
TabLokiComponent,
TabMessagesComponent,
- TabQosComponent
+ TabQosComponent,
} from '@app/components/search-grid-call';
import { MenuComponent } from '@app/components/menu/menu.component';
@@ -114,6 +115,7 @@ import { MarkdownModule } from 'ngx-markdown';
import { ColorChromeModule } from 'ngx-color/chrome';
import { ColorCircleModule } from 'ngx-color/circle';
+
const DEFAULT_ACE_CONFIG: AceConfigInterface = {
};
@@ -124,7 +126,7 @@ const DEFAULT_ACE_CONFIG: AceConfigInterface = {
FilterPipe,
SafePipe,
HtmlPipe,
-
+ MomentPipe,
/** components */
AlertComponent,
DashboardComponent,
@@ -175,6 +177,7 @@ const DEFAULT_ACE_CONFIG: AceConfigInterface = {
AlertWidgetComponent,
ResultWidgetComponent,
RsearchWidgetComponent,
+ SmartInputWidgetComponent,
SettingClockWidgetComponent,
SettingGeneralIframeWidgetComponent,
SettingIframeWidgetComponent,
@@ -185,7 +188,6 @@ const DEFAULT_ACE_CONFIG: AceConfigInterface = {
SettingResultWidgetComponent,
SettingsAceEditorWidgetComponent,
SettingAlertWidgetComponent,
-
/** dialogs */
DialogAdvancedComponent,
DialogAgentsubComponent,
@@ -219,6 +221,7 @@ const DEFAULT_ACE_CONFIG: AceConfigInterface = {
routing,
AppRoutingModule,
HepicMaterialModule,
+ MatIconModule,
AgGridModule.withComponents([]),
NgxDaterangepickerMd.forRoot(),
NgxJsonViewerModule,
@@ -226,7 +229,7 @@ const DEFAULT_ACE_CONFIG: AceConfigInterface = {
AceEditorModule,
MarkdownModule.forRoot(),
ColorChromeModule,
- ColorCircleModule
+ ColorCircleModule,
],
entryComponents: [
MenuComponent,
@@ -260,6 +263,7 @@ const DEFAULT_ACE_CONFIG: AceConfigInterface = {
ResultWidgetComponent,
RsearchWidgetComponent,
AlertWidgetComponent,
+ SmartInputWidgetComponent,
SettingClockWidgetComponent,
SettingGeneralIframeWidgetComponent,
SettingIframeWidgetComponent,
@@ -270,7 +274,6 @@ const DEFAULT_ACE_CONFIG: AceConfigInterface = {
SettingResultWidgetComponent,
SettingsAceEditorWidgetComponent,
SettingAlertWidgetComponent,
-
/** dashboard */
AddDashboardDialogComponent,
AddDialogComponent,
diff --git a/src/app/components/alert/alert.component.css b/src/app/components/alert/alert.component.scss
similarity index 79%
rename from src/app/components/alert/alert.component.css
rename to src/app/components/alert/alert.component.scss
index 10c25bd6..d3719d8a 100644
--- a/src/app/components/alert/alert.component.css
+++ b/src/app/components/alert/alert.component.scss
@@ -1,4 +1,4 @@
-.alert{
+.alert {
width: 400px;
padding-right: 15px;
padding-left: 70px;
@@ -8,13 +8,19 @@
left: 30px;
color: white;
}
-.alert-danger{
+.alert-danger {
background-color: #F44336;
+ .circle {
+ color: #F44336;
+ }
}
-.alert-success{
+.alert-success {
background-color: #8BC34A;
+ .circle {
+ color: #8BC34A;
+ }
}
-.circle{
+.circle {
display: flex;
justify-content: center;
align-items: center;
@@ -23,7 +29,7 @@
border-radius: 100%;
background-color: white;
}
-.alert-type{
+.alert-type {
display: flex;
justify-content: center;
align-items: center;
@@ -34,13 +40,7 @@
left: 0;
top: 0;
}
-.alert-danger .circle{
- color:#F44336;
-}
-.alert-success .circle{
- color: #8BC34A;
-}
-.close-message{
+.close-message {
font-size: 20px;
height: 20px;
width: 20px;
@@ -48,4 +48,4 @@
right: 5px;
top: 5px;
cursor: pointer;
-}
\ No newline at end of file
+}
diff --git a/src/app/components/alert/alert.component.ts b/src/app/components/alert/alert.component.ts
index f895bfde..48f25947 100644
--- a/src/app/components/alert/alert.component.ts
+++ b/src/app/components/alert/alert.component.ts
@@ -6,7 +6,7 @@ import { AlertService } from '@app/services';
@Component({
selector: 'alert',
templateUrl: 'alert.component.html',
- styleUrls: ['./alert.component.css']
+ styleUrls: ['./alert.component.scss']
})
export class AlertComponent implements OnInit, OnDestroy {
diff --git a/src/app/components/dashboard/add-dashboard-dialog/add-dashboard-dialog.component.css b/src/app/components/dashboard/add-dashboard-dialog/add-dashboard-dialog.component.css
deleted file mode 100644
index 0c329b7d..00000000
--- a/src/app/components/dashboard/add-dashboard-dialog/add-dashboard-dialog.component.css
+++ /dev/null
@@ -1,65 +0,0 @@
-.title {
- margin: -1.5rem -1.5rem 2rem -1.5rem;
- width: initial !important;
- display: flex;
- justify-content: space-between;
-}
-.hr-or {
- width: 100%;
- position: relative;
-}
-.hr-or::before {
- content: "or";
- position: absolute;
- left: 0;
- right: 0;
- margin: auto;
- width: 35px;
- text-align: center;
- top: -12px;
- color: #999;
- background-color: #fff;
- padding: 0 10px;
- border-radius: 50rem;
-}
-
-
-
-.file-upload-container {
- position: relative;
-}
-
-.file-upload-container > .fileselect {
- align-items: center;
- background-color: #eee;
- border-radius: 1rem;
- border-style: dashed;
- color: #999;
- cursor: pointer;
- display: flex;
- height: 150px;
- justify-content: center;
- margin: 0;
- min-width: 200px;
- padding: 1rem;
-}
-
-.file-upload-container > .fileselect::before {
- /* Drop JSON file here */
- content: "Drop JSON file here";
-}
-.file-upload-container > input[type="file"] {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- bottom: 0;
- right: 0;
- cursor: pointer;
- opacity: 0;
-}
-
-.file-upload-container > .fileselect.drugOver {
- background-color: #ccc;
-}
\ No newline at end of file
diff --git a/src/app/components/dashboard/add-dashboard-dialog/add-dashboard-dialog.component.scss b/src/app/components/dashboard/add-dashboard-dialog/add-dashboard-dialog.component.scss
new file mode 100644
index 00000000..9aeb8226
--- /dev/null
+++ b/src/app/components/dashboard/add-dashboard-dialog/add-dashboard-dialog.component.scss
@@ -0,0 +1,58 @@
+.title {
+ margin: -1.5rem -1.5rem 2rem -1.5rem;
+ width: initial !important;
+ display: flex;
+ justify-content: space-between;
+}
+.hr-or {
+ width: 100%;
+ position: relative;
+ &::before {
+ content: "or";
+ position: absolute;
+ left: 0;
+ right: 0;
+ margin: auto;
+ width: 35px;
+ text-align: center;
+ top: -12px;
+ color: #999;
+ background-color: #fff;
+ padding: 0 10px;
+ border-radius: 50rem;
+ }
+}
+.file-upload-container {
+ position: relative;
+ & > .fileselect {
+ align-items: center;
+ background-color: #eee;
+ border-radius: 1rem;
+ border-style: dashed;
+ color: #999;
+ cursor: pointer;
+ display: flex;
+ height: 150px;
+ justify-content: center;
+ margin: 0;
+ min-width: 200px;
+ padding: 1rem;
+ &::before {
+ content: "Drop JSON file here";
+ }
+ &.drugOver {
+ background-color: #ccc;
+ }
+ }
+ & > input[type="file"] {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ bottom: 0;
+ right: 0;
+ cursor: pointer;
+ opacity: 0;
+ }
+}
diff --git a/src/app/components/dashboard/add-dashboard-dialog/add-dashboard-dialog.component.ts b/src/app/components/dashboard/add-dashboard-dialog/add-dashboard-dialog.component.ts
index 377d936b..d474ec9c 100644
--- a/src/app/components/dashboard/add-dashboard-dialog/add-dashboard-dialog.component.ts
+++ b/src/app/components/dashboard/add-dashboard-dialog/add-dashboard-dialog.component.ts
@@ -5,7 +5,7 @@ import { DashboardService } from '@app/services';
@Component({
selector: 'app-add-dashboard-dialog',
templateUrl: './add-dashboard-dialog.component.html',
- styleUrls: ['./add-dashboard-dialog.component.css']
+ styleUrls: ['./add-dashboard-dialog.component.scss']
})
export class AddDashboardDialogComponent implements OnInit, AfterViewInit, OnDestroy {
@ViewChild('fileSelect', {static: true}) fileSelect;
diff --git a/src/app/components/dashboard/add-dialog/add-dialog.component.css b/src/app/components/dashboard/add-dialog/add-dialog.component.scss
similarity index 100%
rename from src/app/components/dashboard/add-dialog/add-dialog.component.css
rename to src/app/components/dashboard/add-dialog/add-dialog.component.scss
diff --git a/src/app/components/dashboard/add-dialog/add-dialog.component.ts b/src/app/components/dashboard/add-dialog/add-dialog.component.ts
index 8dbd38ac..4523c1d9 100644
--- a/src/app/components/dashboard/add-dialog/add-dialog.component.ts
+++ b/src/app/components/dashboard/add-dialog/add-dialog.component.ts
@@ -6,7 +6,7 @@ import { PreferenceAdvancedService } from '@app/services';
@Component({
selector: 'app-add-dialog',
templateUrl: './add-dialog.component.html',
- styleUrls: ['./add-dialog.component.css']
+ styleUrls: ['./add-dialog.component.scss']
})
export class AddDialogComponent {
widgets = {};
diff --git a/src/app/components/dashboard/dashboard.component.css b/src/app/components/dashboard/dashboard.component.css
deleted file mode 100644
index 774f80eb..00000000
--- a/src/app/components/dashboard/dashboard.component.css
+++ /dev/null
@@ -1,57 +0,0 @@
-.widget-block {
- position: relative;
- padding: 0.5rem;
- height: calc(100% - 2rem);
-}
-.top-tool {
- display: flex;
- align-items: center;
- justify-content: space-between;
- box-shadow: 0px 3px 4px rgba(0,0,0,0.2);
- z-index: 12;
- position: relative;
-}
-.top-tool > h3 {
- margin: 0 0.5rem;
-}
-iframe {
- width: 100%;
- height: calc(100vh - 85px);
- border: 0;
-}
-.shadow-polygon {
- position: absolute;
- top: 0;
- left: 0;
- bottom: 0;
- right: 0;
- background-color: rgba(255,255,255,0.1);
- z-index: 2;
-}
-.widget-item >
-.box-header.drag-handler >
-.box-header-btns.pull-right >
-.box-icon-header {
- opacity: 0;
- transition: opacity 0.3s;
-}
-.widget-item:hover >
-.box-header.drag-handler >
-.box-header-btns.pull-right >
-.box-icon-header {
- opacity: 1;
-}
-
-
-.no-content {
- position: absolute;
- display: flex;
- justify-content: center;
- align-items: center;
- color: rgba(0,0,0,0.2);
- z-index: 4;
- top: 6rem;
- left: 0;
- right: 0;
- bottom: 0;
-}
\ No newline at end of file
diff --git a/src/app/components/dashboard/dashboard.component.html b/src/app/components/dashboard/dashboard.component.html
index 2708eaea..dd28cf58 100644
--- a/src/app/components/dashboard/dashboard.component.html
+++ b/src/app/components/dashboard/dashboard.component.html
@@ -6,42 +6,51 @@
{{ dashboardTitle | uppercase }}
-
-
-
-
-
-
-
-
-
- {{ item.config ? item.config.title: item.title || item.id }}
-
- LOKI Search
-
-