From 99da9c774788b7c85a465b1bd90d2683247547ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B4mulo=20Penido?= Date: Wed, 18 Sep 2024 19:51:19 -0300 Subject: [PATCH 1/6] feat: allow full width content in library authoring --- package-lock.json | 357 +----------------- package.json | 6 +- src/header/Header.tsx | 9 +- .../LibraryAuthoringPage.tsx | 7 +- .../components/ComponentCard.scss | 3 + 5 files changed, 30 insertions(+), 352 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1bf414760c..04dddd888f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,8 +20,8 @@ "@dnd-kit/utilities": "^3.2.2", "@edx/brand": "npm:@openedx/brand-openedx@^1.2.3", "@edx/browserslist-config": "1.2.0", - "@edx/frontend-component-footer": "^14.0.3", - "@edx/frontend-component-header": "^5.3.3", + "@edx/frontend-component-footer": "git+ssh://github.com/open-craft/frontend-component-footer#8e0ce700cd36259a1746d8e851adc289c5686819", + "@edx/frontend-component-header": "git+ssh://github.com/open-craft/frontend-component-header#18f5908731f5f38a7dc7a6a4c78c08988c9b816b", "@edx/frontend-enterprise-hotjar": "^2.0.0", "@edx/frontend-platform": "^8.0.3", "@edx/openedx-atlas": "^0.6.0", @@ -37,7 +37,7 @@ "@openedx-plugins/course-app-xpert_unit_summary": "file:plugins/course-apps/xpert_unit_summary", "@openedx/frontend-build": "^14.0.14", "@openedx/frontend-plugin-framework": "^1.2.1", - "@openedx/paragon": "^22.5.1", + "@openedx/paragon": "^22.8.1", "@redux-devtools/extension": "^3.3.0", "@reduxjs/toolkit": "1.9.7", "@tanstack/react-query": "4.36.1", @@ -2153,9 +2153,9 @@ } }, "node_modules/@edx/frontend-component-footer": { - "version": "14.0.10", - "resolved": "https://registry.npmjs.org/@edx/frontend-component-footer/-/frontend-component-footer-14.0.10.tgz", - "integrity": "sha512-Gde3gZjxWJJrgkNKo46RZySVJ9RILUPoJOw1AUthPOih9jPFB7h768CUFWbFuhSuz/0WzPScNzesxoNm54Xgug==", + "version": "1.0.0-semantically-released", + "resolved": "git+ssh://git@github.com/open-craft/frontend-component-footer.git#8e0ce700cd36259a1746d8e851adc289c5686819", + "integrity": "sha512-5GBBXIyMDKPZy9lu6CY3xljSdYMSYTzQ4s0aTTKjpLPwoL26djl+yMuGbXJaJhN7K/fFlri6rlfhw+pkbe3/pg==", "license": "AGPL-3.0", "dependencies": { "@fortawesome/fontawesome-svg-core": "6.6.0", @@ -2170,13 +2170,16 @@ "peerDependencies": { "@edx/frontend-platform": "^7.0.0 || ^8.0.0", "@openedx/paragon": ">= 21.11.3 < 23.0.0", + "classnames": "^2.5.1", "prop-types": "^15.5.10", "react": "^16.9.0 || ^17.0.0", "react-dom": "^16.9.0 || ^17.0.0" } }, "node_modules/@edx/frontend-component-header": { - "version": "5.3.4", + "version": "1.0.0-semantically-released", + "resolved": "git+ssh://git@github.com/open-craft/frontend-component-header.git#18f5908731f5f38a7dc7a6a4c78c08988c9b816b", + "integrity": "sha512-IYlya8YAV19EuayMNqMy2jnlQaxWpKySXBHKbv1bOjoZTMb192mXuO2Ib+tVPYX9hNVS1P8POPpuM4/jV2NzgQ==", "license": "AGPL-3.0", "dependencies": { "@fortawesome/fontawesome-svg-core": "6.6.0", @@ -2192,7 +2195,8 @@ }, "peerDependencies": { "@edx/frontend-platform": "^7.0.0 || ^8.0.0", - "@openedx/paragon": ">= 21.5.7 < 23.0.0", + "@openedx/paragon": "^22.8.0", + "classnames": "^2.5.1", "prop-types": "^15.5.10", "react": "^16.9.0 || ^17.0.0", "react-dom": "^16.9.0 || ^17.0.0" @@ -2564,14 +2568,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@eslint/js": { - "version": "8.57.0", - "license": "MIT", - "peer": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, "node_modules/@floating-ui/core": { "version": "1.6.7", "license": "MIT", @@ -4574,25 +4570,6 @@ } } }, - "node_modules/@testing-library/dom": { - "version": "10.4.0", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@babel/code-frame": "^7.10.4", - "@babel/runtime": "^7.12.5", - "@types/aria-query": "^5.0.1", - "aria-query": "5.3.0", - "chalk": "^4.1.0", - "dom-accessibility-api": "^0.5.9", - "lz-string": "^1.5.0", - "pretty-format": "^27.0.2" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/@testing-library/jest-dom": { "version": "5.17.0", "dev": true, @@ -5372,11 +5349,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/@ungap/structured-clone": { - "version": "1.2.0", - "license": "ISC", - "peer": true - }, "node_modules/@webassemblyjs/ast": { "version": "1.12.1", "license": "MIT", @@ -5847,25 +5819,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/array.prototype.findlastindex": { - "version": "1.2.5", - "license": "MIT", - "peer": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.0.0", - "es-shim-unscopables": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/array.prototype.flat": { "version": "1.3.2", "license": "MIT", @@ -6033,16 +5986,6 @@ "node": ">=4" } }, - "node_modules/axios": { - "version": "0.28.1", - "license": "MIT", - "peer": true, - "dependencies": { - "follow-redirects": "^1.15.0", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, "node_modules/axios-mock-adapter": { "version": "1.22.0", "license": "MIT", @@ -8304,60 +8247,6 @@ "node": ">=0.10.0" } }, - "node_modules/eslint": { - "version": "8.57.0", - "license": "MIT", - "peer": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.0", - "@humanwhocodes/config-array": "^0.11.14", - "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/eslint-config-airbnb": { "version": "19.0.4", "license": "MIT", @@ -8667,55 +8556,6 @@ "node": ">=14.17" } }, - "node_modules/eslint-plugin-import": { - "version": "2.29.1", - "license": "MIT", - "peer": true, - "dependencies": { - "array-includes": "^3.1.7", - "array.prototype.findlastindex": "^1.2.3", - "array.prototype.flat": "^1.3.2", - "array.prototype.flatmap": "^1.3.2", - "debug": "^3.2.7", - "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.9", - "eslint-module-utils": "^2.8.0", - "hasown": "^2.0.0", - "is-core-module": "^2.13.1", - "is-glob": "^4.0.3", - "minimatch": "^3.1.2", - "object.fromentries": "^2.0.7", - "object.groupby": "^1.0.1", - "object.values": "^1.1.7", - "semver": "^6.3.1", - "tsconfig-paths": "^3.15.0" - }, - "engines": { - "node": ">=4" - }, - "peerDependencies": { - "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" - } - }, - "node_modules/eslint-plugin-import/node_modules/debug": { - "version": "3.2.7", - "license": "MIT", - "peer": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-plugin-import/node_modules/doctrine": { - "version": "2.1.0", - "license": "Apache-2.0", - "peer": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/eslint-plugin-jsx-a11y": { "version": "6.7.1", "license": "MIT", @@ -8835,127 +8675,6 @@ "node": ">=10" } }, - "node_modules/eslint/node_modules/argparse": { - "version": "2.0.1", - "license": "Python-2.0", - "peer": true - }, - "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.2.2", - "license": "BSD-2-Clause", - "peer": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "license": "Apache-2.0", - "peer": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/find-up": { - "version": "5.0.0", - "license": "MIT", - "peer": true, - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/glob-parent": { - "version": "6.0.2", - "license": "ISC", - "peer": true, - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/eslint/node_modules/globals": { - "version": "13.24.0", - "license": "MIT", - "peer": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/js-yaml": { - "version": "4.1.0", - "license": "MIT", - "peer": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/eslint/node_modules/locate-path": { - "version": "6.0.0", - "license": "MIT", - "peer": true, - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/p-locate": { - "version": "5.0.0", - "license": "MIT", - "peer": true, - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/type-fest": { - "version": "0.20.2", - "license": "(MIT OR CC0-1.0)", - "peer": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/espree": { "version": "9.6.1", "license": "BSD-2-Clause", @@ -11296,31 +11015,6 @@ "node": ">=10" } }, - "node_modules/jest": { - "version": "29.7.0", - "license": "MIT", - "peer": true, - "dependencies": { - "@jest/core": "^29.7.0", - "@jest/types": "^29.6.3", - "import-local": "^3.0.2", - "jest-cli": "^29.7.0" - }, - "bin": { - "jest": "bin/jest.js" - }, - "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" - }, - "peerDependencies": { - "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" - }, - "peerDependenciesMeta": { - "node-notifier": { - "optional": true - } - } - }, "node_modules/jest-canvas-mock": { "version": "2.5.2", "dev": true, @@ -12130,11 +11824,6 @@ "jiti": "bin/jiti.js" } }, - "node_modules/jquery": { - "version": "3.7.1", - "license": "MIT", - "peer": true - }, "node_modules/js-tokens": { "version": "4.0.0", "license": "MIT" @@ -15573,19 +15262,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/object.groupby": { - "version": "1.0.3", - "license": "MIT", - "peer": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/object.hasown": { "version": "1.1.4", "license": "MIT", @@ -16075,15 +15751,6 @@ "node": ">=4" } }, - "node_modules/popper.js": { - "version": "1.16.1", - "license": "MIT", - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/possible-typed-array-names": { "version": "1.0.0", "license": "MIT", diff --git a/package.json b/package.json index 1b62ce3159..d19c78b955 100644 --- a/package.json +++ b/package.json @@ -48,8 +48,8 @@ "@dnd-kit/utilities": "^3.2.2", "@edx/brand": "npm:@openedx/brand-openedx@^1.2.3", "@edx/browserslist-config": "1.2.0", - "@edx/frontend-component-footer": "^14.0.3", - "@edx/frontend-component-header": "^5.3.3", + "@edx/frontend-component-footer": "git+ssh://github.com/open-craft/frontend-component-footer#8e0ce700cd36259a1746d8e851adc289c5686819", + "@edx/frontend-component-header": "git+ssh://github.com/open-craft/frontend-component-header#18f5908731f5f38a7dc7a6a4c78c08988c9b816b", "@edx/frontend-enterprise-hotjar": "^2.0.0", "@edx/frontend-platform": "^8.0.3", "@edx/openedx-atlas": "^0.6.0", @@ -65,7 +65,7 @@ "@openedx-plugins/course-app-xpert_unit_summary": "file:plugins/course-apps/xpert_unit_summary", "@openedx/frontend-build": "^14.0.14", "@openedx/frontend-plugin-framework": "^1.2.1", - "@openedx/paragon": "^22.5.1", + "@openedx/paragon": "^22.8.1", "@redux-devtools/extension": "^3.3.0", "@reduxjs/toolkit": "1.9.7", "@tanstack/react-query": "4.36.1", diff --git a/src/header/Header.tsx b/src/header/Header.tsx index 6bb916c397..80991c78d5 100644 --- a/src/header/Header.tsx +++ b/src/header/Header.tsx @@ -2,13 +2,15 @@ import React from 'react'; import { getConfig } from '@edx/frontend-platform'; import { useIntl } from '@edx/frontend-platform/i18n'; import { StudioHeader } from '@edx/frontend-component-header'; -import { useToggle } from '@openedx/paragon'; +import { type Container, useToggle } from '@openedx/paragon'; import { generatePath, useHref } from 'react-router-dom'; import { SearchModal } from '../search-modal'; import { useContentMenuItems, useSettingMenuItems, useToolsMenuItems } from './hooks'; import messages from './messages'; +type ContainerPropsType = React.ComponentProps; + interface HeaderProps { contextId?: string, number?: string, @@ -16,6 +18,7 @@ interface HeaderProps { title?: string, isHiddenMainMenu?: boolean, isLibrary?: boolean, + containerProps?: ContainerPropsType, } const Header = ({ @@ -25,6 +28,7 @@ const Header = ({ title = '', isHiddenMainMenu = false, isLibrary = false, + containerProps = {}, }: HeaderProps) => { const intl = useIntl(); const libraryHref = useHref('/library/:libraryId'); @@ -69,8 +73,9 @@ const Header = ({ mainMenuDropdowns={mainMenuDropdowns} outlineLink={outlineLink} searchButtonAction={meiliSearchEnabled ? openSearchModal : undefined} + containerProps={containerProps} /> - { meiliSearchEnabled && ( + {meiliSearchEnabled && ( { org={libraryData.org} contextId={libraryId} isLibrary + containerProps={{ + size: undefined, + }} /> - + @@ -216,7 +219,7 @@ const LibraryAuthoringPage = () => { - + { !!sidebarBodyComponent && (
diff --git a/src/library-authoring/components/ComponentCard.scss b/src/library-authoring/components/ComponentCard.scss index fd902fb33b..f59313bf1e 100644 --- a/src/library-authoring/components/ComponentCard.scss +++ b/src/library-authoring/components/ComponentCard.scss @@ -1,4 +1,7 @@ .library-component-card { + .pgn__card { + heigh: 100% + } .library-component-header { border-top-left-radius: .375rem; border-top-right-radius: .375rem; From 9252b6e82e3e865574c30857e3eafd8f55397413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B4mulo=20Penido?= Date: Fri, 20 Sep 2024 11:18:26 -0300 Subject: [PATCH 2/6] fix: typo on css Co-authored-by: Jillian --- src/library-authoring/components/ComponentCard.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/library-authoring/components/ComponentCard.scss b/src/library-authoring/components/ComponentCard.scss index f59313bf1e..d03a16a7ff 100644 --- a/src/library-authoring/components/ComponentCard.scss +++ b/src/library-authoring/components/ComponentCard.scss @@ -1,6 +1,6 @@ .library-component-card { .pgn__card { - heigh: 100% + height: 100% } .library-component-header { border-top-left-radius: .375rem; From d5e4f5f0ec8db33ff07d9d43de8ffaae37df6ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B4mulo=20Penido?= Date: Tue, 1 Oct 2024 14:07:38 -0300 Subject: [PATCH 3/6] chore: update header and footer --- package-lock.json | 348 ++++++++++++++++++++++++++++++++++++++++++++-- package.json | 4 +- 2 files changed, 335 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index a1d28e102a..cb7b9e098f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,8 +20,8 @@ "@dnd-kit/utilities": "^3.2.2", "@edx/brand": "npm:@openedx/brand-openedx@^1.2.3", "@edx/browserslist-config": "1.2.0", - "@edx/frontend-component-footer": "git+ssh://github.com/open-craft/frontend-component-footer#8e0ce700cd36259a1746d8e851adc289c5686819", - "@edx/frontend-component-header": "git+ssh://github.com/open-craft/frontend-component-header#18f5908731f5f38a7dc7a6a4c78c08988c9b816b", + "@edx/frontend-component-footer": "^14.1.0", + "@edx/frontend-component-header": "^5.5.0", "@edx/frontend-enterprise-hotjar": "^2.0.0", "@edx/frontend-platform": "^8.0.3", "@edx/openedx-atlas": "^0.6.0", @@ -2153,16 +2153,16 @@ } }, "node_modules/@edx/frontend-component-footer": { - "version": "1.0.0-semantically-released", - "resolved": "git+ssh://git@github.com/open-craft/frontend-component-footer.git#8e0ce700cd36259a1746d8e851adc289c5686819", - "integrity": "sha512-5GBBXIyMDKPZy9lu6CY3xljSdYMSYTzQ4s0aTTKjpLPwoL26djl+yMuGbXJaJhN7K/fFlri6rlfhw+pkbe3/pg==", - "license": "AGPL-3.0", + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/@edx/frontend-component-footer/-/frontend-component-footer-14.1.0.tgz", + "integrity": "sha512-hdQEGbZosa5Lp8d4sLCu7+e0+X2dQDQZgd5stABbGNbDD1UPU7Efb3duJ5HhcNscpCHMhtYeNbajfUU5K+tKrg==", "dependencies": { "@fortawesome/fontawesome-svg-core": "6.6.0", "@fortawesome/free-brands-svg-icons": "6.6.0", "@fortawesome/free-regular-svg-icons": "6.6.0", "@fortawesome/free-solid-svg-icons": "6.6.0", "@fortawesome/react-fontawesome": "0.2.2", + "classnames": "^2.5.1", "jest-environment-jsdom": "^29.7.0", "lodash": "^4.17.21", "ts-jest": "^29.1.2" @@ -2170,33 +2170,32 @@ "peerDependencies": { "@edx/frontend-platform": "^7.0.0 || ^8.0.0", "@openedx/paragon": ">= 21.11.3 < 23.0.0", - "classnames": "^2.5.1", "prop-types": "^15.5.10", "react": "^16.9.0 || ^17.0.0", "react-dom": "^16.9.0 || ^17.0.0" } }, "node_modules/@edx/frontend-component-header": { - "version": "1.0.0-semantically-released", - "resolved": "git+ssh://git@github.com/open-craft/frontend-component-header.git#18f5908731f5f38a7dc7a6a4c78c08988c9b816b", - "integrity": "sha512-IYlya8YAV19EuayMNqMy2jnlQaxWpKySXBHKbv1bOjoZTMb192mXuO2Ib+tVPYX9hNVS1P8POPpuM4/jV2NzgQ==", - "license": "AGPL-3.0", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@edx/frontend-component-header/-/frontend-component-header-5.5.0.tgz", + "integrity": "sha512-nvpuTIx1o27LUGJ17HpOOm+PX0gg/YumWUMsrl1gSjbrTksyDLOxS1Y4thqlrWzD+dAgk5YKMowZM2BLiRDguQ==", "dependencies": { "@fortawesome/fontawesome-svg-core": "6.6.0", "@fortawesome/free-brands-svg-icons": "6.6.0", "@fortawesome/free-regular-svg-icons": "6.6.0", "@fortawesome/free-solid-svg-icons": "6.6.0", "@fortawesome/react-fontawesome": "^0.2.0", + "@openedx/frontend-plugin-framework": "^1.3.0", "axios-mock-adapter": "1.22.0", "babel-polyfill": "6.26.0", + "classnames": "^2.5.1", "jest-environment-jsdom": "^29.7.0", "react-responsive": "8.2.0", "react-transition-group": "4.4.5" }, "peerDependencies": { "@edx/frontend-platform": "^7.0.0 || ^8.0.0", - "@openedx/paragon": "^22.8.0", - "classnames": "^2.5.1", + "@openedx/paragon": ">= 21.5.7 < 23.0.0", "prop-types": "^15.5.10", "react": "^16.9.0 || ^17.0.0", "react-dom": "^16.9.0 || ^17.0.0" @@ -2568,6 +2567,14 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@eslint/js": { + "version": "8.57.0", + "license": "MIT", + "peer": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, "node_modules/@floating-ui/core": { "version": "1.6.7", "license": "MIT", @@ -3996,8 +4003,9 @@ } }, "node_modules/@openedx/frontend-plugin-framework": { - "version": "1.2.3", - "license": "AGPL-3.0", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@openedx/frontend-plugin-framework/-/frontend-plugin-framework-1.3.0.tgz", + "integrity": "sha512-qLtX/4HIuWXiIhBdtBuL6mPVbV2un0rsFYx3I5+3tIUf7+T7WRq81a6JHU5QGyAmZy9dfiv7QwbqwiEQOVXVuQ==", "dependencies": { "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2", "classnames": "^2.3.2", @@ -4570,6 +4578,25 @@ } } }, + "node_modules/@testing-library/dom": { + "version": "10.4.0", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.12.5", + "@types/aria-query": "^5.0.1", + "aria-query": "5.3.0", + "chalk": "^4.1.0", + "dom-accessibility-api": "^0.5.9", + "lz-string": "^1.5.0", + "pretty-format": "^27.0.2" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/@testing-library/jest-dom": { "version": "5.17.0", "dev": true, @@ -5349,6 +5376,11 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "license": "ISC", + "peer": true + }, "node_modules/@webassemblyjs/ast": { "version": "1.12.1", "license": "MIT", @@ -5989,6 +6021,16 @@ "node": ">=4" } }, + "node_modules/axios": { + "version": "0.28.1", + "license": "MIT", + "peer": true, + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/axios-mock-adapter": { "version": "1.22.0", "license": "MIT", @@ -8250,6 +8292,60 @@ "node": ">=0.10.0" } }, + "node_modules/eslint": { + "version": "8.57.0", + "license": "MIT", + "peer": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.0", + "@humanwhocodes/config-array": "^0.11.14", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/eslint-config-airbnb": { "version": "19.0.4", "license": "MIT", @@ -8566,6 +8662,55 @@ "node": ">=14.17" } }, + "node_modules/eslint-plugin-import": { + "version": "2.29.1", + "license": "MIT", + "peer": true, + "dependencies": { + "array-includes": "^3.1.7", + "array.prototype.findlastindex": "^1.2.3", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", + "debug": "^3.2.7", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.8.0", + "hasown": "^2.0.0", + "is-core-module": "^2.13.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.fromentries": "^2.0.7", + "object.groupby": "^1.0.1", + "object.values": "^1.1.7", + "semver": "^6.3.1", + "tsconfig-paths": "^3.15.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" + } + }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "3.2.7", + "license": "MIT", + "peer": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "license": "Apache-2.0", + "peer": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/eslint-plugin-jsx-a11y": { "version": "6.7.1", "license": "MIT", @@ -8685,6 +8830,127 @@ "node": ">=10" } }, + "node_modules/eslint/node_modules/argparse": { + "version": "2.0.1", + "license": "Python-2.0", + "peer": true + }, + "node_modules/eslint/node_modules/eslint-scope": { + "version": "7.2.2", + "license": "BSD-2-Clause", + "peer": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "license": "Apache-2.0", + "peer": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/find-up": { + "version": "5.0.0", + "license": "MIT", + "peer": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/glob-parent": { + "version": "6.0.2", + "license": "ISC", + "peer": true, + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/eslint/node_modules/globals": { + "version": "13.24.0", + "license": "MIT", + "peer": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/js-yaml": { + "version": "4.1.0", + "license": "MIT", + "peer": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/eslint/node_modules/locate-path": { + "version": "6.0.0", + "license": "MIT", + "peer": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/p-locate": { + "version": "5.0.0", + "license": "MIT", + "peer": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/type-fest": { + "version": "0.20.2", + "license": "(MIT OR CC0-1.0)", + "peer": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/espree": { "version": "9.6.1", "license": "BSD-2-Clause", @@ -11025,6 +11291,31 @@ "node": ">=10" } }, + "node_modules/jest": { + "version": "29.7.0", + "license": "MIT", + "peer": true, + "dependencies": { + "@jest/core": "^29.7.0", + "@jest/types": "^29.6.3", + "import-local": "^3.0.2", + "jest-cli": "^29.7.0" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, "node_modules/jest-canvas-mock": { "version": "2.5.2", "dev": true, @@ -11834,6 +12125,11 @@ "jiti": "bin/jiti.js" } }, + "node_modules/jquery": { + "version": "3.7.1", + "license": "MIT", + "peer": true + }, "node_modules/js-tokens": { "version": "4.0.0", "license": "MIT" @@ -15257,6 +15553,19 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/object.groupby": { + "version": "1.0.3", + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/object.hasown": { "version": "1.1.4", "license": "MIT", @@ -15748,6 +16057,15 @@ "node": ">=4" } }, + "node_modules/popper.js": { + "version": "1.16.1", + "license": "MIT", + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/possible-typed-array-names": { "version": "1.0.0", "license": "MIT", diff --git a/package.json b/package.json index d19c78b955..27bc40d4b7 100644 --- a/package.json +++ b/package.json @@ -48,8 +48,8 @@ "@dnd-kit/utilities": "^3.2.2", "@edx/brand": "npm:@openedx/brand-openedx@^1.2.3", "@edx/browserslist-config": "1.2.0", - "@edx/frontend-component-footer": "git+ssh://github.com/open-craft/frontend-component-footer#8e0ce700cd36259a1746d8e851adc289c5686819", - "@edx/frontend-component-header": "git+ssh://github.com/open-craft/frontend-component-header#18f5908731f5f38a7dc7a6a4c78c08988c9b816b", + "@edx/frontend-component-footer": "^14.1.0", + "@edx/frontend-component-header": "^5.5.0", "@edx/frontend-enterprise-hotjar": "^2.0.0", "@edx/frontend-platform": "^8.0.3", "@edx/openedx-atlas": "^0.6.0", From cbc1661db3367cd0b9f330a1a0006694a4727eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B4mulo=20Penido?= Date: Tue, 1 Oct 2024 14:10:18 -0300 Subject: [PATCH 4/6] fix: reduce cropLength to the default 10 --- src/search-manager/data/api.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/search-manager/data/api.ts b/src/search-manager/data/api.ts index 5feeb2456a..fe73a7d3fc 100644 --- a/src/search-manager/data/api.ts +++ b/src/search-manager/data/api.ts @@ -246,7 +246,6 @@ export async function fetchSearchResults({ highlightPreTag: HIGHLIGHT_PRE_TAG, highlightPostTag: HIGHLIGHT_POST_TAG, attributesToCrop: ['content'], - cropLength: 20, sort, offset, limit, @@ -281,7 +280,6 @@ export async function fetchSearchResults({ highlightPreTag: HIGHLIGHT_PRE_TAG, highlightPostTag: HIGHLIGHT_POST_TAG, attributesToCrop: ['description'], - cropLength: 15, sort, offset, limit, From d50c10966ec41765c0cef813b28a5c05d3c35495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B4mulo=20Penido?= Date: Tue, 1 Oct 2024 14:12:35 -0300 Subject: [PATCH 5/6] fix: eslint --- src/library-authoring/components/ComponentCard.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/library-authoring/components/ComponentCard.scss b/src/library-authoring/components/ComponentCard.scss index d03a16a7ff..cdf72300e6 100644 --- a/src/library-authoring/components/ComponentCard.scss +++ b/src/library-authoring/components/ComponentCard.scss @@ -2,6 +2,7 @@ .pgn__card { height: 100% } + .library-component-header { border-top-left-radius: .375rem; border-top-right-radius: .375rem; From f08d932bc771ef783e3d00241b44739fded42ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B4mulo=20Penido?= Date: Tue, 1 Oct 2024 14:53:35 -0300 Subject: [PATCH 6/6] fix: recently modified grid --- src/library-authoring/LibraryRecentlyModified.tsx | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/library-authoring/LibraryRecentlyModified.tsx b/src/library-authoring/LibraryRecentlyModified.tsx index 57828871ef..4d5696ec05 100644 --- a/src/library-authoring/LibraryRecentlyModified.tsx +++ b/src/library-authoring/LibraryRecentlyModified.tsx @@ -1,7 +1,6 @@ import React, { useMemo } from 'react'; import { useIntl } from '@edx/frontend-platform/i18n'; import { orderBy } from 'lodash'; -import { CardGrid } from '@openedx/paragon'; import { SearchContextProvider, useSearchContext } from '../search-manager'; import { type CollectionHit, type ContentHit, SearchSortOption } from '../search-manager/data/api'; @@ -48,15 +47,7 @@ const RecentlyModified: React.FC<{ libraryId: string }> = ({ libraryId }) => { title={intl.formatMessage(messages.recentlyModifiedTitle)} contentCount={componentCount} > - +
{recentItems.map((contentHit) => ( contentHit.type === 'collection' ? ( = ({ libraryId }) => { /> ) ))} - +
) : null;