Merge pull request #7252 from hotosm/staging

ramyaragupathy · web-flow · commit df1217aa258d · 2026-05-21T13:23:59.000+05:30
v5.5.4 with ohsomeNow topics fix
diff --git a/.github/workflows/frontend-build-deploy.yml b/.github/workflows/frontend-build-deploy.yml
@@ -23,10 +23,10 @@ jobs:
       - name: Clone repository
         uses: actions/checkout@v6
 
-      - name: Use Node.js 22.11.0
+      - name: Use Node.js 22.12.0
         uses: actions/setup-node@v6
         with:
-          node-version: 22.11.0
+          node-version: 22.12.0
 
       - name: Cache node_modules
         uses: actions/cache@v5
diff --git a/.github/workflows/pr_test_frontend.yml b/.github/workflows/pr_test_frontend.yml
@@ -23,10 +23,10 @@ jobs:
       - name: Clone repository
         uses: actions/checkout@v6
 
-      - name: Use Node.js 22.11.0
+      - name: Use Node.js 22.12.0
         uses: actions/setup-node@v6
         with:
-          node-version: 22.11.0
+          node-version: 22.12.0
 
       - name: Cache node_modules
         uses: actions/cache@v5
diff --git a/frontend/package.json b/frontend/package.json
@@ -70,6 +70,8 @@
     "tachyons": "^4.12.0",
     "terra-draw": "^1.18.1",
     "tributejs": "^5.1.3",
+    "turndown": "^7.2.4",
+    "turndown-plugin-gfm": "^1.0.2",
     "use-query-params": "^2.2.1",
     "webfontloader": "^1.6.28",
     "workbox-core": "^7.0.0",
diff --git a/frontend/src/api/stats.js b/frontend/src/api/stats.js
@@ -61,18 +61,29 @@ export const useOsmStatsQuery = ({ topics = [] }) => {
 };
 
 export const useOsmHashtagStatsQuery = (defaultComment) => {
+  const hashtag = defaultComment?.[0]?.replace(/^#/, '').trim().toLowerCase();
+
   const fetchOsmStats = ({ signal }) => {
-    return api().get(`${OHSOME_STATS_API_URL}/stats/${defaultComment[0].replace('#', '')}`, {
-      signal,
-    });
+    return api().get(
+      `${OHSOME_STATS_API_URL}/stats?topics=contributor,road,building,edit&hashtag=${encodeURIComponent(hashtag)}`,
+      { signal },
+    );
   };
 
   return useQuery({
-    queryKey: ['osm-hashtag-stats'],
+    queryKey: ['osm-hashtag-stats', hashtag],
     queryFn: fetchOsmStats,
     useErrorBoundary: true,
-    enabled: Boolean(defaultComment?.[0]),
-    select: (data) => data.data.result,
+    enabled: Boolean(hashtag),
+    select: (data) => {
+      const topics = data.data.result?.topics || {};
+      return {
+        changesets: topics.contributor?.value,
+        edits: topics.edit?.value,
+        buildings: topics.building?.value,
+        roads: topics.road?.value,
+      };
+    },
   });
 };
 
diff --git a/frontend/src/components/comments/commentInput.js b/frontend/src/components/comments/commentInput.js
@@ -13,7 +13,7 @@ import HashtagPaste from './hashtagPaste';
 import FileRejections from './fileRejections';
 import DropzoneUploadStatus from './uploadStatus';
 import { DROPZONE_SETTINGS } from '../../config';
-import { formatUserNamesToLink } from '../../utils/htmlFromMarkdown';
+import { formatUserNamesToLink, markdownFromHtml } from '../../utils/htmlFromMarkdown';
 import { iconConfig } from './editorIconConfig';
 import messages from './messages';
 import { CurrentUserAvatar } from '../user/avatar';
@@ -32,11 +32,13 @@ function CommentInputField({
   isShowUserPicture = false,
   placeholderMsg = messages.leaveAComment,
   markdownTextareaProps = {},
+  enableMappersHashtag = false,
 }: Object) {
   const token = useSelector((state) => state.auth.token);
   const textareaRef = useRef();
   const fileInputRef = useRef(null);
   const isBundle = useRef(false);
+  const lastConvertedRef = useRef(null);
   const [isShowPreview, setIsShowPreview] = useState(false);
 
   const appendImgToComment = (url) => setComment(`${comment}\n![image](${url})\n`);
@@ -149,7 +151,21 @@ function CommentInputField({
     sessionStorage.setItem(sessionkey, comment);
   }, [comment, sessionkey]);
 
-  console.log(comment, 'comment');
+  useEffect(() => {
+    if (
+      comment &&
+      comment !== lastConvertedRef.current &&
+      /<\/?(?:p|div|h[1-6]|ul|ol|li|br|strong|em|a|table|thead|tbody|tr|th|td|blockquote|pre|code|span)[\s>]/i.test(comment) &&
+      document.activeElement !== textareaRef.current?.textarea
+    ) {
+      const converted = markdownFromHtml(comment);
+      if (converted !== comment) {
+        lastConvertedRef.current = converted;
+        setComment(converted);
+      }
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [comment]);
 
   return (
     <div {...getRootProps()}>
@@ -291,6 +307,12 @@ function CommentInputField({
               <HashtagPaste text={comment} setFn={setComment} hashtag="#contributors" />
             </>
           )}
+          {enableMappersHashtag && (
+            <>
+              <span>, </span>
+              <HashtagPaste text={comment} setFn={setComment} hashtag="#mappers" />
+            </>
+          )}
         </span>
       )}
       <DropzoneUploadStatus
diff --git a/frontend/src/components/comments/messages.js b/frontend/src/components/comments/messages.js
@@ -36,6 +36,10 @@ export default defineMessages({
     id: 'comment.hashtags.help.contributors',
     defaultMessage: 'Add "{hashtag}" to notify the task contributors about your comment.',
   },
+  mappersHashtagTip: {
+    id: 'comment.hashtags.help.mappers',
+    defaultMessage: 'Add "{hashtag}" to notify the task mappers about your comment.',
+  },
   nothingToPreview: {
     id: 'comment.preview.nothingToPreview',
     defaultMessage: 'Nothing to preview',
diff --git a/frontend/src/components/projectDetail/questionsAndComments.js b/frontend/src/components/projectDetail/questionsAndComments.js
@@ -56,6 +56,7 @@ export const PostProjectComment = ({ projectId, refetchComments, contributors })
             contributors={
               Array.isArray(contributors) ? contributors.map((user) => user.username) : undefined
             }
+            enableMappersHashtag
           />
         </Suspense>
       </div>
diff --git a/frontend/src/components/taskSelection/actionSidebars.js b/frontend/src/components/taskSelection/actionSidebars.js
@@ -277,6 +277,7 @@ export function CompletionTabForMapping({
             enableHashtagPaste={true}
             enableContributorsHashtag
             isShowTabNavs
+            enableMappersHashtag
           />
         </Suspense>
       </div>
@@ -662,6 +663,7 @@ const TaskValidationSelector = ({
                 enableHashtagPaste
                 enableContributorsHashtag
                 isShowTabNavs
+                enableMappersHashtag
               />
             </Suspense>
           </div>
diff --git a/frontend/src/components/taskSelection/taskActivity.js b/frontend/src/components/taskSelection/taskActivity.js
@@ -65,6 +65,7 @@ const PostComment = ({ projectId, taskId, contributors, setCommentPayload }) =>
           enableContributorsHashtag
           isShowUserPicture
           isShowTabNavs
+          enableMappersHashtag
         />
       </Suspense>
       <div className="ml-auto mb5 flex flex-column gap-1 items-end">
diff --git a/frontend/src/network/tests/mockData/userStats.js b/frontend/src/network/tests/mockData/userStats.js
@@ -1,4 +1,5 @@
 import { formatISO } from 'date-fns';
+import { TM_DEFAULT_CHANGESET_COMMENT } from '../../../config';
 
 export const newUsersStats = {
   total: 1044,
@@ -79,14 +80,16 @@ export const ohsomeNowUserStats = {
   },
 };
 
+const projectHashtag = `${TM_DEFAULT_CHANGESET_COMMENT.replace(/^#/, '')}-1`;
+
 export const osmStatsProject = {
   result: {
-    changesets: 987654321,
-    users: 112,
-    roads: 5658.62006919192,
-    buildings: 12923,
-    edits: 123456789,
-    latest: '2020-10-05T23:21:22.000Z',
+    topics: {
+      contributor: { value: 987654321 },
+      edit: { value: 123456789 },
+      road: { value: 5658.62, added: 5000, modified: { count_modified: 500 }, deleted: 0 },
+      building: { value: 12923, added: 12800, modified: { count_modified: 100 }, deleted: 0 },
+    },
   },
 };
 
diff --git a/frontend/src/network/tests/server-handlers.js b/frontend/src/network/tests/server-handlers.js
@@ -368,13 +368,14 @@ const handlers = [
   rest.get(`${OHSOME_STATS_API_URL}/hot-tm-user`, (req, res, ctx) => {
     return res(ctx.json(ohsomeNowUserStats));
   }),
-  rest.get(`${OHSOME_STATS_API_URL}/stats/:projectId`, (req, res, ctx) => {
-    return res(ctx.json(osmStatsProject));
-  }),
   rest.get(`${OHSOME_STATS_API_URL}/metadata`, (req, res, ctx) => {
     return res(ctx.json(ohsomeNowMetadata));
   }),
   rest.get(`${OHSOME_STATS_API_URL}/stats`, (req, res, ctx) => {
+    const hashtag = req.url.searchParams.get('hashtag');
+    if (hashtag && !hashtag.includes('*') && !hashtag.includes('%2A')) {
+      return res(ctx.json(osmStatsProject));
+    }
     return res(ctx.json(updatedOhsomeStats));
   }),
 
diff --git a/frontend/src/utils/htmlFromMarkdown.js b/frontend/src/utils/htmlFromMarkdown.js
@@ -1,5 +1,7 @@
 import { marked } from 'marked';
 import DOMPurify from 'dompurify';
+import TurndownService from 'turndown';
+import { gfm } from 'turndown-plugin-gfm';
 
 const VIDEO_TAG_REGEXP = new RegExp(/^::youtube\[(.*)\]$/);
 
@@ -102,3 +104,81 @@ export const formatUserNamesToLink = (text) => {
   }
   return text;
 };
+
+const turndownService = new TurndownService({
+  headingStyle: 'atx',
+  codeBlockStyle: 'fenced',
+  hr: '---',
+  bullet: '-',
+  emDelimiter: '*',
+});
+
+// Custom escape function to avoid escaping brackets [ ] and other common characters
+// which fixes the task list issue \[x\] and makes the output cleaner.
+turndownService.escape = (string) => {
+  return string
+    .replace(/\\/g, '\\\\')
+    .replace(/\*/g, '\\*')
+    .replace(/_/g, '\\_')
+    .replace(/`/g, '\\`')
+    .replace(/\(/g, '\\(')
+    .replace(/\)/g, '\\)')
+    .replace(/#/g, '\\#');
+};
+
+turndownService.use(gfm);
+
+// Rule to force '-' bullets for unordered lists
+turndownService.addRule('listItem', {
+  filter: 'li',
+  replacement: function (content, node, options) {
+    content = content.trimStart().trimEnd();
+    content = content.replace(/\n/gm, '\n    '); // indent content
+    let prefix = options.bullet + ' ';
+    const parent = node.parentNode;
+    if (parent.nodeName === 'OL') {
+      const start = parent.getAttribute('start');
+      const index = Array.prototype.indexOf.call(parent.children, node);
+      prefix = (start ? Number(start) + index : index + 1) + '. ';
+    }
+    return prefix + content + (node.nextSibling ? '\n' : '');
+  },
+});
+
+// Rule to use double tildes for strikethrough
+turndownService.addRule('strikethrough', {
+  filter: ['del', 's', 'strike'],
+  replacement: (content) => `~~${content}~~`,
+});
+
+// Rule to keep HTML comments
+turndownService.addRule('keepComments', {
+  filter: (node) => node.nodeType === 8,
+  replacement: (content, node) => `\n<!--${node.data}-->\n`,
+});
+
+// Rule to keep other iframes
+turndownService.keep(['iframe']);
+
+export const markdownFromHtml = (html) => {
+  const markdown = turndownService.turndown(html);
+
+  // Split into lines to avoid complex regex that can lead to ReDoS (security hotspots)
+  const lines = markdown.split('\n');
+  const filteredLines = [];
+
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    const nextLine = lines[i + 1];
+
+    filteredLines.push(line);
+
+    // If current line is a header and next line is empty,
+    // and the line after that is also a header, skip the empty line.
+    if (line.startsWith('#') && nextLine === '' && lines[i + 2]?.startsWith('#')) {
+      i++; // Skip the next empty line
+    }
+  }
+
+  return filteredLines.join('\n').replace(/\n{3,}/g, '\n\n').trim();
+};
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
@@ -2139,6 +2139,11 @@
     rw "^1.3.3"
     tinyqueue "^3.0.0"
 
+"@mixmark-io/domino@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@mixmark-io/domino/-/domino-2.2.0.tgz#4e8ec69bf1afeb7a14f0628b7e2c0f35bdb336c3"
+  integrity sha512-Y28PR25bHXUg88kCV7nivXrP2Nj2RueZ3/l/jdx6J9f8J4nsEGcgX0Qe6lt7Pa+J79+kPiJU3LguR6O/6zrLOw==
+
 "@mswjs/cookies@^0.2.2":
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/@mswjs/cookies/-/cookies-0.2.2.tgz#b4e207bf6989e5d5427539c2443380a33ebb922b"
@@ -14102,6 +14107,18 @@ tsutils@^3.21.0:
   dependencies:
     tslib "^1.8.1"
 
+turndown-plugin-gfm@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.2.tgz#6f8678a361f35220b2bdf5619e6049add75bf1c7"
+  integrity sha512-vwz9tfvF7XN/jE0dGoBei3FXWuvll78ohzCZQuOb+ZjWrs3a0XhQVomJEb2Qh4VHTPNRO4GPZh0V7VRbiWwkRg==
+
+turndown@^7.2.4:
+  version "7.2.4"
+  resolved "https://registry.yarnpkg.com/turndown/-/turndown-7.2.4.tgz#42d98202aefa8c188c997b586bc6da78bdf27ea2"
+  integrity sha512-I8yFsfRzmzK0WV1pNNOA4A7y4RDfFxPRxb3t+e3ui14qSGOxGtiSP6GjeX+Y6CHb7HYaFj7ECUD7VE5kQMZWGQ==
+  dependencies:
+    "@mixmark-io/domino" "^2.2.0"
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
diff --git a/scripts/aws/infra/develop/purgeable/common-ecs-env.hcl b/scripts/aws/infra/develop/purgeable/common-ecs-env.hcl
@@ -39,7 +39,7 @@ locals {
     USE_SENTRY                    = get_env("USE_SENTRY", "true")
     OHSOME_STATS_BASE_URL         = get_env("OHSOME_STATS_BASE_URL", "https://stats.now.ohsome.org")
     OHSOME_STATS_API_URL          = get_env("OHSOME_STATS_API_URL", "https://stats.now.ohsome.org/api")
-    OHSOME_STATS_TOPICS           = get_env("OHSOME_STATS_TOPICS", "changeset,highway,waterway,building")
+    OHSOME_STATS_TOPICS           = get_env("OHSOME_STATS_TOPICS", "changeset,road,waterway,building")
 
     # Uncomment the following as needed.
     # TM_TASK_AUTOUNLOCK_AFTER    = get_env("TM_TASK_AUTOUNLOCK_AFTER", "2h")
diff --git a/scripts/aws/infra/develop/purgeable/ecs/terragrunt.hcl b/scripts/aws/infra/develop/purgeable/ecs/terragrunt.hcl
diff --git a/scripts/aws/infra/production/purgeable/common-ecs-env.hcl b/scripts/aws/infra/production/purgeable/common-ecs-env.hcl
diff --git a/scripts/aws/infra/production/purgeable/ecs/terragrunt.hcl b/scripts/aws/infra/production/purgeable/ecs/terragrunt.hcl
diff --git a/scripts/aws/infra/staging/purgeable/common-ecs-env.hcl b/scripts/aws/infra/staging/purgeable/common-ecs-env.hcl
diff --git a/scripts/aws/infra/staging/purgeable/ecs/terragrunt.hcl b/scripts/aws/infra/staging/purgeable/ecs/terragrunt.hcl

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ export const PostProjectComment = ({ projectId, refetchComments, contributors })`
`56`	`56`	`contributors={`
`57`	`57`	`Array.isArray(contributors) ? contributors.map((user) => user.username) : undefined`
`58`	`58`	`}`
	`59`	`+ enableMappersHashtag`
`59`	`60`	`/>`
`60`	`61`	`</Suspense>`
`61`	`62`	`</div>`