Merge pull request #642 from sipcapture/devel

Update version
sipcapture · Jul 22, 2024 · 3b02833 · 3b02833
2 parents e2e053d + 7246b75
commit 3b02833
Showing 1 changed file with 33 additions and 6 deletions.
diff --git a/src/app/components/controls/transaction-filter/transaction-filter.component.ts b/src/app/components/controls/transaction-filter/transaction-filter.component.ts
@@ -12,7 +12,8 @@ import { FlowItemType } from '@app/models/flow-item-type.model';
 import { Functions, setStorage } from '@app/helpers/functions';
 import { TransactionFilterService } from './transaction-filter.service';
 import { CallIDColor } from '@app/models/CallIDColor.model';
-import { AlertMessage, AlertService } from '@app/services';
+import { AlertMessage, AlertService, PreferenceAdvancedService } from '@app/services';
+import { lastValueFrom } from 'rxjs';
 
 interface FilterItem {
     title: string;
@@ -33,8 +34,10 @@ export interface FlowFilter {
     templateUrl: './transaction-filter.component.html',
     styleUrls: ['./transaction-filter.component.scss'],
 })
-export class TransactionFilterComponent {
+export class TransactionFilterComponent implements OnInit {
     flowFilters;
+    isAdvancedDefaultFilter = false;
+    filterSettings: any = {};
 
     isSimplify = true;
     isSimplifyPort = true;
@@ -119,18 +122,23 @@ export class TransactionFilterComponent {
         /**
          * PayloadType
          */
+
         this.checkboxListFilterPayloadType = Object.entries(filters.payload)
             .filter((i) => i[1])
             .map((record) => {
                 const [typeName] = record;
                 return {
                     title: typeName,
                     selected:
-                        this.getPayloadFromLocalStorage(typeName) ||
-                        (typeName !== FlowItemType.RTCP && typeName !== FlowItemType.RTP),
+                        this.isAdvancedDefaultFilter ?
+                            this.getPayloadFromAdvancedSettings(typeName) :
+                            (this.getPayloadFromLocalStorage(typeName) || (
+                                typeName !== FlowItemType.RTCP &&
+                                typeName !== FlowItemType.RTP
+                            )),
                 };
             });
-
+        console.log('checkboxListFilterPayloadType', this.checkboxListFilterPayloadType);
         /**
          * Call-ID
          */
@@ -169,10 +177,24 @@ export class TransactionFilterComponent {
     @ViewChild('filterContainer', { static: false }) filterContainer: ElementRef;
     constructor(
         private cdr: ChangeDetectorRef,
+        private _pas: PreferenceAdvancedService,
         private transactionFilterService: TransactionFilterService,
         private alertService: AlertService
     ) { }
+    async ngOnInit() {
+        const advanced = await lastValueFrom(this._pas.getAll());
+        const filterSettings = advanced?.data?.find(i =>
+            i.category == 'transaction' &&
+            i.param == "filter"
+        )?.data;
 
+        this.isAdvancedDefaultFilter = !!filterSettings;
+        this.filterSettings = filterSettings;
+        console.log({
+            filterSettings
+
+        });
+    }
     doFilterMessages(type: string = null) {
         setTimeout(() => {
             if (this.combineType === '1none') {
@@ -199,7 +221,7 @@ export class TransactionFilterComponent {
                 });
                 this.cdr.detectChanges();
             }
-            console.log(this.checkboxListFilterPayloadType)
+            console.log('this.checkboxListFilterPayloadType', this.checkboxListFilterPayloadType);
             if (
                 this.checkboxListFilterPayloadType.every(
                     (type) => type.selected === false
@@ -267,6 +289,11 @@ export class TransactionFilterComponent {
         });
         localStorage.removeItem(ConstValue.LOCAL_FILTER_STATE);
     }
+    getPayloadFromAdvancedSettings(type: string = 'RTP'): boolean {
+
+        return !!this.filterSettings[type];
+
+    }
     getPayloadFromLocalStorage(type: string = 'RTP') {
         const defaultReturn =
             type === FlowItemType.SIP || type === FlowItemType.SDP;