Skip to content

Commit 38847c5

Browse files
luizhf42gustavosbarreto
authored andcommitted
refactor(ui): use main UI's Spinner store in admin
- removes the admin store since they're exactly the same
1 parent 6c4314a commit 38847c5

File tree

4 files changed

+8
-63
lines changed

4 files changed

+8
-63
lines changed

ui/admin/src/api/interceptors.ts

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,27 @@
11
import { AxiosError, AxiosInstance, AxiosResponse, InternalAxiosRequestConfig } from "axios";
2-
import { setActivePinia, createPinia } from "pinia";
3-
import useSpinnerStore from "@admin/store/modules/spinner";
42
import useAuthStore from "@admin/store/modules/auth";
3+
import useSpinnerStore from "@/store/modules/spinner";
54
import router from "../router/index";
65

7-
setActivePinia(createPinia());
8-
96
const onRequest = (config: InternalAxiosRequestConfig): InternalAxiosRequestConfig => {
10-
const spinnerStore = useSpinnerStore();
11-
spinnerStore.setStatus(true);
7+
useSpinnerStore().status = true;
128
return config;
139
};
1410

1511
const onRequestError = (error: AxiosError): Promise<AxiosError> => {
16-
const spinnerStore = useSpinnerStore();
17-
18-
spinnerStore.setStatus(false);
12+
useSpinnerStore().status = false;
1913
return Promise.reject(error);
2014
};
2115

2216
const onResponse = (response: AxiosResponse): AxiosResponse => {
23-
const spinnerStore = useSpinnerStore();
24-
25-
spinnerStore.setStatus(false);
17+
useSpinnerStore().status = false;
2618
return response;
2719
};
2820

2921
const onResponseError = async (error: AxiosError): Promise<AxiosError> => {
30-
const spinnerStore = useSpinnerStore();
31-
const authStore = useAuthStore();
32-
spinnerStore.setStatus(false);
22+
useSpinnerStore().status = false;
3323
if (error.response?.status === 401) {
34-
await authStore.logout();
24+
useAuthStore().logout();
3525
await router.push({ name: "login" });
3626
} else if (error.response?.status === 402) {
3727
await router.push({ name: "license" });

ui/admin/src/layouts/AppLayout.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@
141141
<script setup lang="ts">
142142
import { watch, ref, computed, reactive } from "vue";
143143
import { RouteLocationRaw, useRouter } from "vue-router";
144-
import useSpinnerStore from "@admin/store/modules/spinner";
145144
import useLicenseStore from "@admin/store/modules/license";
146145
import useLayoutStore from "@admin/store/modules/layout";
147146
import useAuthStore from "@admin/store/modules/auth";
147+
import useSpinnerStore from "@/store/modules/spinner";
148148
import Snackbar from "@/components/Snackbar/Snackbar.vue";
149149
import Logo from "../assets/logo-inverted.png";
150150
import { createNewClient } from "../api/http";
@@ -180,7 +180,7 @@ const isLoggedIn = computed(() => authStore.isLoggedIn);
180180
181181
const expiredLicense = computed(() => licenseStore.isExpired);
182182
183-
const hasSpinner = computed(() => spinnerStore.getStatus);
183+
const hasSpinner = computed(() => spinnerStore.status);
184184
const currentUser = computed(() => authStore.currentUser);
185185
const currentRoute = computed(() => router.currentRoute);
186186
const theme = computed(() => layoutStore.theme);

ui/admin/src/store/modules/spinner.ts

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

ui/admin/tests/unit/store/modules/spinner.spec.ts

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

0 commit comments

Comments
 (0)