more changes

PalisadoesFoundation · Oct 28, 2024 · 9bc25d7 · 9bc25d7
1 parent 6a79d51
commit 9bc25d7
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 20 deletions.
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
@@ -353,7 +353,11 @@
     "tagUpdationSuccess": "Tag updated successfully",
     "tagRemovalSuccess": "Tag deleted successfully",
     "noTagSelected": "No Tag Selected",
-    "changeNameToEdit": "Change the name to make an update"
+    "changeNameToEdit": "Change the name to make an update",
+    "selectTag": "Select Tag",
+    "collapse": "Collapse",
+    "expand": "Expand",
+    "tagNamePlaceholder": "Write the name of the tag"
   },
   "userListCard": {
     "addAdmin": "Add Admin",

diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json
@@ -353,7 +353,11 @@
     "tagUpdationSuccess": "Étiquette mise à jour avec succès",
     "tagRemovalSuccess": "Étiquette supprimée avec succès",
     "noTagSelected": "Aucun tag sélectionné",
-    "changeNameToEdit": "Modifiez le nom pour faire une mise à jour"
+    "changeNameToEdit": "Modifiez le nom pour faire une mise à jour",
+    "selectTag": "Sélectionner le tag",
+    "collapse": "Réduire",
+    "expand": "Développer",
+    "tagNamePlaceholder": "Écrire le nom du tag"
   },
   "userListCard": {
     "addAdmin": "Ajouter un administrateur",

diff --git a/public/locales/hi/translation.json b/public/locales/hi/translation.json
@@ -353,7 +353,11 @@
     "tagUpdationSuccess": "टैग सफलतापूर्वक अपडेट की गई",
     "tagRemovalSuccess": "टैग सफलतापूर्वक हटाई गई",
     "noTagSelected": "कोई टैग चयनित नहीं",
-    "changeNameToEdit": "अपडेट करने के लिए नाम बदलें"
+    "changeNameToEdit": "अपडेट करने के लिए नाम बदलें",
+    "selectTag": "टैग चुनें",
+    "collapse": "संक्षिप्त करें",
+    "expand": "विस्तारित करें",
+    "tagNamePlaceholder": "टैग का नाम लिखें"
   },
   "userListCard": {
     "addAdmin": "व्यवस्थापक जोड़ें",

diff --git a/public/locales/sp/translation.json b/public/locales/sp/translation.json
@@ -353,7 +353,11 @@
     "tagUpdationSuccess": "Etiqueta actualizada con éxito",
     "tagRemovalSuccess": "Etiqueta eliminada con éxito",
     "noTagSelected": "Ninguna etiqueta seleccionada",
-    "changeNameToEdit": "Cambia el nombre para hacer una actualización"
+    "changeNameToEdit": "Cambia el nombre para hacer una actualización",
+    "selectTag": "Seleccionar etiqueta",
+    "collapse": "Colapsar",
+    "expand": "Expandir",
+    "tagNamePlaceholder": "Escribe el nombre de la etiqueta"
   },
   "userListCard": {
     "joined": "Unido",

diff --git a/public/locales/zh/translation.json b/public/locales/zh/translation.json
@@ -353,7 +353,11 @@
     "tagUpdationSuccess": "标签更新成功",
     "tagRemovalSuccess": "标签删除成功",
     "noTagSelected": "未选择标签",
-    "changeNameToEdit": "更改名称以进行更新"
+    "changeNameToEdit": "更改名称以进行更新",
+    "selectTag": "选择标签",
+    "collapse": "收起",
+    "expand": "展开",
+    "tagNamePlaceholder": "输入标签名称"
   },
   "userListCard": {
     "addAdmin": "添加管理员",

diff --git a/src/components/TagActions/TagActions.tsx b/src/components/TagActions/TagActions.tsx
@@ -87,7 +87,7 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
   );
 
   const [checkedTagId, setCheckedTagId] = useState<string | null>(null);
-  const [uncheckedTagId, setUnheckedTagId] = useState<string | null>(null);
+  const [uncheckedTagId, setUncheckedTagId] = useState<string | null>(null);
 
   // tags that we have selected to assigned
   const [selectedTags, setSelectedTags] = useState<InterfaceTagData[]>([]);
@@ -148,11 +148,11 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
 
   const addAncestorTags = (tagId: string): void => {
     setCheckedTagId(tagId);
-    setUnheckedTagId(null);
+    setUncheckedTagId(null);
   };
 
   const removeAncestorTags = (tagId: string): void => {
-    setUnheckedTagId(tagId);
+    setUncheckedTagId(tagId);
     setCheckedTagId(null);
   };
 
@@ -315,13 +315,7 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
               : t('removeFromTags')}
           </Modal.Title>
         </Modal.Header>
-        <Form
-          onSubmitCapture={(e) =>
-            tagActionType === 'assignToTags'
-              ? handleTagAction(e)
-              : handleTagAction(e)
-          }
-        >
+        <Form onSubmitCapture={handleTagAction}>
           <Modal.Body className="pb-0">
             {orgUserTagsLoading ? (
               <Loader size="sm" />
@@ -341,10 +335,11 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
                         className={`badge bg-dark-subtle text-secondary-emphasis lh-lg my-2 ms-2 d-flex align-items-center ${styles.tagBadge}`}
                       >
                         {tag.name}
-                        <i
-                          className={`${styles.removeFilterIcon} fa fa-times ms-2 text-body-tertiary`}
+                        <button
+                          className={`${styles.removeFilterIcon} fa fa-times ms-2 text-body-tertiary border-0 bg-transparent`}
                           onClick={() => deSelectTag(tag)}
                           data-testid={`clearSelectedTag${tag._id}`}
+                          aria-label={t('remove')}
                         />
                       </div>
                     ))

diff --git a/src/components/TagActions/TagActionsMocks.ts b/src/components/TagActions/TagActionsMocks.ts
@@ -389,7 +389,7 @@ export const MOCKS = [
     result: {
       data: {
         getUserTag: {
-          name: 'tag1',
+          name: 'userTag 1',
           childTags: {
             edges: [
               {

diff --git a/src/components/TagActions/TagNode.tsx b/src/components/TagActions/TagNode.tsx
@@ -11,7 +11,7 @@ import styles from './TagActions.module.css';
 import InfiniteScroll from 'react-infinite-scroll-component';
 
 /**
- * Props for the `AssignToTags` component.
+ * Props for the `TagNode` component.
  */
 interface InterfaceTagNodeProps {
   tag: InterfaceTagData;
@@ -122,6 +122,7 @@ const TagNode: React.FC<InterfaceTagNodeProps> = ({
               className="me-3"
               style={{ cursor: 'pointer' }}
               data-testid={`expandSubTags${tag._id}`}
+              aria-label={expanded ? t('collapse') : t('expand')}
             >
               {expanded ? '▼' : '▶'}
             </span>
@@ -132,6 +133,7 @@ const TagNode: React.FC<InterfaceTagNodeProps> = ({
               className="me-2"
               onChange={handleCheckboxChange}
               data-testid={`checkTag${tag._id}`}
+              aria-label={t('selectTag')}
             />
             <i className="fa fa-folder mx-2" />{' '}
           </>
@@ -145,6 +147,7 @@ const TagNode: React.FC<InterfaceTagNodeProps> = ({
               className="ms-1 me-2"
               onChange={handleCheckboxChange}
               data-testid={`checkTag${tag._id}`}
+              aria-label={tag.name}
             />
             <i className="fa fa-tag mx-2" />{' '}
           </>

diff --git a/src/screens/ManageTag/ManageTag.tsx b/src/screens/ManageTag/ManageTag.tsx
@@ -628,7 +628,7 @@ function ManageTag(): JSX.Element {
             <Form.Label htmlFor="tagName">{t('tagName')}</Form.Label>
             <Form.Control
               type="name"
-              id="orgname"
+              id="tagName"
               className="mb-3"
               placeholder={t('tagNamePlaceholder')}
               data-testid="tagNameInput"