Skip to content
Draft
Show file tree
Hide file tree
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
8 changes: 3 additions & 5 deletions client/src/components/User/UserPreferencesForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import { BAlert } from "bootstrap-vue";
import { storeToRefs } from "pinia";
import { computed, ref, watchEffect } from "vue";
import { useRouter } from "vue-router/composables";

import { isRegisteredUser } from "@/api";
import {
Expand All @@ -18,6 +17,7 @@ import LoadingSpan from "@/components/LoadingSpan.vue";

interface Props {
formId: UserPreferencesKey;
id?: string;
}

const props = defineProps<Props>();
Expand All @@ -29,13 +29,11 @@ const breadcrumbItems = computed(() => [{ title: "User Preferences", to: "/user"
const userStore = useUserStore();
const { currentUser } = storeToRefs(userStore);

const router = useRouter();

const loading = ref(true);

const model = computed<UserPreferencesModel | undefined>(() => {
if (router.currentRoute.params.id) {
return getUserPreferencesModel(router.currentRoute.params.id);
if (props.id) {
return getUserPreferencesModel(props.id);
} else if (isRegisteredUser(currentUser.value)) {
return getUserPreferencesModel(currentUser.value.id);
} else {
Expand Down
5 changes: 4 additions & 1 deletion client/src/entry/analysis/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,10 @@ export function getRouter(Galaxy) {
{
path: "user/:formId",
component: UserPreferencesForm,
props: true,
props: (route) => ({
formId: route.params.formId,
id: route.query.id,
}),
redirect: redirectAnon(),
},
{
Expand Down
Loading