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

changed projectTabs adminUserId to true but still not updating in Database #1605

Merged
merged 7 commits into from
Jun 14, 2024
Merged

changed projectTabs adminUserId to true but still not updating in Database #1605

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b0e10b5
changed projectTabs adminUserId to true but still not updating in Dat…
lovelgeorge99 Jun 4, 2024
17c0fbb
Change for Project Ownship
lovelgeorge99 Jun 5, 2024
3aaf0fe
Merge branch 'staging' into change-admin#1602
lovelgeorge99 Jun 5, 2024
87051be
i have fixed the issue for transfer project ownership in adminBro and…
lovelgeorge99 Jun 5, 2024
e0ef866
Merge branch 'change-admin#1602' of https://github.com/Giveth/impact-…
lovelgeorge99 Jun 5, 2024
f4e1a71
removed unnecessary comments and changed email to admin id
lovelgeorge99 Jun 6, 2024
5464896
Merge branch 'staging' of https://github.com/Giveth/impact-graph into…
lovelgeorge99 Jun 6, 2024
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
19 changes: 13 additions & 6 deletions src/server/adminJs/tabs/projectsTab.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,13 +650,15 @@ export const projectsTab = {
},
},
adminUserId: {
type: 'Number',
isVisible: {
list: true,
filter: false,
show: true,
edit: false,
edit: true,
new: false,
},
position: 1,
},
contacts: {
isVisible: {
Expand Down Expand Up @@ -706,9 +708,7 @@ export const projectsTab = {
totalTraceDonations: {
isVisible: { list: false, filter: false, show: true, edit: true },
},
admin: {
isVisible: { list: false, filter: false, show: true, edit: true },
},

description: {
isVisible: {
list: false,
Expand All @@ -728,6 +728,7 @@ export const projectsTab = {
show: true,
edit: false,
},

components: {
show: adminJs.bundle('./components/ClickableLink'),
},
Expand Down Expand Up @@ -883,6 +884,7 @@ export const projectsTab = {
edit: {
isAccessible: ({ currentAdmin }) =>
canAccessProjectAction({ currentAdmin }, ResourceActions.EDIT),

before: async (request: AdminJsRequestInterface) => {
const { verified, reviewStatus } = request.payload;
const statusChanges: string[] = [];
Expand Down Expand Up @@ -945,8 +947,13 @@ export const projectsTab = {
NOTIFICATIONS_EVENT_NAMES.PROJECT_NOT_REVIEWED,
);
}
if (Number(request?.payload?.admin) !== project?.adminUserId) {

if (
Number(request?.payload?.adminUserId) !== project?.adminUserId
) {
const newID = request?.payload?.adminUserId;
request.payload.adminChanged = true;
request.payload.newAdminId = newID;
}

// We put these status changes in payload, so in after hook we would know to send notification for users
Expand All @@ -966,7 +973,7 @@ export const projectsTab = {
if (project) {
if (request?.record?.params?.adminChanged) {
const adminUser = await User.findOne({
where: { id: project.adminUserId },
where: { id: request?.record?.params?.newAdminId },
});
project.adminUser = adminUser!;
await project.save();
Expand Down
Loading