@plone/volto 18.0.0-alpha.21 → 18.0.0-alpha.22

package/CHANGELOG.md

@@ -17,6 +17,17 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.0.0-alpha.22 (2024-03-19)
+
+### Bugfix
+
+- Correctly sort facet values if they are numbers @erral [#5864](https://github.com/plone/volto/issues/5864)
+- Cross-package manager Volto path resolver in `webpack-relative-resolver` @sneridagh [#5893](https://github.com/plone/volto/issues/5893)
+
+### Documentation
+
+- `Volto 18.0.0-alpha.21` and `volto-update-deps` documentation @sneridagh [#5892](https://github.com/plone/volto/issues/5892)
+
 ## 18.0.0-alpha.21 (2024-03-18)
 
 ### Breaking

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "18.0.0-alpha.21",
+  "version": "18.0.0-alpha.22",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"
@@ -57,6 +57,7 @@
       "@plone/volto-slate/(.*)$": "<rootDir>/../volto-slate/src/$1",
       "@plone/registry": "<rootDir>/../registry/src",
       "@plone/registry/(.*)$": "<rootDir>/../registry/src/$1",
+      "@plone/volto": "<rootDir>/src/index.js",
       "~/config": "<rootDir>/src/config",
       "~/../locales/${lang}.json": "<rootDir>/locales/en.json",
       "(.*)/locales/(.*)": "<rootDir>/locales/$2",
@@ -235,9 +236,9 @@
     "url": "^0.11.3",
     "use-deep-compare-effect": "1.8.1",
     "uuid": "^8.3.2",
-    "@plone/registry": "1.5.2",
-    "@plone/volto-slate": "18.0.0-alpha.10",
-    "@plone/scripts": "3.6.0"
+    "@plone/registry": "1.5.3",
+    "@plone/scripts": "3.6.1",
+    "@plone/volto-slate": "18.0.0-alpha.10"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0",
@@ -340,7 +341,7 @@
     "tmp": "0.2.1",
     "ts-jest": "^26.4.2",
     "ts-loader": "9.4.4",
-    "typescript": "5.2.2",
+    "typescript": "^5.4.2",
     "use-trace-update": "1.3.2",
     "wait-on": "6.0.0",
     "webpack": "5.76.1",

package/src/components/manage/Blocks/Search/components/Facets.jsx

@@ -22,6 +22,18 @@ const defaultShowFacet = (index) => {
     : values && Object.keys(values).length > 0;
 };
 
+export const sortFacetChoices = (choices) => {
+  const sorted_choices = choices.sort((a, b) =>
+    typeof a.label === 'string' && typeof b.label === 'string'
+      ? a.label.localeCompare(b.label, 'en', { sensitivity: 'base' })
+      : typeof a.label === 'number' && typeof b.label == 'number'
+        ? a.label - b.label
+        : 0,
+  );
+
+  return sorted_choices;
+};
+
 const Facets = (props) => {
   const [hidden, setHidden] = useState(true);
   const {
@@ -81,9 +93,7 @@ const Facets = (props) => {
                 : true,
             );
 
-          choices = choices.sort((a, b) =>
-            a.label.localeCompare(b.label, 'en', { sensitivity: 'base' }),
-          );
+          choices = sortFacetChoices(choices);
 
           const isMulti = facetSettings.multiple;
           const selectedValue = facets[facetSettings?.field?.value];

package/src/components/manage/Blocks/Search/components/Facets.test.jsx

@@ -0,0 +1,76 @@
+import { sortFacetChoices } from './Facets';
+
+describe('sortFacetChoices', () => {
+  it('sort choices with string labels', () => {
+    const choices = [
+      { label: 'b' },
+      { label: 'd' },
+      { label: 'a' },
+      { label: 'c' },
+    ];
+    const sortedChoices = sortFacetChoices(choices);
+    expect(sortedChoices).toStrictEqual([
+      { label: 'a' },
+      { label: 'b' },
+      { label: 'c' },
+      { label: 'd' },
+    ]);
+  });
+  it('sort choices with string labels with accents (1)', () => {
+    const choices = [
+      { label: 'éventa' },
+      { label: 'portal' },
+      { label: 'newsitem' },
+      { label: 'eventb' },
+    ];
+    const sortedChoices = sortFacetChoices(choices);
+    expect(sortedChoices).toStrictEqual([
+      { label: 'éventa' },
+      { label: 'eventb' },
+      { label: 'newsitem' },
+      { label: 'portal' },
+    ]);
+  });
+
+  it('sort choices with string labels with accents (2)', () => {
+    const choices = [
+      { label: 'eventa' },
+      { label: 'portal' },
+      { label: 'newsitem' },
+      { label: 'éventb' },
+    ];
+    const sortedChoices = sortFacetChoices(choices);
+    expect(sortedChoices).toStrictEqual([
+      { label: 'eventa' },
+      { label: 'éventb' },
+      { label: 'newsitem' },
+      { label: 'portal' },
+    ]);
+  });
+
+  it('sort choices with int labels', () => {
+    const choices = [{ label: 7 }, { label: 3 }, { label: 1 }, { label: 4 }];
+    const sortedChoices = sortFacetChoices(choices);
+    expect(sortedChoices).toStrictEqual([
+      { label: 1 },
+      { label: 3 },
+      { label: 4 },
+      { label: 7 },
+    ]);
+  });
+  it('sort choices with labels of any kind', () => {
+    const choices = [
+      { label: 7 },
+      { label: '1' },
+      { label: 'b' },
+      { label: 5 },
+    ];
+    const sortedChoices = sortFacetChoices(choices);
+    expect(sortedChoices).toStrictEqual([
+      { label: 7 },
+      { label: '1' },
+      { label: 'b' },
+      { label: 5 },
+    ]);
+  });
+});

package/types/components/manage/Blocks/Search/components/Facets.d.ts

@@ -1,2 +1,3 @@
+export function sortFacetChoices(choices: any): any;
 export default Facets;
 declare function Facets(props: any): import("react/jsx-runtime").JSX.Element;

package/types/components/manage/Blocks/Search/components/Facets.test.d.ts

@@ -0,0 +1 @@
+export {};

package/webpack-plugins/webpack-relative-resolver.js

@@ -5,8 +5,11 @@ class RelativeResolverPlugin {
     this.source = source || 'resolve';
     this.target = target || 'resolve';
     this.registry = registry;
+    this.voltoModulePath = registry.isVoltoProject
+      ? require.resolve('@plone/volto').split('/').slice(0, -1).join('/')
+      : `${registry.voltoPath}/src`;
     this.voltoPaths = Object.assign(
-      { '@plone/volto/': `${registry.voltoPath}/src` },
+      { '@plone/volto/': this.voltoModulePath },
       ...Object.keys(registry.packages).map((k) => ({
         [k]: registry.packages[k].modulePath,
       })),