Merge branch 'devel'

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",

src/VERSION.ts

@@ -1 +1 @@
-export const VERSION = '7.7.034';
+export const VERSION = '7.8.0';

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,14 +221,15 @@ const DEFAULT_ACE_CONFIG: AceConfigInterface = {
         routing,
         AppRoutingModule,
         HepicMaterialModule,
+        MatIconModule,
         AgGridModule.withComponents([]),
         NgxDaterangepickerMd.forRoot(),
         NgxJsonViewerModule,
         AceModule,
         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,

src/app/components/alert/alert.component.css → 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,18 +40,12 @@
 	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;
 	position: absolute;
 	right: 5px;
 	top: 5px;
 	cursor: pointer;
-}
+}

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 {

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;
+	}
+}

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;

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 = {};