diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index 02a7f9834..1b047960d 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -59,7 +59,7 @@ export class AppComponent { public isSaas = (environment as any).saas; userActivity; userInactive: Subject = new Subject(); - currentFeatureNotificationId: string = 'full-white-label'; + currentFeatureNotificationId: string = 'saved-filters'; isFeatureNotificationShown: boolean = false; userLoggedIn = null; diff --git a/frontend/src/app/components/dashboard/db-table-view/saved-filters-panel/saved-filters-dialog/saved-filters-dialog.component.css b/frontend/src/app/components/dashboard/db-table-view/saved-filters-panel/saved-filters-dialog/saved-filters-dialog.component.css index bd1f7c870..a27ec9c1e 100644 --- a/frontend/src/app/components/dashboard/db-table-view/saved-filters-panel/saved-filters-dialog/saved-filters-dialog.component.css +++ b/frontend/src/app/components/dashboard/db-table-view/saved-filters-panel/saved-filters-dialog/saved-filters-dialog.component.css @@ -1,16 +1,10 @@ -.filters-header { - display: flex; - align-items: center; - justify-content: space-between; - margin-top: 16px; -} - .filters-content { display: grid; grid-template-columns: auto 228px 0 1fr 160px 32px; grid-column-gap: 8px; align-content: flex-start; align-items: flex-start; + padding-top: 4px !important; } .filters-select { diff --git a/frontend/src/app/components/dashboard/db-table-view/saved-filters-panel/saved-filters-dialog/saved-filters-dialog.component.html b/frontend/src/app/components/dashboard/db-table-view/saved-filters-panel/saved-filters-dialog/saved-filters-dialog.component.html index f44bab341..f6e373290 100644 --- a/frontend/src/app/components/dashboard/db-table-view/saved-filters-panel/saved-filters-dialog/saved-filters-dialog.component.html +++ b/frontend/src/app/components/dashboard/db-table-view/saved-filters-panel/saved-filters-dialog/saved-filters-dialog.component.html @@ -1,32 +1,29 @@

- Save Filters for {{ data.displayTableName }} table - - settings - + New Fast Filter for {{ data.displayTableName }}

- Filter Name + Fast Filter name - Filter name is required + Fast filter name is required -

Define Filters and Dynamic Column

-

Select filters to apply and optionally mark one column as dynamic

+

Conditions & Main column

+

+ Select which conditions to add and choose a Main column. Main columns remain editable, while conditions are set. +

- Add filter by... + Click here to add condition @@ -144,7 +141,7 @@

Define Filters and Dynamic Column

- Dynamic column + Main column diff --git a/frontend/src/assets/feture-images/saved-filters.gif b/frontend/src/assets/feture-images/saved-filters.gif new file mode 100644 index 000000000..a71ef377f Binary files /dev/null and b/frontend/src/assets/feture-images/saved-filters.gif differ