fix(containers): Filtered Rows and Columns in variables list (#26196)

* Filtered Rows and Columns in variables list * Added enum to FilteredTypes, added test case on FilteredTypes
dotCMS · Sep 25, 2023 · 7357e72 · 7357e72
1 parent 71ad1f3
commit 7357e72
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/...t-container-create/dot-container-code/dot-add-variable/dot-add-variable.component.spec.ts b/...t-container-create/dot-container-code/dot-add-variable/dot-add-variable.component.spec.ts
@@ -51,6 +51,7 @@ import {
 import { DotRouterService } from '@services/dot-router/dot-router.service';
 
 import { DotAddVariableComponent } from './dot-add-variable.component';
+import { FilteredFieldTypes } from './dot-add-variable.models';
 
 @Component({
     selector: 'dot-form-dialog',
@@ -252,5 +253,14 @@ describe('DotAddVariableComponent', () => {
             );
             expect(dialogRef.close).toHaveBeenCalled();
         });
+
+        it('should be a variable list without FielteredTypes', () => {
+            const fieldTypes = fixture.nativeElement.querySelectorAll('small');
+            fieldTypes.forEach((field) => {
+                const content = field.textContent.trim();
+                expect(content).not.toEqual(FilteredFieldTypes.Column);
+                expect(content).not.toEqual(FilteredFieldTypes.Row);
+            });
+        });
     });
 });
diff --git a/...rs/dot-container-create/dot-container-code/dot-add-variable/dot-add-variable.component.ts b/...rs/dot-container-create/dot-container-code/dot-add-variable/dot-add-variable.component.ts
@@ -2,16 +2,30 @@ import { Component, OnInit } from '@angular/core';
 
 import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
 
+import { map } from 'rxjs/operators';
+
 import { DotAddVariableStore } from '@dotcms/app/portlets/dot-containers/dot-container-create/dot-container-code/dot-add-variable/store/dot-add-variable.store';
 
+import { FilteredFieldTypes } from './dot-add-variable.models';
+
 @Component({
     selector: 'dot-add-variable',
     templateUrl: './dot-add-variable.component.html',
     styleUrls: ['./dot-add-variable.component.scss'],
     providers: [DotAddVariableStore]
 })
 export class DotAddVariableComponent implements OnInit {
-    vm$ = this.store.vm$;
+    vm$ = this.store.vm$.pipe(
+        map((res) => {
+            const variables = res.variables.filter(
+                (variable) =>
+                    variable.fieldType !== FilteredFieldTypes.Column &&
+                    variable.fieldType !== FilteredFieldTypes.Row
+            );
+
+            return { variables };
+        })
+    );
 
     constructor(
         private store: DotAddVariableStore,

diff --git a/...iners/dot-container-create/dot-container-code/dot-add-variable/dot-add-variable.models.ts b/...iners/dot-container-create/dot-container-code/dot-add-variable/dot-add-variable.models.ts
@@ -0,0 +1,4 @@
+export enum FilteredFieldTypes {
+    Column = 'Column',
+    Row = 'Row'
+}