Surveys list: fixed "only own" filtering (#3552)

Co-authored-by: Stefano Ricci <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
openforis · Sep 2, 2024 · a9850e2 · a9850e2
1 parent 8240e22
commit a9850e2
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 19 deletions.
diff --git a/server/modules/survey/repository/surveyRepository.js b/server/modules/survey/repository/surveyRepository.js
@@ -172,6 +172,7 @@ export const fetchUserSurveys = async (
     sortBy = Survey.sortableKeys.dateModified,
     sortOrder = 'DESC',
     includeOwnerEmailAddress = false,
+    onlyOwn = false,
   },
   client = db
 ) => {
@@ -189,6 +190,7 @@ export const fetchUserSurveys = async (
       sortBy,
       sortOrder,
       includeOwnerEmailAddress,
+      onlyOwn,
     }),
     { userUuid: User.getUuid(user), template, search },
     (def) => DB.transformCallback(def, true)

diff --git a/webapp/components/survey/Surveys/HeaderLeft/HeaderLeft.js b/webapp/components/survey/Surveys/HeaderLeft/HeaderLeft.js
@@ -6,37 +6,37 @@ import { ButtonDownload } from '@webapp/components/buttons'
 import { useAuthCanExportSurveysList, useUserIsSystemAdmin } from '@webapp/store/user/hooks'
 
 const HeaderLeft = (props) => {
-  const { handleSearch, onlyOwn = false, search, setOnlyOwn = null, totalCount } = props
+  const { count, handleSearch, onlyOwn = false, search, setOnlyOwn = null } = props
 
   const isSystemAdmin = useUserIsSystemAdmin()
   const canExportSurveys = useAuthCanExportSurveysList()
 
-  if (!totalCount) return null
-
   return (
     <>
-      <TextInput
-        className="surveys__header-left__input-search"
-        defaultValue={search}
-        onChange={(val) => {
-          handleSearch(val)
-        }}
-        placeholder="surveysView.filterPlaceholder"
-      />
-      {isSystemAdmin && setOnlyOwn && (
-        <Checkbox checked={onlyOwn} label="surveysView.onlyOwn" onChange={() => setOnlyOwn(!onlyOwn)} />
-      )}
-      {canExportSurveys && <ButtonDownload href="/api/surveys/export" label="common.csvExport" />}
+      <div className="filter-container">
+        <TextInput
+          className="surveys__header-left__input-search"
+          defaultValue={search}
+          onChange={(val) => {
+            handleSearch(val)
+          }}
+          placeholder="surveysView.filterPlaceholder"
+        />
+        {isSystemAdmin && setOnlyOwn && (
+          <Checkbox checked={onlyOwn} label="surveysView.onlyOwn" onChange={() => setOnlyOwn(!onlyOwn)} />
+        )}
+      </div>
+      {canExportSurveys && count > 0 && <ButtonDownload href="/api/surveys/export" label="common.csvExport" />}
     </>
   )
 }
 
 HeaderLeft.propTypes = {
+  count: PropTypes.number.isRequired,
   handleSearch: PropTypes.func.isRequired,
   onlyOwn: PropTypes.bool,
   search: PropTypes.string.isRequired,
   setOnlyOwn: PropTypes.func,
-  totalCount: PropTypes.number.isRequired,
 }
 
 export default HeaderLeft
diff --git a/webapp/components/survey/Surveys/Surveys.scss b/webapp/components/survey/Surveys/Surveys.scss
@@ -2,9 +2,13 @@
   .table__header {
     column-gap: 5rem;
 
-    input {
-      width: 25rem;
-      padding: 0.5rem;
+    .filter-container {
+      display: flex;
+      gap: 2rem;
+
+      .surveys__header-left__input-search {
+        width: 25rem;
+      }
     }
   }