Merge remote-tracking branch 'origin/main' into feature/batch-tagging

ValJed · ValJed · commit 5640ff4ea805 · 2025-07-04T17:17:53.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,11 @@
 
 ### Adds
 
+* Implemented GET /api/v1/@apostrophecms/login/whoami route such that it returns the details of the currently logged in user; added the route to the login module.
+  Thanks to [sombitganguly](https://github.com/sombitganguly) for this contribution.
 * Adds keyboard shortcuts for manipulating widgets in areas. Includes Cut, Copy, Paste, Delete, and Duplicate.
+* Adds dynamic choices working with piece manager filters. 
+* Allow `import.imageTags` (array of image tag IDs) to be passed to the rich text widget when importing (see https://docs.apostrophecms.org/reference/api/rich-text.html#importing-inline-images).
 * Adds a new way to make `GET` requests with a large query string. It can become a `POST` request containing the key `__aposGetWithQuery` in its body.
 A middleware checks for this key and converts the request back to a `GET` request with the right `req.query` property.
 
@@ -13,6 +17,8 @@ A middleware checks for this key and converts the request back to a `GET` reques
 ### Fixes
 
 * Add missing Pages manager shortcuts list helper.
+* Improve the `isEmpty` method of the rich text widget to take into account the HTML blocks (`<figure>` and `<table>`) that are not empty but do not contain any plain text.
+* (Backward compatibility break) Conditional field that depends on already hidden field is also hidden, again.
 
 ## 4.18.0 (2025-06-11)
 
diff --git a/modules/@apostrophecms/area/index.js b/modules/@apostrophecms/area/index.js
@@ -604,7 +604,7 @@ module.exports = {
           return {};
         }
         const schema = manager.schema;
-        const field = _.find(schema, 'name', name);
+        const field = schema?.find(field => field.name === name);
         if (!(field && field.options)) {
           return {};
         }
diff --git a/modules/@apostrophecms/doc-type/index.js b/modules/@apostrophecms/doc-type/index.js
@@ -1607,17 +1607,16 @@ module.exports = {
       },
 
       composeFilters() {
-        self.filters = Object.keys(self.filters).map((key) => ({
-          name: key,
-          ...self.filters[key],
-          inputType: self.filters[key].inputType || 'select'
+        self.filters = Object.entries(self.filters).map(([ name, filter ]) => ({
+          name,
+          ...filter,
+          inputType: filter.inputType || 'select'
         }));
         // Add a null choice if not already added or set to `required`
         self.filters.forEach((filter) => {
-          if (filter.choices) {
+          if (Array.isArray(filter.choices)) {
             if (
               !filter.required &&
-              filter.choices &&
               !filter.choices.find((choice) => choice.value === null)
             ) {
               filter.def = null;
diff --git a/modules/@apostrophecms/image-widget/views/fragment.html b/modules/@apostrophecms/image-widget/views/fragment.html
@@ -8,7 +8,7 @@
     />
   {%- elif attachment -%}
       {%- set className = options.className or manager.options.className -%}
-<figure class="{{ className + "__wrapper" }}" style="{{ _figureStyle(options, manager) | trim }}">
+<figure{% if className %} class="{{ className + "__wrapper" }}"{% endif %} style="{{ _figureStyle(options, manager) | trim }}">
   {{ _imageWithLink(widget, attachment, options, manager, contextOptions) -}}
   {% if widget.caption -%}<figcaption class="{{ className + "__caption" }}">
     {{ widget.caption }}
@@ -30,7 +30,7 @@
   {%- set dimensionAttrs = options.dimensionAttrs or manager.options.dimensionAttrs -%}
   {%- set loadingType = options.loadingType or manager.options.loadingType -%}
   {%- set size = options.size or manager.options.size or 'full' -%}
-<img {% if className %} class="{{ className }}"{% endif %}
+<img{% if className %} class="{{ className }}"{% endif %}
   {% if loadingType %} loading="{{ loadingType }}"{% endif %}
   data-apos-test="image-widget"
   srcset="{{ apos.image.srcset(attachment) }}"
diff --git a/modules/@apostrophecms/login/index.js b/modules/@apostrophecms/login/index.js
@@ -69,7 +69,9 @@ module.exports = {
       allowedAttempts: 3,
       perMinutes: 1,
       lockoutMinutes: 1
-    }
+    },
+    minimumWhoamiFields: [ '_id', 'username', 'title', 'email' ],
+    whoamiFields: []
   },
   async init(self) {
     self.passport = new Passport();
@@ -351,6 +353,22 @@ module.exports = {
         // it should be accessed via POST because the result
         // may differ by individual user session and should not
         // be cached
+        async whoami (req) {
+          if (!req.user) {
+            throw self.apos.error('notfound');
+          }
+
+          const fields = new Set([ ...self.options.minimumWhoamiFields, ...self.options.whoamiFields ]);
+          const user = {};
+
+          for (const field of fields) {
+            if (req.user[field] !== undefined) {
+              user[field] = req.user[field];
+            }
+          }
+
+          return user;
+        },
         async context(req) {
           return self.getContext(req);
         },
diff --git a/modules/@apostrophecms/page/index.js b/modules/@apostrophecms/page/index.js
@@ -356,16 +356,14 @@ module.exports = {
 
             // populates totalPages when perPage is present
             await query.toCount();
-
             const docs = await query.toArray();
 
+            const choices = query.get('choicesResults');
             return {
               results: docs.map(doc => manager.removeForbiddenFields(req, doc)),
               pages: query.get('totalPages'),
               currentPage: query.get('page') || 1,
-              ...(query.get('choicesResults') && {
-                choices: query.get('choicesResults')
-              })
+              ...choices && { choices }
             };
           }
 
@@ -3283,19 +3281,18 @@ database.`);
         });
       },
       composeFilters() {
-        self.filters = Object.keys(self.filters)
-          .map(name => ({
+        self.filters = Object.entries(self.filters)
+          .map(([ name, filter ]) => ({
             name,
-            ...self.filters[name],
-            inputType: self.filters[name].inputType || 'select'
+            ...filter,
+            inputType: filter.inputType || 'select'
           }));
 
         // Add a null choice if not already added or set to `required`
         self.filters.forEach((filter) => {
           if (filter.choices) {
             if (
               !filter.required &&
-              filter.choices &&
               !filter.choices.find((choice) => choice.value === null)
             ) {
               filter.def = null;
diff --git a/modules/@apostrophecms/piece-type/index.js b/modules/@apostrophecms/piece-type/index.js
@@ -248,6 +248,8 @@ module.exports = {
         async (req) => {
           await self.publicApiCheckAsync(req);
           const query = self.getRestQuery(req);
+          const dynamicChoices = self.apos.launder.strings(req.query.dynamicChoices);
+
           if (!query.get('perPage')) {
             query.perPage(
               self.options.perPage
@@ -274,10 +276,17 @@ module.exports = {
             });
           }
 
-          const choicesResult = query.get('choicesResults');
-          if (choicesResult) {
-            result.choices = choicesResult;
+          const filterDynamicChoices = await self.apos.schema.getFilterDynamicChoices(
+            req,
+            dynamicChoices,
+            self
+          );
+          const choicesResults = query.get('choicesResults') || {};
+          const choices = Object.assign(filterDynamicChoices, choicesResults);
+          if (Object.keys(choices).length) {
+            result.choices = choices;
           }
+
           const countsResult = query.get('countsResults');
           if (countsResult) {
             result.counts = countsResult;
diff --git a/modules/@apostrophecms/piece-type/ui/apos/components/AposDocsManager.vue b/modules/@apostrophecms/piece-type/ui/apos/components/AposDocsManager.vue
@@ -247,6 +247,11 @@ export default {
       if (!filter.choices) {
         this.queryExtras.choices = this.queryExtras.choices || [];
         this.queryExtras.choices.push(filter.name);
+      } else if (typeof filter.choices === 'string') {
+        this.queryExtras.dynamicChoices = [
+          ...this.queryExtras.dynamicChoices || [],
+          filter.name
+        ];
       }
     });
   },
diff --git a/modules/@apostrophecms/rich-text-widget/index.js b/modules/@apostrophecms/rich-text-widget/index.js
@@ -837,8 +837,11 @@ module.exports = {
       },
 
       isEmpty(widget) {
-        const text = self.apos.util.htmlToPlaintext(widget.content || '');
-        return !text.trim().length;
+        const content = (widget.content || '').trim();
+        const text = self.apos.util.htmlToPlaintext(content).trim();
+        return text.length === 0 &&
+          content.includes('<table') === false &&
+          content.includes('<figure') === false;
       },
 
       sanitizeHtml(html, options) {
@@ -1067,7 +1070,8 @@ module.exports = {
                 });
                 const image = await self.apos.image.insert(req, {
                   title: name,
-                  attachment
+                  attachment,
+                  tagsIds: input.import.imageTags || []
                 });
                 const newSrc = `${self.apos.image.action}/${image.aposDocId}/src`;
                 $image.replaceWith(
diff --git a/modules/@apostrophecms/rich-text-widget/ui/apos/components/AposRichTextWidgetEditor.vue b/modules/@apostrophecms/rich-text-widget/ui/apos/components/AposRichTextWidgetEditor.vue
@@ -435,6 +435,8 @@ export default {
       .filter(Boolean)
       .concat(this.aposTiptapExtensions());
 
+    this.ensureExtensionsPriority(extensions);
+
     this.editor = new Editor({
       content: this.initialContent,
       autofocus: this.autofocus,
@@ -670,6 +672,21 @@ export default {
           types: this.tiptapTypes
         }));
     },
+    // Find the `defaultNode` extension and ensure it's registered first.
+    // Any other priority related logic should be handled here.
+    // Why sorting is important?
+    // See https://github.com/ProseMirror/prosemirror/issues/1534#issuecomment-2984216986
+    // related with list item issues and `defaultNode`.
+    // NOTE: this handler mutates the input array for performance reasons.
+    ensureExtensionsPriority(extensions) {
+      const defaultNodeIndex = extensions.findIndex(ext => ext.name === 'defaultNode');
+      if (defaultNodeIndex > 0) {
+        const defaultNode = extensions.splice(defaultNodeIndex, 1)[0];
+        extensions.unshift(defaultNode);
+      }
+
+      return extensions;
+    },
     showFloatingMenu({
       state, oldState
     }) {
diff --git a/modules/@apostrophecms/schema/index.js b/modules/@apostrophecms/schema/index.js
@@ -753,7 +753,7 @@ module.exports = {
             ? error.path.split('.')
             : [ null, error.path ];
           const curDestination = destId
-            ? (destination.items || destination || []).find(({ _id }) => _id === destId)
+            ? (destination?.items || destination || []).find(({ _id }) => _id === destId)
             : destination;
 
           const errorPath = destinationPath
@@ -915,16 +915,17 @@ module.exports = {
         fieldModuleName,
         docId = null,
         optionalParenthesis = false,
-        following = {}
+        following = {},
+        featureType = 'field'
       ) {
         const [ methodDefinition, rest ] = methodKey.split('(');
         const hasParenthesis = rest !== undefined;
 
         if (!hasParenthesis && !optionalParenthesis) {
-          throw new Error(`The method "${methodDefinition}" defined in the "${fieldName}" field should be written with parenthesis: "${methodDefinition}()".`);
+          throw new Error(`The method "${methodDefinition}" defined in the "${fieldName}" ${featureType} should be written with parenthesis: "${methodDefinition}()".`);
         }
         if (hasParenthesis && !methodKey.endsWith('()')) {
-          self.apos.util.warn(`The method "${methodDefinition}" defined in the "${fieldName}" field should be written without argument: "${methodDefinition}()".`);
+          self.apos.util.warn(`The method "${methodDefinition}" defined in the "${fieldName}" ${featureType} should be written without argument: "${methodDefinition}()".`);
           methodKey = methodDefinition + '()';
         }
 
@@ -935,9 +936,9 @@ module.exports = {
         const module = self.apos.modules[moduleName];
 
         if (!module) {
-          throw new Error(`The "${moduleName}" module defined in the "${fieldName}" field does not exist.`);
+          throw new Error(`The "${moduleName}" module defined in the "${fieldName}" ${featureType} does not exist.`);
         } else if (!module[methodName]) {
-          throw new Error(`The "${methodName}" method from "${moduleName}" module defined in the "${fieldName}" field does not exist.`);
+          throw new Error(`The "${methodName}" method from "${moduleName}" module defined in the "${fieldName}" ${featureType} does not exist.`);
         }
 
         return module[methodName](req, { docId }, following);
@@ -2194,6 +2195,45 @@ module.exports = {
         });
       },
 
+      async getFilterDynamicChoices(req, dynamicChoices, manager) {
+        if (!dynamicChoices.length) {
+          return {};
+        }
+
+        const moduleName = manager.__meta.name;
+        const result = {};
+        for (const choice of dynamicChoices) {
+          const filter = manager.filters.find(f => f.name === choice);
+
+          if (!filter) {
+            throw self.apos.error('invalid', `Filter "${choice}" not found in module "${moduleName}".`);
+          }
+
+          try {
+            const choices = await self.evaluateMethod(
+              req,
+              filter.choices,
+              filter.name,
+              moduleName,
+              null,
+              true,
+              {},
+              'filter'
+            );
+
+            if (Array.isArray(choices)) {
+              result[choice] = choices;
+            } else {
+              throw self.apos.error('invalid', `The method ${filter.choices} from the module ${moduleName} did not return an array`);
+            }
+          } catch (error) {
+            throw self.apos.error('invalid', error.message);
+          }
+        }
+
+        return result;
+      },
+
       async choicesRoute(req) {
         const fieldId = self.apos.launder.string(req.query.fieldId);
         const docId = self.apos.launder.string(req.query.docId);
diff --git a/modules/@apostrophecms/schema/ui/apos/lib/conditionalFields.js b/modules/@apostrophecms/schema/ui/apos/lib/conditionalFields.js
@@ -124,7 +124,7 @@ export function getConditionalFields(
           values,
           field[conditionType],
           (propName, condition, docValue) =>
-            evaluateExternal(propName, condition, conditionType)
+            evaluateExternalAndHidden(propName, condition, conditionType)
         );
       }
     }
@@ -134,10 +134,14 @@ export function getConditionalFields(
 
   // Handle external conditions as a voter function.
   // Non-boolean returns are ignored by the `checkIfConditions` function.
-  function evaluateExternal(propName, conditionValue, conditionType) {
+  function evaluateExternalAndHidden(propName, conditionValue, conditionType) {
     if (isExternalCondition(propName, conditionType)) {
       return externalConditionsResults[conditionType]?.[propName] === conditionValue;
     }
+
+    if (result[conditionType]?.[propName] === false) {
+      return false;
+    }
   }
 }
 
diff --git a/modules/@apostrophecms/ui/ui/apos/components/AposContextMenu.vue b/modules/@apostrophecms/ui/ui/apos/components/AposContextMenu.vue
@@ -293,7 +293,9 @@ async function hide(e) {
   if (!isOpen.value) {
     return;
   }
-  menuResizeObserver.unobserve(dropdownContent.value);
+  if (dropdownContent.value) {
+    menuResizeObserver.unobserve(dropdownContent.value);
+  }
   isOpen.value = false;
   await nextTick();
   emit('close', e);
diff --git a/package.json b/package.json
diff --git a/test/filters.js b/test/filters.js
diff --git a/test/login.js b/test/login.js

Original file line number	Diff line number	Diff line change
`@@ -604,7 +604,7 @@ module.exports = {`
`604`	`604`	`return {};`
`605`	`605`	`}`
`606`	`606`	`const schema = manager.schema;`
`607`		`- const field = _.find(schema, 'name', name);`
	`607`	`+ const field = schema?.find(field => field.name === name);`
`608`	`608`	`if (!(field && field.options)) {`
`609`	`609`	`return {};`
`610`	`610`	`}`