Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev to main sync #550

Merged
merged 2 commits into from
Oct 9, 2023
Merged

Dev to main sync #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1fb689
feat: added sync onboarding 31 days plus users button (#547)
AnjaliDeshwani Oct 8, 2023
8de36dd
Fix Profile Picture Display for Users without Profile Pictures #532 (…
ishant005 Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 111 additions & 3 deletions __tests__/home/home.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ describe('Home Page', () => {
body: JSON.stringify(superUserData),
});
} else if (
url ===
`https://api.realdevsquad.com/discord-actions/nicknames/sync?dev=true`
url === `https://api.realdevsquad.com/discord-actions/group-idle-7d`
) {
interceptedRequest.respond({
status: 200,
Expand Down Expand Up @@ -62,7 +61,8 @@ describe('Home Page', () => {
}),
});
} else if (
url === `https://api.realdevsquad.com/discord-actions/group-idle-7d`
url ===
`https://api.realdevsquad.com/discord-actions/nicknames/sync?dev=true`
) {
interceptedRequest.respond({
status: 200,
Expand All @@ -78,6 +78,74 @@ describe('Home Page', () => {
message: 'Users Nicknames updated successfully',
}),
});
} else if (
url ===
`https://api.realdevsquad.com/discord-actions/group-onboarding-31d-plus`
) {
interceptedRequest.respond({
status: 200,
ok: true,
contentType: 'application/json',
headers: {
'Access-Control-Allow-Origin': '*',
'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS',
'Access-Control-Allow-Headers': 'Content-Type, Authorization',
},
body: JSON.stringify({
message:
'All Users with 31 Days Plus Onboarding are updated successfully.',
totalOnboardingUsers31DaysCompleted: {
users: [
{
userId: 'R4qppGmmAvJzQXI4jvuc',
discordId: '799600467218923521',
username: 'AnishPawaskar',
},
{
userId: 'W7hqS6BJqWzNW2ejeimC',
discordId: '700385688557715456',
username: 'amandixit',
},
],
count: 2,
},
totalUsersHavingNoDiscordId: 0,
totalArchivedUsers: 0,
usersAlreadyHavingOnboaring31DaysRole: {
users: [],
count: 0,
},
totalOnboarding31dPlusRoleApplied: {
count: 2,
response: [
{
message: 'Role added successfully',
discordId: '799600467218923521',
},
{
message: 'Role added successfully',
discordId: '700385688557715456',
},
],
},
totalOnboarding31dPlusRoleNoteApplied: {
count: 0,
errors: [],
},
totalOnboarding31dPlusRoleRemoved: {
count: 0,
response: [],
},
totalOnboarding31dPlusRoleNotRemoved: {
count: 0,
errors: [],
},
errorInFetchingUserDetailsForRoleRemoval: {
count: 0,
errors: [],
},
}),
});
} else {
interceptedRequest.continue();
}
Expand Down Expand Up @@ -318,4 +386,44 @@ describe('Home Page', () => {
const repoLinkStyle = await page.evaluate((el) => el.style, repoLink);
expect(repoLinkStyle).toBeTruthy();
});

it('should display the Sync Onboarding 31d+ button', async () => {
const syncOnboarding31dPlusUsersButton = await page.$(
'#sync-onboarding-31d-plus-users',
);
expect(syncOnboarding31dPlusUsersButton).toBeTruthy();

const spinnerInsideSyncOnboarding31dPlusUsers =
await syncOnboarding31dPlusUsersButton.$('.spinner');
expect(spinnerInsideSyncOnboarding31dPlusUsers).toBeTruthy();

const syncOnboarding31dPlusUsersUpdate = await page.$(
'#sync-onboarding-31d-plus-users-update',
);
expect(syncOnboarding31dPlusUsersUpdate).toBeTruthy();
});

it('should display the latest sync date when a super_user clicks on the Sync Onboarding 31d+ button', async () => {
await page.evaluate(() => {
document.querySelector('#sync-onboarding-31d-plus-users').click();
});
await page.waitForNetworkIdle();

const latestSyncStatusElement = await page.waitForSelector(
'#sync-onboarding-31d-plus-users-update',
);

expect(latestSyncStatusElement).toBeTruthy();

const latestSyncStatusText = await page.evaluate(
(element) => element.textContent,
latestSyncStatusElement,
);

expect(latestSyncStatusText).not.toBe(`Last Sync: Failed`);
expect(latestSyncStatusText).not.toBe(
`Last Sync: Synced Data Not Available`,
);
expect(latestSyncStatusText).not.toBe(`Last Sync: In progress`);
});
});
6 changes: 4 additions & 2 deletions constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ const SYNC_NICKNAMES = 'sync-nicknames';
const SYNC_NICKNAMES_STATUS_UPDATE = 'sync-nicknames-status-update';
const SYNC_IDLE_7D_Plus_USERS = 'sync-idle-7d-Plus-users';
const SYNC_IDLE_7D_Plus_USERS_UPDATE = 'sync-idle-7d-Plus-users-update';
const SYNC_ONBOARDING_31D_PLUS_USERS = 'sync-onboarding-31d-plus-users';
const SYNC_ONBOARDING_31D_PLUS_USERS_UPDATE =
'sync-onboarding-31d-plus-users-update';
const SYNC_IN_PROGRESS = 'Last Sync: In progress';
const SYNC_SUCCESSFUL = 'Last Sync: Successful';
const SYNC_FAILED = 'Last Sync: Failed';
Expand All @@ -24,7 +27,6 @@ const STATUS_BASE_URL_PROD = 'https://status.realdevsquad.com';
const STATUS_BASE_URL_STAGING = 'https://staging-status.realdevsquad.com';
const STATUS_BASE_URL = STATUS_BASE_URL_PROD;

const dummyPicture =
'https://dashboard.realdevsquad.com/users/images/avatar.png';
const dummyPicture = 'https://dashboard.realdevsquad.com/images/avatar.png';
const USER_MANAGEMENT_URL =
'https://dashboard.realdevsquad.com/users/details/?username=';
8 changes: 8 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,14 @@
</button>
<div class="status" id="sync-nicknames-status-update"></div>
</div>

<div class="button-container">
<button class="action-button" id="sync-onboarding-31d-plus-users">
<span class="spinner"></span>
Sync Onboarding 31d+ Users
</button>
<div class="status" id="sync-onboarding-31d-plus-users-update"></div>
</div>
</section>

<section class="buttonSection">
Expand Down
19 changes: 19 additions & 0 deletions script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ const syncUnverifiedUsersUpdate = document.getElementById(
);
const buttonSection = document.getElementById('sync-buttons');

const syncOnboarding31dPlusUsersButton = document.getElementById(
SYNC_ONBOARDING_31D_PLUS_USERS,
);
const syncOnboarding31dPlusUsersUpdate = document.getElementById(
SYNC_ONBOARDING_31D_PLUS_USERS_UPDATE,
);

function getCurrentTimestamp() {
return new Date().toLocaleString();
}
Expand Down Expand Up @@ -65,6 +72,10 @@ export async function showSuperUserOptions(...privateBtns) {
syncNicknamesStatusUpdate.textContent = `Last Sync: ${
localStorage.getItem('lastSyncNicknames') || 'Synced Data Not Available'
}`;
syncOnboarding31dPlusUsersUpdate.textContent = `Last Sync: ${
localStorage.getItem('lastSyncOnboarding31dPlusUsers') ||
'Synced Data Not Available'
}`;
}
} catch (err) {
console.log(err);
Expand Down Expand Up @@ -334,3 +345,11 @@ addClickEventListener(
syncIdle7dUsersUpdate,
'PUT',
);

addClickEventListener(
syncOnboarding31dPlusUsersButton,
'/discord-actions/group-onboarding-31d-plus',
'lastSyncOnboarding31dPlusUsers',
syncOnboarding31dPlusUsersUpdate,
'PUT',
);
2 changes: 1 addition & 1 deletion users/discord/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="/style.css" />
<link rel="stylesheet" href="/users/discord/style.css" />
<title>Document</title>
<title>Discord Users | Real Dev Squad</title>
</head>
<body>
<header class="header">
Expand Down
Loading