import { NotificationService } from '../services/ui/notification.service';
import { ErrorDialogService } from '../services/ui/error-dialog.service';
import { ConfirmDialogService } from './../services/ui/confirm-dialog.service';
-import { Subject } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
import { UiService } from '../services/ui/ui.service';
class PolicyTypeInfo {
- constructor(public type: PolicyType, public isExpanded: boolean) { }
+ constructor(public type: PolicyType) { }
- isExpandedObservers: Subject<boolean> = new Subject<boolean>();
+ isExpanded: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
}
@Component({
styleUrls: ['./policy-control.component.scss'],
animations: [
trigger('detailExpand', [
- state('collapsed', style({ height: '0px', minHeight: '0', visibility: 'hidden' })),
- state('expanded', style({ height: '*', visibility: 'visible' })),
+ state('collapsed, void', style({ height: '0px', minHeight: '0', display: 'none' })),
+ state('expanded', style({ height: '*' })),
transition('expanded <=> collapsed', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)')),
+ transition('expanded <=> void', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)'))
]),
],
})
export class PolicyControlComponent implements OnInit {
+
policyTypesDataSource: PolicyTypeDataSource;
@ViewChild(MatSort, { static: true }) sort: MatSort;
- expandedTypes = new Map<string, PolicyTypeInfo>();
+ policyTypeInfo = new Map<string, PolicyTypeInfo>();
darkMode: boolean;
constructor(
const info: PolicyTypeInfo = this.getPolicyTypeInfo(policyType);
dialogRef.afterClosed().subscribe(
(result: any) => {
- info.isExpandedObservers.next(info.isExpanded);
+ info.isExpanded.next(info.isExpanded.getValue());
}
);
}
toggleListInstances(policyType: PolicyType): void {
+ console.log('1toggleListInstances ' + + policyType.name + ' ' + this.getPolicyTypeInfo(policyType).isExpanded.getValue());
const info = this.getPolicyTypeInfo(policyType);
- info.isExpanded = !info.isExpanded;
- info.isExpandedObservers.next(info.isExpanded);
+ info.isExpanded.next(!info.isExpanded.getValue());
+ console.log('2toggleListInstances ' + + policyType.name + ' ' + this.getPolicyTypeInfo(policyType).isExpanded.getValue());
+
}
getPolicyTypeInfo(policyType: PolicyType): PolicyTypeInfo {
- let info: PolicyTypeInfo = this.expandedTypes.get(policyType.name);
+ let info: PolicyTypeInfo = this.policyTypeInfo.get(policyType.name);
if (!info) {
- info = new PolicyTypeInfo(policyType, false);
- this.expandedTypes.set(policyType.name, info);
+ info = new PolicyTypeInfo(policyType);
+ this.policyTypeInfo.set(policyType.name, info);
}
return info;
}
isInstancesShown(policyType: PolicyType): boolean {
- return this.getPolicyTypeInfo(policyType).isExpanded;
- }
-
- getPolicyTypeName(type: PolicyType): string {
- const schema = JSON.parse(type.create_schema);
- if (schema.title) {
- return schema.title;
- }
- return type.name;
+ return this.getPolicyTypeInfo(policyType).isExpanded.getValue();
}
- getObservable(policyType: PolicyType): Subject<boolean> {
- return this.getPolicyTypeInfo(policyType).isExpandedObservers;
+ getExpandedObserver(policyType: PolicyType): Observable<boolean> {
+ return this.getPolicyTypeInfo(policyType).isExpanded.asObservable();
}
}
* 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.
* limitations under the License.
* ========================LICENSE_END===================================
*/
-import {Injectable} from '@angular/core';
-import {BehaviorSubject} from 'rxjs';
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
@Injectable()
export class UiService {
constructor() {
// TODO: if the user is signed in get the default value from Firebase
- this.darkModeState = new BehaviorSubject<boolean>(false);
+ this.darkModeState = new BehaviorSubject<boolean>(true);
}
}
Code Review / nonrtric.git / commitdiff