Skip to content

Commit

Permalink
Merge pull request #18956 from itisAliRH/workflowinvocationheader-use…
Browse files Browse the repository at this point in the history
…rstore-fix

Fix `WorkflowInvocationHeader` import type and current user errors
  • Loading branch information
mvdbeek authored Oct 9, 2024
2 parents 01512cb + e70109f commit 0409898
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { createTestingPinia } from "@pinia/testing";
import { getFakeRegisteredUser } from "@tests/test-data";
import { shallowMount } from "@vue/test-utils";
import flushPromises from "flush-promises";
import { getLocalVue } from "tests/jest/helpers";
Expand Down Expand Up @@ -81,14 +82,9 @@ async function mountWorkflowInvocationHeader(ownsWorkflow = true, hasReturnBtn =
});

const userStore = useUserStore();
userStore.currentUser = {
id: "1",
email: "[email protected]",
tags_used: [],
isAnonymous: false,
total_disk_usage: 0,
userStore.currentUser = getFakeRegisteredUser({
username: ownsWorkflow ? WORKFLOW_OWNER : OTHER_USER,
};
});

return { wrapper };
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ import { faClock } from "@fortawesome/free-regular-svg-icons";
import { faArrowLeft, faEdit, faHdd, faSitemap, faUpload } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
import { BAlert, BButton, BButtonGroup } from "bootstrap-vue";
import { storeToRefs } from "pinia";
import { computed, ref } from "vue";
import { RouterLink } from "vue-router";
import { isRegisteredUser } from "@/api";
import type { WorkflowInvocationElementView } from "@/api/invocations";
import { useWorkflowInstance } from "@/composables/useWorkflowInstance";
import { useUserStore } from "@/stores/userStore";
import { Workflow } from "@/stores/workflowStore";
import type { Workflow } from "@/stores/workflowStore";
import localize from "@/utils/localization";
import { errorMessageAsString } from "@/utils/simple-error";
Expand All @@ -31,10 +33,10 @@ const props = defineProps<Props>();
const { workflow } = useWorkflowInstance(props.invocation.workflow_id);
const userStore = useUserStore();
const { currentUser, isAnonymous } = storeToRefs(useUserStore());
const owned = computed(() => {
if (userStore.currentUser && workflow.value) {
return userStore.currentUser.username === workflow.value.owner;
if (isRegisteredUser(currentUser.value) && workflow.value) {
return currentUser.value.username === workflow.value.owner;
} else {
return false;
}
Expand Down Expand Up @@ -129,7 +131,7 @@ function getWorkflowName(): string {
v-else
v-b-tooltip.hover.noninteractive
size="sm"
:disabled="userStore.isAnonymous"
:disabled="isAnonymous"
:title="localize('Import this workflow')"
:icon="faUpload"
variant="outline-primary"
Expand Down

0 comments on commit 0409898

Please sign in to comment.