Skip to content

Commit

Permalink
feat(state): little reword + load user organizations in root resolver
Browse files Browse the repository at this point in the history
  • Loading branch information
NicolasRichel committed Oct 29, 2021
1 parent 430741a commit b88fe63
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
4 changes: 4 additions & 0 deletions src/router/resolvers/root.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
import { useProjects } from "@/state/projects.js";
import { useSpaces } from "@/state/spaces.js";
import { useUser } from "@/state/user.js";
import { useOrganizations } from "@/state/organizations.js";

let rootResolved = false;

const rootResolver = async () => {
const { loadUser } = useUser();
const { retrieveUserOrganizations: loadUserOrganizations } =
useOrganizations();
const { loadUserSpaces } = useSpaces();
const { loadUserProjects } = useProjects();

if (!rootResolved) {
await loadUser();
await loadUserOrganizations();
await loadUserSpaces();
await loadUserProjects();
rootResolved = true;
Expand Down
2 changes: 1 addition & 1 deletion src/services/OrganizationService.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { privateApiClient } from "./api-client.js";
import { ERRORS, ErrorService, RuntimeError } from "./ErrorService.js";

class OrganizationService {
async fetchOrganizations() {
async fetchUserOrganizations() {
try {
return await privateApiClient.get("/organization");
} catch (error) {
Expand Down
10 changes: 5 additions & 5 deletions src/state/organizations.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ const state = reactive({
organizationSpaces: []
});

const retrieveOrganizations = async () => {
const organizations = await OrganizationService.fetchOrganizations();
const retrieveUserOrganizations = async () => {
const organizations = await OrganizationService.fetchUserOrganizations();
state.userOrganizations = organizations;
return organizations;
};

const fecthOrganizationSpaces = async organization => {
const retrieveOrganizationSpaces = async organization => {
const spaces = await OrganizationService.fecthOrganizationSpaces(
organization
);
Expand Down Expand Up @@ -62,8 +62,8 @@ export function useOrganizations() {
// References
...toRefs(readonlyState),
// Methods
retrieveOrganizations,
fecthOrganizationSpaces,
retrieveUserOrganizations,
retrieveOrganizationSpaces,
createOrganization,
updateOrganization,
deleteOrganization,
Expand Down
4 changes: 2 additions & 2 deletions src/views/platform-subscription/PlatformSubscription.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ export default {
const displayedInvoices = ref([]);
const empty = ref(false);
const { retrieveOrganizations } = useOrganizations();
const { retrieveUserOrganizations } = useOrganizations();
const organizations = ref([]);
onMounted(async () => {
organizations.value = await retrieveOrganizations();
organizations.value = await retrieveUserOrganizations();
});
return {
Expand Down

0 comments on commit b88fe63

Please sign in to comment.