Skip to content

Commit e5f1524

Browse files
fix: not able to deactivate teams
1 parent 8a87569 commit e5f1524

File tree

12 files changed

+345
-1521
lines changed

12 files changed

+345
-1521
lines changed

apps/OpenSign/public/static/js/public-template.bundle.js

Lines changed: 335 additions & 335 deletions
Large diffs are not rendered by default.

apps/OpenSign/src/components/AddTeam.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const AddTeam = (props) => {
1717
const getTeamList = async () => {
1818
setIsLoader(true);
1919
try {
20-
const teams = await Parse.Cloud.run("getteams");
20+
const teams = await Parse.Cloud.run("getteams", { active: true });
2121
const teamRes = JSON.parse(JSON.stringify(teams));
2222
if (teamRes.length > 0) {
2323
const _teamRes = JSON.parse(JSON.stringify(teamRes));

apps/OpenSign/src/components/AddUser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const AddUser = (props) => {
3535

3636
const getTeamList = async () => {
3737
setFormdata((prev) => ({ ...prev, password: generatePassword(12) }));
38-
const teamRes = await Parse.Cloud.run("getteams");
38+
const teamRes = await Parse.Cloud.run("getteams", { active: true });
3939
if (teamRes.length > 0) {
4040
const _teamRes = JSON.parse(JSON.stringify(teamRes));
4141
setTeamList(_teamRes);

apps/OpenSign/src/pages/TeamList.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ const TeamList = () => {
163163
setTeamList(newArray);
164164
try {
165165
await Parse.Cloud.run("updateteam", {
166-
IsActive: !IsActive,
166+
IsActive: !IsActive === false ? "false" : "true",
167167
TeamId: team.objectId
168168
});
169169
// console.log("teamRes ", teamRes);

apps/OpenSign/src/primitives/GetReportDisplay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ const ReportTable = (props) => {
145145
try {
146146
const extUser = JSON.parse(localStorage.getItem("Extand_Class"))?.[0];
147147
if (extUser?.OrganizationId?.objectId) {
148-
const teamtRes = await Parse.Cloud.run("getteams");
148+
const teamtRes = await Parse.Cloud.run("getteams", { active: true });
149149
if (teamtRes.length > 0) {
150150
const _teamRes = JSON.parse(JSON.stringify(teamtRes));
151151
const formatedList = _teamRes.map((x) => ({

apps/OpenSignServer/cloud/parsefunction/getTeams.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
export default async function getTeams(request) {
2+
const activeTeams = request.params.active;
23
if (!request?.user) {
34
throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
45
}
@@ -18,7 +19,9 @@ export default async function getTeams(request) {
1819
className: 'contracts_Organizations',
1920
objectId: extUser.OrganizationId.objectId,
2021
});
21-
teamCls.equalTo('IsActive', true);
22+
if (activeTeams) {
23+
teamCls.equalTo('IsActive', true);
24+
}
2225
teamCls.descending('createdAt');
2326
const teamRes = await teamCls.find({ useMasterKey: true });
2427
if (teamRes && teamRes.length > 0) {

apps/OpenSignServer/cloud/parsefunction/updateTeam.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ export default async function updateTeam(request) {
3333
updateteam.set('Name', Name);
3434
}
3535
if (IsActive) {
36-
updateteam.set('IsActive', IsActive);
36+
const active = IsActive === 'false' ? false : true;
37+
updateteam.set('IsActive', active);
3738
}
3839
const updateTeamRes = await updateteam.save(null, { useMasterKey: true });
3940
return updateTeamRes;

apps/mongo/default-data/legadraGCva._Role.json

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)