Merge branch 'develop' into dev-anurag

PalisadoesFoundation · Nov 11, 2024 · a13091d · a13091d
2 parents df508dd + 626fe45
commit a13091d
Show file tree

Hide file tree

Showing 12 changed files with 1,016 additions and 491 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Count number of lines
         run: |
           chmod +x ./.github/workflows/countline.py
-          ./.github/workflows/countline.py --lines 600 --exclude_files src/screens/LoginPage/LoginPage.tsx src/GraphQl/Queries/Queries.ts src/screens/OrgList/OrgList.tsx src/GraphQl/Mutations/mutations.ts src/components/EventListCard/EventListCardModals.tsx src/components/TagActions/TagActionsMocks.ts src/utils/interfaces.ts
+          ./.github/workflows/countline.py --lines 600 --exclude_files src/screens/LoginPage/LoginPage.tsx src/GraphQl/Queries/Queries.ts src/screens/OrgList/OrgList.tsx src/GraphQl/Mutations/mutations.ts src/components/EventListCard/EventListCardModals.tsx src/components/TagActions/TagActionsMocks.ts src/utils/interfaces.ts src/screens/MemberDetail/MemberDetail.tsx
 
       - name: Get changed TypeScript files
         id: changed-files

diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
@@ -984,7 +984,12 @@
     "delete": "delete",
     "saveChanges": "saveChanges",
     "joined": "joined",
-    "talawaApiUnavailable": "talawaApiUnavailable"
+    "talawaApiUnavailable": "talawaApiUnavailable",
+    "unassignUserTag": "Unassign Tag",
+    "unassignUserTagMessage": "Do you want to remove the tag from this user?",
+    "successfullyUnassigned": "Tag unassigned from user",
+    "tagsAssigned": "Tags Assigned",
+    "noTagsAssigned": "No Tags Assigned"
   },
   "people": {
     "title": "People",

diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json
@@ -955,7 +955,12 @@
     "delete": "Supprimer",
     "saveChanges": "Enregistrer les modifications",
     "joined": "Rejoint",
-    "talawaApiUnavailable": "API Talawa non disponible"
+    "talawaApiUnavailable": "API Talawa non disponible",
+    "unassignUserTag": "Désassigner l'étiquette",
+    "unassignUserTagMessage": "Voulez-vous retirer l'étiquette de cet utilisateur?",
+    "successfullyUnassigned": "Étiquette retirée de l'utilisateur",
+    "tagsAssigned": "étiquettes assignées",
+    "noTagsAssigned": "Aucune étiquette assignée"
   },
   "people": {
     "title": "Personnes",

diff --git a/public/locales/hi/translation.json b/public/locales/hi/translation.json
@@ -955,7 +955,12 @@
     "delete": "हटाएं",
     "saveChanges": "परिवर्तन सहेजें",
     "joined": "शामिल हुए",
-    "talawaApiUnavailable": "Talawa API अनुपलब्ध"
+    "talawaApiUnavailable": "Talawa API अनुपलब्ध",
+    "unassignUserTag": "टैग को हटाएं",
+    "unassignUserTagMessage": "क्या आप इस उपयोगकर्ता से टैग हटाना चाहते हैं?",
+    "successfullyUnassigned": "उपयोगकर्ता से टैग हटा दिया गया",
+    "tagsAssigned": "टैग सौंपे गए",
+    "noTagsAssigned": "कोई टैग सौंपा नहीं गया"
   },
   "people": {
     "title": "लोग",

diff --git a/public/locales/sp/translation.json b/public/locales/sp/translation.json
@@ -956,7 +956,12 @@
     "addedAsAdmin": "El usuario se agrega como administrador.",
     "talawaApiUnavailable": "El servicio Talawa-API no está disponible. Compruebe amablemente su conexión de red y espere un momento.",
     "deleteUser": "Eliminar usuario",
-    "userType": "Tipo de usuario"
+    "userType": "Tipo de usuario",
+    "unassignUserTag": "Desasignar Etiqueta",
+    "unassignUserTagMessage": "¿Desea eliminar la etiqueta de este usuario?",
+    "successfullyUnassigned": "Etiqueta desasignada del usuario",
+    "tagsAssigned": "Etiquetas asignadas",
+    "noTagsAssigned": "No se asignaron etiquetas"
   },
   "userLogin": {
     "login": "Acceso",

diff --git a/public/locales/zh/translation.json b/public/locales/zh/translation.json
@@ -955,7 +955,12 @@
     "delete": "删除",
     "saveChanges": "保存更改",
     "joined": "已加入",
-    "talawaApiUnavailable": "塔拉瓦 API 不可用"
+    "talawaApiUnavailable": "塔拉瓦 API 不可用",
+    "unassignUserTag": "取消分配标签",
+    "unassignUserTagMessage": "您想从此用户中删除标签吗？",
+    "successfullyUnassigned": "标签已从用户中取消分配",
+    "tagsAssigned": "已分配标签",
+    "noTagsAssigned": "未分配标签"
   },
   "userLogin": {
     "login": "登录",

diff --git a/src/GraphQl/Queries/Queries.ts b/src/GraphQl/Queries/Queries.ts
@@ -510,7 +510,13 @@ export const USER_ORGANIZATION_LIST = gql`
 
 // To take the details of a user
 export const USER_DETAILS = gql`
-  query User($id: ID!) {
+  query User(
+    $id: ID!
+    $after: String
+    $before: String
+    $first: PositiveInt
+    $last: PositiveInt
+  ) {
     user(id: $id) {
       user {
         _id
@@ -539,6 +545,29 @@ export const USER_DETAILS = gql`
           city
           state
         }
+        tagsAssignedWith(
+          after: $after
+          before: $before
+          first: $first
+          last: $last
+        ) {
+          edges {
+            node {
+              _id
+              name
+              parentTag {
+                _id
+              }
+            }
+          }
+          pageInfo {
+            startCursor
+            endCursor
+            hasNextPage
+            hasPreviousPage
+          }
+          totalCount
+        }
         registeredEvents {
           _id
         }

diff --git a/src/screens/ManageTag/UnassignUserTagModal.tsx b/src/screens/ManageTag/UnassignUserTagModal.tsx
@@ -10,7 +10,7 @@ export interface InterfaceUnassignUserTagModalProps {
   unassignUserTagModalIsOpen: boolean;
   toggleUnassignUserTagModal: () => void;
   handleUnassignUserTag: () => Promise<void>;
-  t: TFunction<'translation', 'manageTag'>;
+  t: TFunction<'translation', 'manageTag' | 'memberDetail'>;
   tCommon: TFunction<'common', undefined>;
 }
 

diff --git a/src/screens/MemberDetail/MemberDetail.module.css b/src/screens/MemberDetail/MemberDetail.module.css
@@ -117,7 +117,7 @@
   width: 60%;
 }
 .cardBody {
-  max-height: 72vh;
+  height: 35vh;
   overflow-y: scroll;
 }
 
@@ -672,3 +672,15 @@ input::file-selector-button {
 .Outline {
   outline: 1px solid var(--bs-gray-400);
 }
+
+.tagLink {
+  font-weight: 600;
+  color: var(--bs-gray-700);
+  cursor: pointer;
+}
+
+.tagLink:hover {
+  font-weight: 800;
+  color: var(--bs-blue);
+  text-decoration: underline;
+}