Skip to content

Fix workspace and table handling #176

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

Merged
eagw merged 5 commits into from
Aug 3, 2021
Merged

Fix workspace and table handling #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
66b9e63
Update client code to handle Django workspace API
eagw Jul 26, 2021
e4b6678
Move key/value assignments to individual lines
eagw Aug 2, 2021
657fd14
Consolidate "rows" variable assignment
eagw Aug 2, 2021
a6f64f9
Merge branch 'workspace-api' of github.com:multinet-app/multinet-clie…
eagw Aug 2, 2021
3fd89b8
Use more descriptive variable names in map() calls
eagw Aug 2, 2021
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
24 changes: 18 additions & 6 deletions src/store/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,27 +76,39 @@ const {
async fetchWorkspaces(context) {
const { commit } = rootActionContext(context);
const workspaces = await api.workspaces();
commit.setWorkspaces(workspaces);
commit.setWorkspaces(workspaces.results.map((w) => w.name));
},

async fetchWorkspace(context, workspace: string) {
const { commit } = rootActionContext(context);
commit.unsetCurrentWorkspace();

const nodeTables = await api.tables(workspace, { type: 'node' });
const edgeTables = await api.tables(workspace, { type: 'edge' });
const graphs = await api.graphs(workspace);
const tables = (await api.tables(workspace)).results;
const nodeTables = tables.filter((table) => table.edge === false);
const edgeTables = tables.filter((table) => table.edge === true);

commit.setCurrentWorkspace({
name: workspace, nodeTables, edgeTables, graphs,
name: workspace,
nodeTables: nodeTables.map((table) => table.name),
edgeTables: edgeTables.map((table) => table.name),
graphs: graphs.results.map((graph) => graph.name),
});
},

async fetchUserInfo(context) {
const { commit } = rootActionContext(context);

const info = await api.userInfo();
commit.setUserInfo(info);
try {
const info = await api.userInfo();
commit.setUserInfo(info);
} catch (error) {
if (error.response.status === 401) {
commit.setUserInfo(null);
} else {
throw new Error(error);
}
}
},

async logout(context) {
Expand Down
6 changes: 3 additions & 3 deletions src/views/TableDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ export default Vue.extend({
});

const {
rows,
results: rows,
count,
} = result;

Expand Down Expand Up @@ -272,9 +272,9 @@ export default Vue.extend({
this.headers = headers;

// Roni to convert these lines to computed function
this.tables = await api.tables(this.workspace, {
this.tables = (await api.tables(this.workspace, {
type: 'all',
});
})).results.map((table) => table.name);

this.loading = false;
},
Expand Down