From 7f90c7365074a4d37e076053868b42c2b90480d1 Mon Sep 17 00:00:00 2001 From: Simone Gotti Date: Tue, 14 May 2019 13:18:09 +0200 Subject: [PATCH] org: add basic org members display --- src/components/orgmembers.vue | 100 ++++++++++++++++++++++++++++++++ src/components/usersettings.vue | 12 ++-- src/router.js | 7 +++ src/util/data.js | 4 ++ src/util/link.js | 3 + src/views/Org.vue | 10 ++++ 6 files changed, 130 insertions(+), 6 deletions(-) create mode 100644 src/components/orgmembers.vue diff --git a/src/components/orgmembers.vue b/src/components/orgmembers.vue new file mode 100644 index 0000000..6a0a9f5 --- /dev/null +++ b/src/components/orgmembers.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/src/components/usersettings.vue b/src/components/usersettings.vue index 138631a..544ea69 100644 --- a/src/components/usersettings.vue +++ b/src/components/usersettings.vue @@ -8,9 +8,9 @@ class="message-body" >Removing a Linked Account will also block all the projects that uses this Linked Account to access their remote repository -
-
- -
+
+
{{ deleteLinkedAccountError }}
- +
No linked accounts
diff --git a/src/router.js b/src/router.js index e97f324..e5f2698 100644 --- a/src/router.js +++ b/src/router.js @@ -12,6 +12,7 @@ import projectgroupsettings from "./components/projectgroupsettings.vue"; import createproject from "./components/createproject.vue"; import createprojectgroup from "./components/createprojectgroup.vue"; import createorganization from "./components/createorganization.vue"; +import orgmembers from "./components/orgmembers.vue"; import runs from "./components/runs.vue"; import run from "./components/run.vue"; import task from "./components/task.vue"; @@ -224,6 +225,12 @@ const router = new VueRouter({ component: projects, props: (route) => ({ ownertype: "org", ownername: route.params.orgname }) }, + { + path: "members", + name: "org members", + component: orgmembers, + props: (route) => ({ orgname: route.params.orgname }) + }, { path: "createprojectgroup", name: "org create project group", diff --git a/src/util/data.js b/src/util/data.js index c869eaa..a22a1bc 100644 --- a/src/util/data.js +++ b/src/util/data.js @@ -46,6 +46,10 @@ export async function fetchCurrentUser() { return await fetch(apiurl(path)); } +export async function fetchOrgMembers(orgref) { + let path = "/orgs/" + orgref + "/members" + return await fetch(apiurl(path)); +} export async function fetchRuns(group, lastrun) { let u = apiurl("/runs"); if (group) { diff --git a/src/util/link.js b/src/util/link.js index 8d332de..5ff6459 100644 --- a/src/util/link.js +++ b/src/util/link.js @@ -35,6 +35,9 @@ export function userLocalRunTaskLink(username, runid, taskid) { return { name: "user local run task", params: { username: username, runid: runid, taskid: taskid } } } +export function orgMembersLink(orgname) { + return { name: "org members", params: { orgname: orgname } } +} // Note, when creating a router link containing a project/projectgroup ref (a // path), unfortunately, we cannot use route name and params since it will path diff --git a/src/views/Org.vue b/src/views/Org.vue index 9bb7a99..81eab03 100644 --- a/src/views/Org.vue +++ b/src/views/Org.vue @@ -28,6 +28,14 @@ Projects +
  • + + +