-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ this.grid[i].componentConfigs.title}} -
- {{ word(item.component)}}
-
-
-
-
-
-
-
-
-
- {{ icon(item.component) }}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ this.grid[i].componentConfigs.title }} -
+ {{ word(item.component) }}
+
+
+
+
-
+
+
+ {{ icon(item.component) }}
-
-
+
+
+
+
+
diff --git a/frontend/src/app/admin/design/components/structure/structure.component.scss b/frontend/src/app/admin/design/components/structure/structure.component.scss
index afca4b63..16725126 100644
--- a/frontend/src/app/admin/design/components/structure/structure.component.scss
+++ b/frontend/src/app/admin/design/components/structure/structure.component.scss
@@ -1,16 +1,16 @@
-mat-card-content > div{
- text-align: center;
+mat-card-content > div {
+ text-align: center;
}
-mat-card-title{
- width: 100%;
- text-align: left;
+mat-card-title {
+ width: 100%;
+ text-align: left;
}
-mat-card-content{
- mat-icon{
- font-size: 80px;
- height: 80px;
- width: 80px;
- }
+mat-card-content {
+ mat-icon {
+ font-size: 80px;
+ height: 80px;
+ width: 80px;
+ }
}
diff --git a/frontend/src/app/admin/design/components/structure/structure.component.ts b/frontend/src/app/admin/design/components/structure/structure.component.ts
index 5ed0a8a4..041917b3 100644
--- a/frontend/src/app/admin/design/components/structure/structure.component.ts
+++ b/frontend/src/app/admin/design/components/structure/structure.component.ts
@@ -129,15 +129,6 @@ export class StructureComponent implements OnInit {
},
],
];
-
- if (value === 'PieComponent') {
- this.form_data.push({
- name: 'inner_size',
- label: 'Inner size',
- type: 'number',
- required: true,
- });
- }
break;
case 'MainListComponent':
@@ -219,6 +210,66 @@ export class StructureComponent implements OnInit {
];
break;
}
+
+ if (value === 'PieComponent') {
+ this.form_data.push({
+ name: 'inner_size',
+ label: 'Inner size',
+ type: 'number',
+ required: true,
+ });
+ this.form_data.push({
+ name: 'data_labels',
+ label: 'Show data labels',
+ type: 'checkbox',
+ required: false,
+ });
+ this.form_data.push({
+ name: 'data_labels_count',
+ label: 'Show data labels count',
+ type: 'checkbox',
+ required: false,
+ });
+ this.form_data.push({
+ name: 'data_labels_percentage',
+ label: 'Show data labels percentage',
+ type: 'checkbox',
+ required: false,
+ });
+ } else if (value === 'MapComponent') {
+ this.form_data.push({
+ name: 'data_labels',
+ label: 'Show data labels',
+ type: 'checkbox',
+ required: false,
+ });
+ this.form_data.push({
+ name: 'data_labels_count',
+ label: 'Show data labels count',
+ type: 'checkbox',
+ required: false,
+ });
+ } else if (value === 'BarComponent') {
+ this.form_data.push({
+ name: 'data_labels_count',
+ label: 'Show data labels count',
+ type: 'checkbox',
+ required: false,
+ });
+ } else if (value === 'ListComponent') {
+ this.form_data.push({
+ name: 'hide_total',
+ label: 'Hide total',
+ type: 'checkbox',
+ required: false,
+ });
+ this.form_data.push({
+ name: 'hide_percentage',
+ label: 'Hide percentage',
+ type: 'checkbox',
+ required: false,
+ });
+ }
}
constructor(
public dialog: MatDialog,
diff --git a/frontend/src/app/admin/design/design.component.html b/frontend/src/app/admin/design/design.component.html
index 6b043e56..c69d7d71 100644
--- a/frontend/src/app/admin/design/design.component.html
+++ b/frontend/src/app/admin/design/design.component.html
@@ -1,110 +1,186 @@
-
+
+
+
+
+
+
+
Default operator within filters
+
+ Default operator within filters
+
+ Follow the selected operator
+ Always use OR
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
Predefined filters
+
+ Predefined filters
+
+
+
+
+
diff --git a/frontend/src/app/admin/design/design.component.ts b/frontend/src/app/admin/design/design.component.ts
index 4e2b5e8f..1eebb586 100644
--- a/frontend/src/app/admin/design/design.component.ts
+++ b/frontend/src/app/admin/design/design.component.ts
@@ -36,6 +36,7 @@ export class DesignComponent implements OnInit {
dashboard: Array
= [];
dashboard_name: string;
exportLink: string;
+ defaultWithinFiltersOperator: any = null;
predefinedFilters: any = null;
predefinedFiltersExample = JSON.stringify([
{ terms: { FIELD_NAME: ['VALUE'] } },
@@ -82,8 +83,15 @@ export class DesignComponent implements OnInit {
await this.spinner.show();
const dashboard_name = (this.dashboard_name =
this.activeRoute.snapshot.paramMap.get('dashboard_name'));
- const { counters, filters, dashboard, footer, predefinedFilters, welcome } =
- await this.settingsService.readExplorerSettings(dashboard_name);
+ const {
+ counters,
+ filters,
+ dashboard,
+ footer,
+ predefinedFilters,
+ defaultWithinFiltersOperator,
+ welcome,
+ } = await this.settingsService.readExplorerSettings(dashboard_name);
if (welcome.componentConfigs && welcome.componentConfigs.text)
this.welcome_text = welcome.componentConfigs.text;
if (!this.welcome)
@@ -101,7 +109,10 @@ export class DesignComponent implements OnInit {
this.filters = filters;
this.dashboard = dashboard;
this.footer = footer;
- this.predefinedFilters = JSON.stringify(predefinedFilters);
+ this.defaultWithinFiltersOperator = defaultWithinFiltersOperator;
+ this.predefinedFilters = predefinedFilters
+ ? JSON.stringify(predefinedFilters)
+ : '';
this.welcome = welcome;
this.exportLink =
'data:text/json;charset=UTF-8,' +
@@ -112,6 +123,7 @@ export class DesignComponent implements OnInit {
filters: this.filters,
dashboard: this.dashboard,
footer: this.footer,
+ defaultWithinFiltersOperator: defaultWithinFiltersOperator,
predefinedFilters: predefinedFilters,
}),
);
@@ -119,8 +131,15 @@ export class DesignComponent implements OnInit {
}
populateForm(settings) {
- const { counters, filters, dashboard, footer, predefinedFilters, welcome } =
- settings;
+ const {
+ counters,
+ filters,
+ dashboard,
+ footer,
+ predefinedFilters,
+ defaultWithinFiltersOperator,
+ welcome,
+ } = settings;
if (welcome.componentConfigs && welcome.componentConfigs.text)
this.welcome_text = welcome.componentConfigs.text;
if (!this.welcome)
@@ -138,7 +157,10 @@ export class DesignComponent implements OnInit {
this.filters = filters;
this.dashboard = dashboard;
this.footer = footer;
- this.predefinedFilters = JSON.stringify(predefinedFilters);
+ this.defaultWithinFiltersOperator = defaultWithinFiltersOperator;
+ this.predefinedFilters = predefinedFilters
+ ? JSON.stringify(predefinedFilters)
+ : '';
this.welcome = welcome;
this.exportLink =
'data:text/json;charset=UTF-8,' +
@@ -149,6 +171,7 @@ export class DesignComponent implements OnInit {
filters: this.filters,
dashboard: this.dashboard,
footer: this.footer,
+ defaultWithinFiltersOperator: defaultWithinFiltersOperator,
predefinedFilters: predefinedFilters,
}),
);
@@ -280,6 +303,7 @@ export class DesignComponent implements OnInit {
filters: this.filters,
dashboard: this.dashboard,
footer: this.footer,
+ defaultWithinFiltersOperator: this.defaultWithinFiltersOperator,
predefinedFilters: predefinedFilters,
};
await this.settingsService.saveExplorerSettings(dashboard_name, data);
@@ -311,6 +335,18 @@ export class DesignComponent implements OnInit {
if (obj.inner_size) temp['inner_size'] = obj.inner_size;
+ if (obj.data_labels) temp['data_labels'] = obj.data_labels;
+
+ if (obj.data_labels_count)
+ temp['data_labels_count'] = obj.data_labels_count;
+
+ if (obj.data_labels_percentage)
+ temp['data_labels_percentage'] = obj.data_labels_percentage;
+
+ if (obj.hide_total) temp['hide_total'] = obj.hide_total;
+
+ if (obj.hide_percentage) temp['hide_percentage'] = obj.hide_percentage;
+
if (obj.source_x && obj.source_y) {
temp['source'] = [obj.source_x, obj.source_y + '.keyword'];
temp['source_y'] = obj.source_y;
@@ -427,6 +463,7 @@ export class DesignComponent implements OnInit {
filters: importedItem?.filters,
dashboard: importedItem?.dashboard,
footer: importedItem?.footer,
+ defaultWithinFiltersOperator: importedItem?.defaultWithinFiltersOperator,
predefinedFilters: importedItem?.predefinedFilters,
welcome: importedItem?.welcome,
};
diff --git a/frontend/src/app/admin/indexes-dashboard/form/form.component.html b/frontend/src/app/admin/indexes-dashboard/form/form.component.html
index aad99d2c..6c0f64ea 100644
--- a/frontend/src/app/admin/indexes-dashboard/form/form.component.html
+++ b/frontend/src/app/admin/indexes-dashboard/form/form.component.html
@@ -1,37 +1,74 @@
{{ data.event }} Dashboard
-
diff --git a/frontend/src/app/admin/indexes-dashboard/form/form.component.scss b/frontend/src/app/admin/indexes-dashboard/form/form.component.scss
index 16f8d011..b4b4e04e 100644
--- a/frontend/src/app/admin/indexes-dashboard/form/form.component.scss
+++ b/frontend/src/app/admin/indexes-dashboard/form/form.component.scss
@@ -1,7 +1,7 @@
.w-100 {
- width: 100% !important;
+ width: 100% !important;
}
::ng-deep .mat-mdc-form-field-appearance-fill .mat-mdc-form-field-flex {
- background-color: unset;
- padding: 0;
+ background-color: unset;
+ padding: 0;
}
diff --git a/frontend/src/app/admin/indexes-dashboard/indexes-dashboard.component.html b/frontend/src/app/admin/indexes-dashboard/indexes-dashboard.component.html
index 7905e778..bb4e898f 100644
--- a/frontend/src/app/admin/indexes-dashboard/indexes-dashboard.component.html
+++ b/frontend/src/app/admin/indexes-dashboard/indexes-dashboard.component.html
@@ -3,17 +3,43 @@
Dashboards
-
+
Export
- cloud_download
+ cloud_download
-
-
diff --git a/frontend/src/app/admin/indexes-dashboard/indexes-dashboard.component.scss b/frontend/src/app/admin/indexes-dashboard/indexes-dashboard.component.scss
index 983420b3..c3a4c456 100644
--- a/frontend/src/app/admin/indexes-dashboard/indexes-dashboard.component.scss
+++ b/frontend/src/app/admin/indexes-dashboard/indexes-dashboard.component.scss
@@ -8,7 +8,7 @@
}
.dashboard-default-icon.is_default {
- color: #51A351;
+ color: #51a351;
}
.dashboard-default-icon:hover {
color: #5090d0;
diff --git a/frontend/src/app/admin/indexes/form/form.component.html b/frontend/src/app/admin/indexes/form/form.component.html
index 37c584a9..4b325d64 100644
--- a/frontend/src/app/admin/indexes/form/form.component.html
+++ b/frontend/src/app/admin/indexes/form/form.component.html
@@ -2,80 +2,131 @@
{{ data.event }} Index
diff --git a/frontend/src/app/admin/indexes/form/form.component.scss b/frontend/src/app/admin/indexes/form/form.component.scss
index a1dc0642..b6b7b999 100644
--- a/frontend/src/app/admin/indexes/form/form.component.scss
+++ b/frontend/src/app/admin/indexes/form/form.component.scss
@@ -1,8 +1,8 @@
.w-100 {
- width: 100% !important;
+ width: 100% !important;
}
.border {
- border: 1px solid #f00;
+ border: 1px solid #f00;
}
.interval-settings {
@@ -11,5 +11,5 @@
}
.interval-settings mat-form-field:not(:first-child) {
- padding-left: .5rem;
+ padding-left: 0.5rem;
}
diff --git a/frontend/src/app/admin/indexes/indexes.component.html b/frontend/src/app/admin/indexes/indexes.component.html
index b2d4a4ec..205a9111 100644
--- a/frontend/src/app/admin/indexes/indexes.component.html
+++ b/frontend/src/app/admin/indexes/indexes.component.html
@@ -3,17 +3,43 @@
Indexes
-
- Export
- cloud_download
+
+ Export
+ cloud_download
-
-