diff --git a/package-lock.json b/package-lock.json index 0f6e04be..5d4ac113 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2566,6 +2566,7 @@ "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-20.45.0.tgz", "integrity": "sha512-9lHcnSJ36sQ+bsYFhydf/Pvp3Bo5N3go8R3ORPTNtvYnwiKSfjlv11QpURC/xHobXsT2eYHiwl2gNmq1yP09BA==", "dev": true, + "peer": true, "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.1.1", "@fortawesome/react-fontawesome": "^0.1.18", @@ -2604,6 +2605,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, + "peer": true, "dependencies": { "balanced-match": "^1.0.0" } @@ -2612,13 +2614,15 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==", - "dev": true + "dev": true, + "peer": true }, "node_modules/@edx/paragon/node_modules/glob": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "dev": true, + "peer": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -2638,6 +2642,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, + "peer": true, "dependencies": { "brace-expansion": "^2.0.1" }, @@ -2650,6 +2655,7 @@ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", "dev": true, + "peer": true, "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -2660,13 +2666,15 @@ "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "dev": true + "dev": true, + "peer": true }, "node_modules/@edx/paragon/node_modules/uuid": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", "dev": true, + "peer": true, "bin": { "uuid": "dist/bin/uuid" } @@ -8438,6 +8446,12 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, + "node_modules/child_process": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/child_process/-/child_process-1.0.2.tgz", + "integrity": "sha512-Wmza/JzL0SiWz7kl6MhIKT5ceIlnFPJX+lwUGj7Clhy5MMldsSoJR0+uvRzOS5Kv45Mq7t1PoE8TsOA9bzvb6g==", + "dev": true + }, "node_modules/chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -27252,7 +27266,7 @@ }, "packages/catalog-search": { "name": "@edx/frontend-enterprise-catalog-search", - "version": "4.6.0", + "version": "4.7.1", "license": "AGPL-3.0", "dependencies": { "@edx/frontend-enterprise-utils": "^3.5.0", @@ -27264,7 +27278,7 @@ "@edx/browserslist-config": "1.1.0", "@edx/frontend-build": "12.7.0", "@edx/frontend-platform": "4.6.0", - "@edx/paragon": "20.45.0", + "@edx/paragon": "21.1.6", "@testing-library/jest-dom": "5.11.6", "@testing-library/react": "12.1.4", "@testing-library/react-hooks": "3.4.2", @@ -27277,13 +27291,145 @@ }, "peerDependencies": { "@edx/frontend-platform": "^4.0.1", - "@edx/paragon": "^19.15.0 || ^20.0.0", + "@edx/paragon": "^19.15.0 || ^20.0.0 || ^21.0.0", "react": "^16.12.0 || ^17.0.0", "react-dom": "^16.12.0 || ^17.0.0", "react-instantsearch-dom": "^6.8.3", "react-router-dom": "^5.2.0" } }, + "packages/catalog-search/node_modules/@edx/paragon": { + "version": "21.1.6", + "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-21.1.6.tgz", + "integrity": "sha512-bOauCQjyTfyPYeDAj43v6v7GaL+Z4ig3ikjt96iSa97h+BkSxeT1D03kBtOVeAHhwCYcuGQvLr2gvczKqotJ8w==", + "dev": true, + "dependencies": { + "@fortawesome/fontawesome-svg-core": "^6.1.1", + "@fortawesome/react-fontawesome": "^0.1.18", + "@popperjs/core": "^2.11.4", + "bootstrap": "^4.6.2", + "chalk": "^4.1.2", + "child_process": "^1.0.2", + "classnames": "^2.3.1", + "email-prop-type": "^3.0.0", + "file-selector": "^0.6.0", + "font-awesome": "^4.7.0", + "glob": "^8.0.3", + "inquirer": "^8.2.5", + "lodash.uniqby": "^4.7.0", + "mailto-link": "^2.0.0", + "prop-types": "^15.8.1", + "react-bootstrap": "^1.6.5", + "react-colorful": "^5.6.1", + "react-dropzone": "^14.2.1", + "react-focus-on": "^3.5.4", + "react-loading-skeleton": "^3.1.0", + "react-popper": "^2.2.5", + "react-proptype-conditional-require": "^1.0.4", + "react-responsive": "^8.2.0", + "react-table": "^7.7.0", + "react-transition-group": "^4.4.2", + "tabbable": "^5.3.3", + "uncontrollable": "^7.2.1", + "uuid": "^9.0.0" + }, + "bin": { + "paragon": "bin/paragon-scripts.js" + }, + "peerDependencies": { + "react": "^16.8.6 || ^17.0.0", + "react-dom": "^16.8.6 || ^17.0.0", + "react-intl": "^5.25.1 || ^6.4.0" + } + }, + "packages/catalog-search/node_modules/@edx/paragon/node_modules/classnames": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", + "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==", + "dev": true + }, + "packages/catalog-search/node_modules/@edx/paragon/node_modules/prop-types": { + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "dev": true, + "dependencies": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.13.1" + } + }, + "packages/catalog-search/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "packages/catalog-search/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "packages/catalog-search/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "packages/catalog-search/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "packages/catalog-search/node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "packages/catalog-search/node_modules/uuid": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", + "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "dev": true, + "bin": { + "uuid": "dist/bin/uuid" + } + }, "packages/hotjar": { "name": "@edx/frontend-enterprise-hotjar", "version": "1.4.0", diff --git a/packages/catalog-search/package.json b/packages/catalog-search/package.json index 2013036f..98aff6a8 100644 --- a/packages/catalog-search/package.json +++ b/packages/catalog-search/package.json @@ -1,6 +1,6 @@ { "name": "@edx/frontend-enterprise-catalog-search", - "version": "4.6.0", + "version": "4.7.1", "description": "Components related to Enterprise catalog search.", "repository": { "type": "git", @@ -46,7 +46,7 @@ "@edx/browserslist-config": "1.1.0", "@edx/frontend-build": "12.7.0", "@edx/frontend-platform": "4.6.0", - "@edx/paragon": "20.45.0", + "@edx/paragon": "21.1.6", "@testing-library/jest-dom": "5.11.6", "@testing-library/react": "12.1.4", "@testing-library/react-hooks": "3.4.2", @@ -59,7 +59,7 @@ }, "peerDependencies": { "@edx/frontend-platform": "^4.0.1", - "@edx/paragon": "^19.15.0 || ^20.0.0", + "@edx/paragon": "^19.15.0 || ^20.0.0 || ^21.0.0", "react": "^16.12.0 || ^17.0.0", "react-dom": "^16.12.0 || ^17.0.0", "react-instantsearch-dom": "^6.8.3", diff --git a/packages/catalog-search/src/SearchFilters.jsx b/packages/catalog-search/src/SearchFilters.jsx index 22af6e4e..ff2bd6b1 100644 --- a/packages/catalog-search/src/SearchFilters.jsx +++ b/packages/catalog-search/src/SearchFilters.jsx @@ -4,12 +4,11 @@ import PropTypes from 'prop-types'; import { breakpoints, MediaQuery } from '@edx/paragon'; import FacetListRefinement from './FacetListRefinement'; -import FacetListBase from './FacetListBase'; import CurrentRefinements from './CurrentRefinements'; import MobileFilterMenu from './MobileFilterMenu'; -import { SHOW_ALL_NAME, STYLE_VARIANTS } from './data/constants'; +import { STYLE_VARIANTS } from './data/constants'; import { sortItemsByLabelAsc } from './data/utils'; import { SearchContext } from './SearchContext'; @@ -20,18 +19,6 @@ export const FREE_ALL_TITLE = 'Free / All'; const SearchFilters = ({ variant }) => { const { refinements, searchFacetFilters } = useContext(SearchContext); - const freeAllItems = useMemo(() => [ - { - label: 'Free to me', - // flip the 1 to 0 or vice versa using boolean logic - // eslint-disable-next-line no-bitwise - value: refinements[SHOW_ALL_NAME] ^ 1, - }, - { - label: 'All courses', - value: refinements[SHOW_ALL_NAME], - }, - ], [refinements[SHOW_ALL_NAME]]); const searchFacets = useMemo( () => { @@ -60,17 +47,6 @@ const SearchFilters = ({ variant }) => { )); return ( <> - {features.ENROLL_WITH_CODES && ( - - )} {filtersFromRefinements} {features.LEARNING_TYPE_FACET && ()}