Skip to content
Closed
Changes from all commits
Commits
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
55 changes: 41 additions & 14 deletions app/Controllers/Http/WorkspaceController.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,18 @@ class WorkspaceController {
});
}

const data = request.all();
const toUpdate = request.all();
const { id } = params;
const { name, services, iconUrl } = toUpdate;

// Update data in database
await Workspace.query()
.where('workspaceId', id)
.where('userId', auth.user.id)
.update({
name: data.name,
services: JSON.stringify(data.services),
name: name,
services: JSON.stringify(services),
data: JSON.stringify({ iconUrl }),
});

// Get updated row
Expand All @@ -93,13 +95,24 @@ class WorkspaceController {
.where('userId', auth.user.id)
.fetch()
).rows[0];

let data = {};
try {
if (typeof data === 'string') {
data = JSON.parse(workspace.data);
}
} catch (error) {
console.warn(
`[WorkspaceController] edit ${workspace.workspaceId}. Error parsing data JSON`,
error,
);
}
return response.send({
id: workspace.workspaceId,
name: data.name,
order: workspace.order,
services: data.services,
userId: auth.user.id,
iconUrl: data?.iconUrl || '',
});
}

Expand Down Expand Up @@ -153,16 +166,30 @@ class WorkspaceController {
// Convert to array with all data Franz wants
let workspacesArray = [];
if (workspaces) {
workspacesArray = workspaces.map(workspace => ({
id: workspace.workspaceId,
name: workspace.name,
order: workspace.order,
services:
typeof workspace.services === 'string'
? JSON.parse(workspace.services)
: workspace.services,
userId: auth.user.id,
}));
workspacesArray = workspaces.map(workspace => {
let data = {};
try {
if (typeof data === 'string') {
data = JSON.parse(workspace.data);
}
} catch (error) {
console.warn(
`[WorkspaceController] list ${workspace.workspaceId}. Error parsing data JSON`,
error,
);
}
return {
id: workspace.workspaceId,
name: workspace.name,
order: workspace.order,
services:
typeof workspace.services === 'string'
? JSON.parse(workspace.services)
: workspace.services,
userId: auth.user.id,
iconUrl: data?.iconUrl || '',
};
});
}

return response.send(workspacesArray);
Expand Down