Skip to content

Commit

Permalink
Merge branch 'group-chat-features' of https://github.com/disha1202/ta…
Browse files Browse the repository at this point in the history
…lawa-admin into group-chat-features
  • Loading branch information
disha1202 committed Oct 29, 2024
2 parents 431e77a + ad599a9 commit e520ed8
Show file tree
Hide file tree
Showing 17 changed files with 1,050 additions and 60 deletions.
12 changes: 10 additions & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ jobs:
echo "Error: Source and Target Branches are the same. Please ensure they are different."
exit 1
Check-Unauthorized-Changes:
Check-Sensitive-Files:
if: ${{ github.actor != 'dependabot[bot]' }}
name: Checks if no unauthorized files are changed
name: Checks if sensitive files have been changed without authorization
runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand Down Expand Up @@ -111,6 +111,14 @@ jobs:
LICENSE
setup.ts
.coderabbit.yaml
CODE_OF_CONDUCT.md
CODE_STYLE.md
CONTRIBUTING.md
DOCUMENTATION.md
INSTALLATION.md
ISSUE_GUIDELINES.md
PR_GUIDELINES.md
README.md
- name: List all changed unauthorized files
if: steps.changed-unauth-files.outputs.any_changed == 'true' || steps.changed-unauth-files.outputs.any_deleted == 'true'
Expand Down
9 changes: 8 additions & 1 deletion public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,14 @@
"successfullyUnassigned": "Tag unassigned from user",
"addPeople": "Add People",
"add": "Add",
"subTags": "Sub Tags"
"subTags": "Sub Tags",
"assignedToAll": "Tag Assigned to All",
"successfullyAssignedToPeople": "Tag assigned successfully",
"assignPeople": "Assign",
"errorOccurredWhileLoadingMembers": "Error occured while loading members",
"userName": "User Name",
"actions": "Actions",
"noOneSelected": "No One Selected"
},
"userListCard": {
"addAdmin": "Add Admin",
Expand Down
9 changes: 8 additions & 1 deletion public/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,14 @@
"successfullyUnassigned": "Étiquette retirée de l'utilisateur",
"addPeople": "Ajouter des personnes",
"add": "Ajouter",
"subTags": "Sous-étiquettes"
"subTags": "Sous-étiquettes",
"assignedToAll": "Étiquette attribuée à tous",
"successfullyAssignedToPeople": "Étiquette attribuée avec succès",
"assignPeople": "Attribuer",
"errorOccurredWhileLoadingMembers": "Erreur survenue lors du chargement des membres",
"userName": "Nom d'utilisateur",
"actions": "Actions",
"noOneSelected": "Personne sélectionnée"
},
"userListCard": {
"addAdmin": "Ajouter un administrateur",
Expand Down
9 changes: 8 additions & 1 deletion public/locales/hi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,14 @@
"successfullyUnassigned": "उपयोगकर्ता से टैग हटा दिया गया",
"addPeople": "लोगों को जोड़ें",
"add": "जोड़ें",
"subTags": "उप-टैग्स"
"subTags": "उप-टैग्स",
"assignedToAll": "सभी को टैग असाइन किया गया",
"successfullyAssignedToPeople": "टैग सफलतापूर्वक असाइन किया गया",
"assignPeople": "असाइन करें",
"errorOccurredWhileLoadingMembers": "सदस्यों को लोड करते समय त्रुटि हुई",
"userName": "उपयोगकर्ता नाम",
"actions": "क्रियाएँ",
"noOneSelected": "कोई चयनित नहीं"
},
"userListCard": {
"addAdmin": "व्यवस्थापक जोड़ें",
Expand Down
9 changes: 8 additions & 1 deletion public/locales/sp/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,14 @@
"successfullyUnassigned": "Etiqueta desasignada del usuario",
"addPeople": "Agregar Personas",
"add": "Agregar",
"subTags": "Subetiquetas"
"subTags": "Subetiquetas",
"assignedToAll": "Etiqueta asignada a todos",
"successfullyAssignedToPeople": "Etiqueta asignada con éxito",
"assignPeople": "Asignar",
"errorOccurredWhileLoadingMembers": "Error al cargar los miembros",
"userName": "Nombre de usuario",
"actions": "Acciones",
"noOneSelected": "Nadie seleccionado"
},
"userListCard": {
"joined": "Unido",
Expand Down
9 changes: 8 additions & 1 deletion public/locales/zh/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,14 @@
"successfullyUnassigned": "标签已从用户中取消分配",
"addPeople": "添加人员",
"add": "添加",
"subTags": "子标签"
"subTags": "子标签",
"assignedToAll": "标签分配给所有人",
"successfullyAssignedToPeople": "标签分配成功",
"assignPeople": "分配",
"errorOccurredWhileLoadingMembers": "加载成员时出错",
"userName": "用户名",
"actions": "操作",
"noOneSelected": "未选择任何人"
},
"userListCard": {
"addAdmin": "添加管理员",
Expand Down
15 changes: 15 additions & 0 deletions src/GraphQl/Mutations/TagMutations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,18 @@ export const REMOVE_USER_TAG = gql`
}
}
`;

/**
* GraphQL mutation to add people to tag.
*
* @param tagId - Id of the tag to be assigned.
* @param userIds - Ids of the users to assign to.
*/

export const ADD_PEOPLE_TO_TAG = gql`
mutation AddPeopleToUserTag($tagId: ID!, $userIds: [ID!]!) {
addPeopleToUserTag(input: { tagId: $tagId, userIds: $userIds }) {
_id
}
}
`;
42 changes: 42 additions & 0 deletions src/GraphQl/Queries/userTagQueries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,48 @@ export const USER_TAG_SUB_TAGS = gql`
}
`;

/**
* GraphQL query to retrieve organization members that aren't assigned a certain tag.
*
* @param id - The ID of the tag.
* @returns The list of organization members.
*/

export const USER_TAGS_MEMBERS_TO_ASSIGN_TO = gql`
query GetMembersToAssignTo(
$id: ID!
$after: String
$before: String
$first: PositiveInt
$last: PositiveInt
) {
getUserTag(id: $id) {
name
usersToAssignTo(
after: $after
before: $before
first: $first
last: $last
) {
edges {
node {
_id
firstName
lastName
}
}
pageInfo {
startCursor
endCursor
hasNextPage
hasPreviousPage
}
totalCount
}
}
}
`;

/**
* GraphQL query to retrieve the ancestor tags of a certain tag.
*
Expand Down
77 changes: 77 additions & 0 deletions src/components/AddPeopleToTag/AddPeopleToTag.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
.errorContainer {
min-height: 100vh;
}

.errorMessage {
margin-top: 25%;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
}

.errorIcon {
transform: scale(1.5);
color: var(--bs-danger);
margin-bottom: 1rem;
}

.tableHeader {
background-color: var(--bs-primary);
color: var(--bs-white);
font-size: 1rem;
}

.rowBackground {
background-color: var(--bs-white);
max-height: 120px;
}

.scrollContainer {
max-height: 100px; /* Adjust as needed */
overflow-y: auto;
margin-bottom: 1rem;
}

.memberBadge {
display: flex;
align-items: center;
padding: 5px 10px;
border-radius: 12px;
background-color: #f8f9fa; /* Light background */
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
max-width: calc(100% - 30px); /* Ensure it fits within the container */
}

.removeFilterIcon {
cursor: pointer;
}

.scrollContainer {
max-height: 350px; /* Set your desired max height */
overflow-y: auto; /* Enable vertical scrolling */
}

/* SimpleLoader.css */
.simple-loader {
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
}

.spinner {
width: 40px;
height: 40px;
border: 4px solid rgba(0, 0, 0, 0.1);
border-top-color: #3498db;
border-radius: 50%;
animation: spin 0.6s linear infinite;
}

@keyframes spin {
to {
transform: rotate(360deg);
}
}
Loading

0 comments on commit e520ed8

Please sign in to comment.