diff --git a/cypress/e2e/datasets/datasets-general.cy.js b/cypress/e2e/datasets/datasets-general.cy.js index 49dd5e485..7d20517ce 100644 --- a/cypress/e2e/datasets/datasets-general.cy.js +++ b/cypress/e2e/datasets/datasets-general.cy.js @@ -478,7 +478,6 @@ describe("Datasets general", () => { cy.contains("Type").should("exist"); cy.contains("Location").should("not.exist"); - cy.contains("Keyword").should("not.exist"); }); }); @@ -651,7 +650,7 @@ describe("Datasets general", () => { cy.visit("/datasets"); - cy.wait("@getConfig", { timeout: 10000 }); + cy.wait("@getConfig", { timeout: 20000 }); cy.finishedLoading(); }); diff --git a/package-lock.json b/package-lock.json index f8acbef5a..0d3a7305d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -550,7 +550,6 @@ "integrity": "sha512-pQiOg+se1AU/ncMlnJ9V6xYnMQ84qI1BGWuJpbU6A99VTXJg90scg0+T7DWmKssR1YjP5qmmBtrZfKsHEcLW/A==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@angular-eslint/bundled-angular-compiler": "19.8.1", "eslint-scope": "^8.0.2" @@ -580,7 +579,6 @@ "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-19.2.17.tgz", "integrity": "sha512-6VTet2fzTpSHEjxcVVzL8ZIyNGo/qsUs4XF/3wh9Iwu6qfWx711qXKlqGD/IHWzMTumzvQXbTV4hzvnO7fJvIQ==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -597,7 +595,6 @@ "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-19.2.19.tgz", "integrity": "sha512-PCpJagurPBqciqcq4Z8+3OtKLb7rSl4w/qBJoIMua8CgnrjvA1i+SWawhdtfI1zlY8FSwhzLwXV0CmWWfFzQPg==", "license": "MIT", - "peer": true, "dependencies": { "parse5": "^7.1.2", "tslib": "^2.3.0" @@ -647,7 +644,6 @@ "resolved": "https://registry.npmjs.org/@angular/common/-/common-19.2.17.tgz", "integrity": "sha512-yFUXAdpvOFirGD/EGDwp1WHravHzI4sdyRE2iH7i8im9l8IE2VZ6D1KDJp8VVpMJt38LNlRAWYek3s+z6OcAkg==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -664,7 +660,6 @@ "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-19.2.17.tgz", "integrity": "sha512-qo8psYASAlDiQ8fAL8i/E2JfWH2nPTpZDKKZxSWvgBVA8o+zUEjYAJu6/k6btnu+4Qcb425T0rmM/zao6EU9Aw==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -678,7 +673,6 @@ "integrity": "sha512-KG82fh2A0odttc6+FxlQmFfHY/Giq8rYeV1qtdafafJ8hdWIiMr4r37xwhZOl8uk2/XSLM66bxUMFHYm+zt87Q==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/core": "7.26.9", "@jridgewell/sourcemap-codec": "^1.4.14", @@ -755,7 +749,6 @@ "resolved": "https://registry.npmjs.org/@angular/core/-/core-19.2.17.tgz", "integrity": "sha512-nVu0ryxfiXUZ9M+NV21TY+rJZkPXTYo9U0aJb19hvByPpG+EvuujXUOgpulz6vxIzGy7pz/znRa+K9kxuuC+yQ==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -772,7 +765,6 @@ "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-19.2.17.tgz", "integrity": "sha512-INgGGmMbwXuT+niAjMiCsJrZVEGWKZOep1vCRHoKlVnGUQSRKc3UW8ztmKDKMua/io/Opi03pRMpwbYQcTBr5A==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -791,7 +783,6 @@ "resolved": "https://registry.npmjs.org/@angular/material/-/material-19.2.19.tgz", "integrity": "sha512-auIE6JUzTIA3LyYklh9J/T7u64crmphxUBgAa0zcOMDog6SYfwbNe9YeLQqua5ek4OUAOdK/BHHfVl5W5iaUoQ==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -823,7 +814,6 @@ "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-19.2.17.tgz", "integrity": "sha512-Rn23nIQwYMSeGXWFHI/X8bGHAkdahRxH9UIGUlJKxW61MSkK6AW4kCHG/Ev1TvDq9HjijsMjcqcsd6/Sb8aBXg==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -864,7 +854,6 @@ "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-19.2.17.tgz", "integrity": "sha512-H9inMbtRXAh1BRg7bdhLG6HoQp2JbwUGs/ajS/8pUB74wG++73SvX4acjwwmQhb+sUdHv5AV5m6wYKJ92BiqmQ==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0", "xhr2": "^0.2.0" @@ -885,7 +874,6 @@ "resolved": "https://registry.npmjs.org/@angular/router/-/router-19.2.17.tgz", "integrity": "sha512-B3Vk+E8UHQwg06WEjGuvYaKNiIXxjHN9pN8S+hDE8xwRgIS5ojEwS94blEvsGQ4QsIja6WjZMOfDUBUPlgUSuA==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -904,7 +892,6 @@ "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-19.2.17.tgz", "integrity": "sha512-rwki6a0PBm4biGG+BnnHiALPfAnTUqebjyA5fRCJ+cbh4nYvJZ2nU9GyHc56WwgfhwXWDo3UOxB+8K0INTv2RA==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.3.0" }, @@ -950,7 +937,6 @@ "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.26.2", @@ -3977,7 +3963,6 @@ "integrity": "sha512-G1ytyOoHh5BphmEBxSwALin3n1KGNYB6yImbICcRQdzXfOGbuJ9Jske/Of5Sebk339NSGGNfUshnzK8YWkTPsQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@inquirer/checkbox": "^4.1.2", "@inquirer/confirm": "^5.1.6", @@ -4273,7 +4258,6 @@ "resolved": "https://registry.npmjs.org/@jsonforms/angular/-/angular-3.7.0.tgz", "integrity": "sha512-Pa4Wo6IXKJ8dnoLkD7vdZi03Lc4Lt2mD0NGL2I8s9ozc6y1/39eYH2JECLIUlL4i6wc1sU6TmMDD2nfmsc7vrQ==", "license": "MIT", - "peer": true, "dependencies": { "lodash": "^4.17.21" }, @@ -4313,7 +4297,6 @@ "resolved": "https://registry.npmjs.org/@jsonforms/core/-/core-3.7.0.tgz", "integrity": "sha512-CE9viWtwi9QWLqlWLeOul1/R1GRAyOA9y6OoUpsCc0FhyR+g5p29F3k0fUExHWxL0Sf4KHcXYkfhtqfRBPS8ww==", "license": "MIT", - "peer": true, "dependencies": { "@types/json-schema": "^7.0.3", "ajv": "^8.6.1", @@ -5099,7 +5082,6 @@ "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-19.2.1.tgz", "integrity": "sha512-c5vQId7YoAhM0y4HASrz9mtLju+28vJspd6OBlhPbBlSae8GN8m9S/oav+8LaSY19yh95cZ5B/nMcLNNWgL/jA==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.0.0" }, @@ -6590,7 +6572,6 @@ "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "undici-types": "~7.16.0" } @@ -6953,7 +6934,6 @@ "integrity": "sha512-N9lBGA9o9aqb1hVMc9hzySbhKibHmB+N3IpoShyV6HyQYRGIhlrO5rQgttypi+yEeKsKI4idxC8Jw6gXKD4THA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.49.0", "@typescript-eslint/types": "8.49.0", @@ -7125,6 +7105,7 @@ "integrity": "sha512-nPiRSKuvtTN+no/2N1kt2tUh/HoFzeEgOm9fQ6XQk4/ApGqjx0zFIIaLJ6wooR1HIoozvj2j6vTi/1fgAz7UYQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.46.4", "@typescript-eslint/types": "^8.46.4", @@ -7147,6 +7128,7 @@ "integrity": "sha512-tMDbLGXb1wC+McN1M6QeDx7P7c0UWO5z9CXqp7J8E+xGcJuUuevWKxuG8j41FoweS3+L41SkyKKkia16jpX7CA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/types": "8.46.4", "@typescript-eslint/visitor-keys": "8.46.4" @@ -7165,6 +7147,7 @@ "integrity": "sha512-+/XqaZPIAk6Cjg7NWgSGe27X4zMGqrFqZ8atJsX3CWxH/jACqWnrWI68h7nHQld0y+k9eTTjb9r+KU4twLoo9A==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -7392,6 +7375,7 @@ "integrity": "sha512-7oV2qEOr1d4NWNmpXLR35LvCfOkTNymY9oyW+lUHkmCno7aOmIf/hMaydnJBUTBMRCOGZh8YjkFOc8dadEoNGA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/project-service": "8.46.4", "@typescript-eslint/tsconfig-utils": "8.46.4", @@ -7421,6 +7405,7 @@ "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dev": true, "license": "ISC", + "peer": true, "dependencies": { "brace-expansion": "^2.0.1" }, @@ -7462,6 +7447,7 @@ "integrity": "sha512-/++5CYLQqsO9HFGLI7APrxBJYo+5OCMpViuhV8q5/Qa3o5mMrF//eQHks+PXcsAVaLdn817fMuS7zqoXNNZGaw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/types": "8.46.4", "eslint-visitor-keys": "^4.2.1" @@ -7480,6 +7466,7 @@ "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "dev": true, "license": "Apache-2.0", + "peer": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -7722,7 +7709,6 @@ "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, "license": "MIT", - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -7811,7 +7797,6 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "license": "MIT", - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -8140,7 +8125,6 @@ "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-4.1.5.tgz", "integrity": "sha512-vEfYZPmvVOIuE567XBVCsx8SBgOYtjB2+S1iAaJ+HgH+DNjAcrHem2hmAeC9yaNGWayicv4yR+9UaJlkF3pvtw==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.8.1" }, @@ -8582,7 +8566,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "baseline-browser-mapping": "^2.8.25", "caniuse-lite": "^1.0.30001754", @@ -9981,8 +9964,7 @@ "version": "1.11.19", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz", "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==", - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/debug": { "version": "4.4.3", @@ -10558,7 +10540,6 @@ "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "ansi-colors": "^4.1.1", "strip-ansi": "^6.0.1" @@ -10819,7 +10800,6 @@ "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", @@ -10880,7 +10860,6 @@ "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==", "dev": true, "license": "MIT", - "peer": true, "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -12161,7 +12140,8 @@ "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/hammerjs": { "version": "2.0.8", @@ -13371,8 +13351,7 @@ "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.13.0.tgz", "integrity": "sha512-vsYjfh7lyqvZX5QgqKc4YH8phs7g96Z8bsdIFNEU3VqXhlHaq+vov/Fgn/sr6MiUczdZkyXRC3TX369Ll4Nzbw==", "dev": true, - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/jasmine-marbles": { "version": "0.9.2", @@ -13503,7 +13482,6 @@ "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==", "dev": true, "license": "MIT", - "peer": true, "bin": { "jiti": "bin/jiti.js" } @@ -13692,7 +13670,6 @@ "integrity": "sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@colors/colors": "1.5.0", "body-parser": "^1.19.0", @@ -14135,7 +14112,6 @@ "integrity": "sha512-tkuLHQlvWUTeQ3doAqnHbNn8T6WX1KA8yvbKG9x4VtKtIjHsVKQZCH11zRgAfbDAXC2UNIg/K9BYAAcEzUIrNg==", "dev": true, "license": "Apache-2.0", - "peer": true, "dependencies": { "copy-anything": "^2.0.1", "parse-node-version": "^1.0.1", @@ -14828,7 +14804,6 @@ "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.2.tgz", "integrity": "sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew==", "license": "MIT", - "peer": true, "engines": { "node": ">=12" } @@ -16491,7 +16466,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "nanoid": "^3.3.8", "picocolors": "^1.1.1", @@ -16640,7 +16614,6 @@ "integrity": "sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==", "dev": true, "license": "MIT", - "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -17303,7 +17276,6 @@ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz", "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==", "license": "Apache-2.0", - "peer": true, "dependencies": { "tslib": "^2.1.0" } @@ -18716,7 +18688,6 @@ "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==", "dev": true, "license": "BSD-2-Clause", - "peer": true, "dependencies": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.8.2", @@ -19011,8 +18982,7 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "license": "0BSD", - "peer": true + "license": "0BSD" }, "node_modules/tuf-js": { "version": "3.1.0", @@ -19108,7 +19078,6 @@ "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", "dev": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -19123,6 +19092,7 @@ "integrity": "sha512-KALyxkpYV5Ix7UhvjTwJXZv76VWsHG+NjNlt/z+a17SOQSiOcBdUXdbJdyXi7RPxrBFECtFOiPwUJQusJuCqrg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/eslint-plugin": "8.46.4", "@typescript-eslint/parser": "8.46.4", @@ -19147,6 +19117,7 @@ "integrity": "sha512-R48VhmTJqplNyDxCyqqVkFSZIx1qX6PzwqgcXn1olLrzxcSBDlOsbtcnQuQhNtnNiJ4Xe5gREI1foajYaYU2Vg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "8.46.4", @@ -19203,6 +19174,7 @@ "integrity": "sha512-V4QC8h3fdT5Wro6vANk6eojqfbv5bpwHuMsBcJUJkqs2z5XnYhJzyz9Y02eUmF9u3PgXEUiOt4w4KHR3P+z0PQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/types": "8.46.4", "@typescript-eslint/typescript-estree": "8.46.4", @@ -20000,7 +19972,6 @@ "integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.6", @@ -20078,7 +20049,6 @@ "integrity": "sha512-QcQ72gh8a+7JO63TAx/6XZf/CWhgMzu5m0QirvPfGvptOusAxG12w2+aua1Jkjr7hzaWDnJ2n6JFeexMHI+Zjg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@types/bonjour": "^3.5.13", "@types/connect-history-api-fallback": "^1.5.4", @@ -20662,8 +20632,7 @@ "version": "0.15.1", "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.15.1.tgz", "integrity": "sha512-XE96n56IQpJM7NAoXswY3XRLcWFW83xe0BiAOeMD7K5k5xecOeul3Qcpx6GqEeeHNkW5DWL5zOyTbEfB4eti8w==", - "license": "MIT", - "peer": true + "license": "MIT" } } } diff --git a/src/app/datasets/datasets-filter/datasets-filter.component.html b/src/app/datasets/datasets-filter/datasets-filter.component.html index fb6bebb56..1440d82f5 100644 --- a/src/app/datasets/datasets-filter/datasets-filter.component.html +++ b/src/app/datasets/datasets-filter/datasets-filter.component.html @@ -15,37 +15,7 @@ -
- - -
-
= {}; filtersList: FilterConfig[]; - expandedFilters: { [key: string]: boolean } = {}; filterConfigs$ = this.store.select(selectFilters); @@ -133,12 +132,6 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy { if (filterConfigs) { this.filtersList = filterConfigs; - this.filtersList.forEach((filter) => { - if (filter.type === "checkbox" && filter.enabled) { - this.expandedFilters[filter.key] = true; - } - }); - const { queryParams } = this.route.snapshot; const searchQuery = JSON.parse(queryParams.searchQuery || "{}"); @@ -180,10 +173,6 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy { ); } - toggleFilter(key: string) { - this.expandedFilters[key] = !this.expandedFilters[key]; - } - applyEnabledConditions() { this.conditionConfigs$.pipe(take(1)).subscribe((conditionConfigs) => { (conditionConfigs || []).forEach((config) => { diff --git a/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.html b/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.html index 2c39ae069..43ac47fbb 100644 --- a/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.html +++ b/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.html @@ -12,35 +12,7 @@ -
- - -
-
diff --git a/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.scss b/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.scss index 53588d347..b3586543b 100644 --- a/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.scss +++ b/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.scss @@ -41,36 +41,3 @@ mat-card { scale: 0.9; background: rgba($color: #000000, $alpha: 0.05); } - -.collapsible-filter-wrapper { - position: relative; - - .collapse-toggle { - position: absolute; - right: 0; - top: 0; - background: none; - border: none; - cursor: pointer; - padding: 0; - display: flex; - align-items: center; - justify-content: center; - z-index: 10; - color: #666; - height: 1.5em; - - &:hover { - color: #333; - } - } - - &.collapsed ::ng-deep shared-filter { - .facet-search, - .checkbox-list, - .show-more-btn, - .empty-text { - display: none !important; - } - } -} diff --git a/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.ts b/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.ts index 2625f51d7..dd38543a0 100644 --- a/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.ts +++ b/src/app/proposals/proposal-filters/side-bar-filter/proposal-side-filter.component.ts @@ -32,7 +32,6 @@ export class ProposalSideFilterComponent implements OnInit { appConfig = this.appConfigService.getConfig(); activeFilters: Record = {}; collapsed = false; - expandedFilters: { [key: string]: boolean } = {}; @Output() collapsedChange = new EventEmitter(); filterLists: FilterConfig[] = []; @@ -71,12 +70,6 @@ export class ProposalSideFilterComponent implements OnInit { this.filterLists = this.appConfig.defaultProposalsListSettings?.filters; - this.filterLists.forEach((filter) => { - if (filter.type === "checkbox" && filter.enabled) { - this.expandedFilters[filter.key] = true; - } - }); - const { queryParams } = this.route.snapshot; const searchQuery = JSON.parse(queryParams.searchQuery || "{}"); @@ -117,10 +110,6 @@ export class ProposalSideFilterComponent implements OnInit { this.activeFilters = { ...searchQuery }; } - toggleFilter(key: string) { - this.expandedFilters[key] = !this.expandedFilters[key]; - } - setFilter(filterKey: string, value: string[]) { // Text filter type is not supported for proposal side panel filters // This is to seperate the logic of side filter panel and top text search box diff --git a/src/app/shared/modules/shared-filter/shared-filter.component.html b/src/app/shared/modules/shared-filter/shared-filter.component.html index 1ae020478..e793a1b1c 100644 --- a/src/app/shared/modules/shared-filter/shared-filter.component.html +++ b/src/app/shared/modules/shared-filter/shared-filter.component.html @@ -46,7 +46,10 @@ -
+
{{ label | translate: localization }} {{ @@ -86,6 +89,14 @@
No options found
 +
diff --git a/src/app/shared/modules/shared-filter/shared-filter.component.scss b/src/app/shared/modules/shared-filter/shared-filter.component.scss index a8d25346d..a48563c73 100644 --- a/src/app/shared/modules/shared-filter/shared-filter.component.scss +++ b/src/app/shared/modules/shared-filter/shared-filter.component.scss @@ -73,4 +73,37 @@ mat-divider { font-size: 0.75rem; display: inline-flex; align-items: center; -} \ No newline at end of file +} + +.collapsible-filter-wrapper { + position: relative; + + .collapse-toggle { + position: absolute; + right: 0; + top: 0; + background: none; + border: none; + cursor: pointer; + padding: 0; + display: flex; + align-items: center; + justify-content: center; + z-index: 10; + color: #666; + height: 1.5em; + + &:hover { + color: #333; + } + } + + &.collapsed { + .facet-search, + .checkbox-list, + .show-more-btn, + .empty-text { + display: none !important; + } + } +} diff --git a/src/app/shared/modules/shared-filter/shared-filter.component.ts b/src/app/shared/modules/shared-filter/shared-filter.component.ts index f459879a4..52e291777 100644 --- a/src/app/shared/modules/shared-filter/shared-filter.component.ts +++ b/src/app/shared/modules/shared-filter/shared-filter.component.ts @@ -78,6 +78,8 @@ export class SharedFilterComponent implements OnChanges { | undefined | null; @Input() showBadge = false; + @Input() collapsible = false; + collapsed = false; @Output() textChange = new EventEmitter(); @Output() checkBoxChange = new EventEmitter(); @@ -233,7 +235,13 @@ export class SharedFilterComponent implements OnChanges { return Array.isArray(this.filterValue) ? this.filterValue.length : 0; } get shouldShowBadge(): boolean { - return this.showBadge && this.badgeCount > 0; + return this.collapsible && this.collapsed && this.badgeCount > 0; + } + + toggleCollapse() { + if (this.collapsible && this.filterType === "checkbox") { + this.collapsed = !this.collapsed; + } } /** Checkbox filter helpers END*/