show sort order

PalisadoesFoundation · Nov 2, 2024 · 5085b7f · 5085b7f
1 parent 3d801ca
commit 5085b7f
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 14 deletions.
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
@@ -334,7 +334,6 @@
     "addPeople": "Add People",
     "add": "Add",
     "subTags": "Sub Tags",
-    "assignedToAll": "Tag Assigned to All",
     "successfullyAssignedToPeople": "Tag assigned successfully",
     "errorOccurredWhileLoadingMembers": "Error occured while loading members",
     "userName": "User Name",
@@ -360,7 +359,8 @@
     "collapse": "Collapse",
     "expand": "Expand",
     "tagNamePlaceholder": "Write the name of the tag",
-    "allTags": "All Tags"
+    "allTags": "All Tags",
+    "noMoreMembersFound": "No more members found"
   },
   "userListCard": {
     "addAdmin": "Add Admin",

diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json
@@ -334,7 +334,6 @@
     "addPeople": "Ajouter des personnes",
     "add": "Ajouter",
     "subTags": "Sous-étiquettes",
-    "assignedToAll": "Étiquette attribuée à tous",
     "successfullyAssignedToPeople": "Étiquette attribuée avec succès",
     "errorOccurredWhileLoadingMembers": "Erreur survenue lors du chargement des membres",
     "userName": "Nom d'utilisateur",
@@ -360,7 +359,8 @@
     "collapse": "Réduire",
     "expand": "Développer",
     "tagNamePlaceholder": "Écrire le nom de l'étiquette",
-    "allTags": "Toutes les étiquettes"
+    "allTags": "Toutes les étiquettes",
+    "noMoreMembersFound": "Aucun autre membre trouvé"
   },
   "userListCard": {
     "addAdmin": "Ajouter un administrateur",

diff --git a/public/locales/hi/translation.json b/public/locales/hi/translation.json
@@ -334,7 +334,6 @@
     "addPeople": "लोगों को जोड़ें",
     "add": "जोड़ें",
     "subTags": "उप-टैग्स",
-    "assignedToAll": "सभी को टैग असाइन किया गया",
     "successfullyAssignedToPeople": "टैग सफलतापूर्वक असाइन किया गया",
     "errorOccurredWhileLoadingMembers": "सदस्यों को लोड करते समय त्रुटि हुई",
     "userName": "उपयोगकर्ता नाम",
@@ -360,7 +359,8 @@
     "collapse": "संक्षिप्त करें",
     "expand": "विस्तारित करें",
     "tagNamePlaceholder": "टैग का नाम लिखें",
-    "allTags": "सभी टैग"
+    "allTags": "सभी टैग",
+    "noMoreMembersFound": "कोई और सदस्य नहीं मिला"
   },
   "userListCard": {
     "addAdmin": "व्यवस्थापक जोड़ें",

diff --git a/public/locales/sp/translation.json b/public/locales/sp/translation.json
@@ -334,7 +334,6 @@
     "addPeople": "Agregar Personas",
     "add": "Agregar",
     "subTags": "Subetiquetas",
-    "assignedToAll": "Etiqueta asignada a todos",
     "successfullyAssignedToPeople": "Etiqueta asignada con éxito",
     "errorOccurredWhileLoadingMembers": "Error al cargar los miembros",
     "userName": "Nombre de usuario",
@@ -360,7 +359,8 @@
     "collapse": "Colapsar",
     "expand": "Expandir",
     "tagNamePlaceholder": "Escribe el nombre de la etiqueta",
-    "allTags": "Todas las etiquetas"
+    "allTags": "Todas las etiquetas",
+    "noMoreMembersFound": "No se encontraron más miembros"
   },
   "userListCard": {
     "joined": "Unido",

diff --git a/public/locales/zh/translation.json b/public/locales/zh/translation.json
@@ -334,7 +334,6 @@
     "addPeople": "添加人员",
     "add": "添加",
     "subTags": "子标签",
-    "assignedToAll": "标签分配给所有人",
     "successfullyAssignedToPeople": "标签分配成功",
     "errorOccurredWhileLoadingMembers": "加载成员时出错",
     "userName": "用户名",
@@ -360,7 +359,8 @@
     "collapse": "收起",
     "expand": "展开",
     "tagNamePlaceholder": "输入标签名称",
-    "allTags": "所有标签"
+    "allTags": "所有标签",
+    "noMoreMembersFound": "未找到更多成员"
   },
   "userListCard": {
     "addAdmin": "添加管理员",

diff --git a/src/components/AddPeopleToTag/AddPeopleToTag.tsx b/src/components/AddPeopleToTag/AddPeopleToTag.tsx
@@ -363,7 +363,7 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
                             alignItems="center"
                             justifyContent="center"
                           >
-                            {t('assignedToAll')}
+                            {t('noMoreMembersFound')}
                           </Stack>
                         ),
                       }}

diff --git a/src/screens/ManageTag/ManageTag.tsx b/src/screens/ManageTag/ManageTag.tsx
@@ -380,7 +380,9 @@ function ManageTag(): JSX.Element {
                   data-testid="sortPeople"
                 >
                   <SortIcon className={'me-1'} />
-                  {tCommon('sort')}
+                  {assignedMemberSortOrder === 'DESCENDING'
+                    ? tCommon('Latest')
+                    : tCommon('Oldest')}
                 </Dropdown.Toggle>
                 <Dropdown.Menu>
                   <Dropdown.Item

diff --git a/src/screens/OrganizationTags/OrganizationTags.tsx b/src/screens/OrganizationTags/OrganizationTags.tsx
@@ -324,7 +324,9 @@ function OrganizationTags(): JSX.Element {
                   data-testid="sortTags"
                 >
                   <SortIcon className={'me-1'} />
-                  {tCommon('sort')}
+                  {tagSortOrder === 'DESCENDING'
+                    ? tCommon('Latest')
+                    : tCommon('Oldest')}
                 </Dropdown.Toggle>
                 <Dropdown.Menu>
                   <Dropdown.Item

diff --git a/src/screens/SubTags/SubTags.tsx b/src/screens/SubTags/SubTags.tsx
@@ -304,7 +304,9 @@ function SubTags(): JSX.Element {
                   data-testid="sortTags"
                 >
                   <SortIcon className={'me-1'} />
-                  {tCommon('sort')}
+                  {tagSortOrder === 'DESCENDING'
+                    ? tCommon('Latest')
+                    : tCommon('Oldest')}
                 </Dropdown.Toggle>
                 <Dropdown.Menu>
                   <Dropdown.Item