Browse Source

Address UI PR review comments for OR key filter conditions

- Default allowKeyFiltersOrConditions to true in empty auth state
- Remove empty filter-dialog.component.scss and its styleUrls reference
pull/15286/head
Vladyslav_Prykhodko 6 months ago
parent
commit
99907d8f7f
  1. 2
      ui-ngx/src/app/core/auth/auth.reducer.ts
  2. 17
      ui-ngx/src/app/modules/home/components/filter/filter-dialog.component.scss
  3. 1
      ui-ngx/src/app/modules/home/components/filter/filter-dialog.component.ts

2
ui-ngx/src/app/core/auth/auth.reducer.ts

@ -43,7 +43,7 @@ const emptyUserAuthState: AuthPayload = {
intermediateAggregationIntervalInSecForCF: 0, intermediateAggregationIntervalInSecForCF: 0,
userSettings: initialUserSettings, userSettings: initialUserSettings,
trendzSettings: initialTrendzSettings, trendzSettings: initialTrendzSettings,
allowKeyFiltersOrConditions: false allowKeyFiltersOrConditions: true
}; };
export const initialState: AuthState = { export const initialState: AuthState = {

17
ui-ngx/src/app/modules/home/components/filter/filter-dialog.component.scss

@ -1,17 +0,0 @@
/**
* Copyright © 2016-2026 The Thingsboard Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
:host {
}

1
ui-ngx/src/app/modules/home/components/filter/filter-dialog.component.ts

@ -41,7 +41,6 @@ export interface FilterDialogData {
@Component({ @Component({
selector: 'tb-filter-dialog', selector: 'tb-filter-dialog',
templateUrl: './filter-dialog.component.html', templateUrl: './filter-dialog.component.html',
styleUrls: ['./filter-dialog.component.scss'],
standalone: false standalone: false
}) })
export class FilterDialogComponent extends DialogComponent<FilterDialogComponent, Filter> { export class FilterDialogComponent extends DialogComponent<FilterDialogComponent, Filter> {

Loading…
Cancel
Save