Merge pull request #1709 from akvo/bug/ps-stakeholder-map

PS: Rename strength column to initiatives & fix tags filtering FE side
akvo · Nov 6, 2023 · d06f5e1 · d06f5e1
2 parents 3edd23b + 4c67129
commit d06f5e1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/frontend/src/pages/workspace/[slug]/2-stakeholder-consultation/stakeholder-map.js b/frontend/src/pages/workspace/[slug]/2-stakeholder-consultation/stakeholder-map.js
@@ -120,7 +120,7 @@ const StakeholderMapTable = ({
         dataIndex: 'focalPoints',
       },
       {
-        title: t`Strengths`,
+        title: t`Initiatives`,
         dataIndex: 'strengths',
       },
       {
@@ -264,9 +264,12 @@ const StakeholderMapTable = ({
         `/organisations?page=${page}&${queryString}`
       )
       const { results, counts } = data || {}
-      const _entities = results.map((r) => ({
-        ...r,
-      }))
+      const _entities = results.filter((r) => {
+        if (tags.length) {
+          return r.tags.filter(({ tag }) => tags.includes(tag)).length
+        }
+        return r
+      })
       setEntities(_entities)
 
       if (tableParams?.pagination?.total === undefined) {

diff --git a/frontend/src/pages/workspace/[slug]/3-legislation-policy/country-policy.module.scss b/frontend/src/pages/workspace/[slug]/3-legislation-policy/country-policy.module.scss
@@ -109,10 +109,6 @@
         }
         &:nth-of-type(3) .ant-btn.ant-btn-link span,
         &:nth-of-type(6) > div {
-          // white-space: nowrap;
-          // overflow: hidden;
-          // text-overflow: ellipsis;
-          text-wrap: wrap;
           text-align: left;
           padding: 10px 0;
         }