Rename composable isLoaded to isConfigLoaded

kxk302 · Aug 5, 2023 · 6c19854 · 6c19854
1 parent 6405206
commit 6c19854
Show file tree

Hide file tree

Showing 29 changed files with 40 additions and 46 deletions.
diff --git a/client/src/components/AboutGalaxy.vue b/client/src/components/AboutGalaxy.vue
@@ -12,7 +12,7 @@ import ExternalLink from "@/components/ExternalLink.vue";
 import License from "@/components/License/License.vue";
 import UtcDate from "@/components/UtcDate.vue";
 
-const { config, isLoaded } = useConfig();
+const { config, isConfigLoaded } = useConfig();
 
 const clientBuildDate = __buildTimestamp__ || new Date().toISOString();
 const apiDocsLink = `${getAppRoot()}api/docs`;
@@ -27,7 +27,7 @@ const versionUserDocumentationUrl = computed(() => {
 </script>
 
 <template>
-    <div v-if="isLoaded" class="about-galaxy">
+    <div v-if="isConfigLoaded" class="about-galaxy">
         <Heading h1 :icon="['gxd', 'galaxyLogo']" size="xl">About This Galaxy</Heading>
         <div>
             <!-- Galaxy version (detailed), with a link to the release notes -->

diff --git a/client/src/components/ActivityBar/ActivityBar.test.js b/client/src/components/ActivityBar/ActivityBar.test.js
@@ -12,7 +12,7 @@ import mountTarget from "./ActivityBar.vue";
 jest.mock("composables/config");
 useConfig.mockReturnValue({
     config: {},
-    isLoaded: true,
+    isConfigLoaded: true,
 });
 
 jest.mock("vue-router/composables", () => ({

diff --git a/client/src/components/Collections/common/CollectionEditView.vue b/client/src/components/Collections/common/CollectionEditView.vue
@@ -96,7 +96,7 @@ export default {
         },
     },
     setup() {
-        const { config, isLoaded: isConfigLoaded } = useConfig(true);
+        const { config, isConfigLoaded } = useConfig(true);
         return { config, isConfigLoaded };
     },
     data: function () {

diff --git a/client/src/components/DatasetInformation/DatasetDetails.vue b/client/src/components/DatasetInformation/DatasetDetails.vue
@@ -91,7 +91,7 @@ export default {
         },
     },
     setup() {
-        const { config, isLoaded: isConfigLoaded } = useConfig(true);
+        const { config, isConfigLoaded } = useConfig(true);
         return { config, isConfigLoaded };
     },
     computed: {

diff --git a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue
@@ -178,7 +178,7 @@ export default {
         totalItemsInQuery: { type: Number, default: 0 },
     },
     setup() {
-        const { config, isLoaded: isConfigLoaded } = useConfig(true);
+        const { config, isConfigLoaded } = useConfig(true);
         return { config, isConfigLoaded };
     },
     data: function () {

diff --git a/client/src/components/NewUserWelcome/NewUserWelcome.vue b/client/src/components/NewUserWelcome/NewUserWelcome.vue
@@ -54,7 +54,7 @@ export default {
         Slides,
     },
     setup() {
-        const { config, isLoaded: isConfigLoaded } = useConfig(true);
+        const { config, isConfigLoaded } = useConfig(true);
         return { config, isConfigLoaded };
     },
     data() {

diff --git a/client/src/components/PageDisplay/PageDisplay.vue b/client/src/components/PageDisplay/PageDisplay.vue
@@ -39,7 +39,7 @@ export default {
         },
     },
     setup() {
-        const { config, isLoaded: isConfigLoaded } = useConfig(true);
+        const { config, isConfigLoaded } = useConfig(true);
         return { config, isConfigLoaded };
     },
     data() {

diff --git a/client/src/components/Panels/Common/ToolSection.test.js b/client/src/components/Panels/Common/ToolSection.test.js
@@ -9,7 +9,7 @@ useConfig.mockReturnValue({
     config: {
         toolbox_auto_sort: true,
     },
-    isLoaded: true,
+    isConfigLoaded: true,
 });
 
 const localVue = getLocalVue();

diff --git a/client/src/components/Panels/Common/ToolSection.vue b/client/src/components/Panels/Common/ToolSection.vue
@@ -102,10 +102,10 @@ export default {
         },
     },
     setup() {
-        const { config, isLoaded } = useConfig();
+        const { config, isConfigLoaded } = useConfig();
         return {
             config,
-            isLoaded,
+            isConfigLoaded,
         };
     },
     data() {
@@ -136,7 +136,7 @@ export default {
             // the order set and hope for the best from the integrated
             // panel.
             if (
-                this.isLoaded &&
+                this.isConfigLoaded &&
                 this.config.toolbox_auto_sort === true &&
                 this.sortItems === true &&
                 !this.category.elems.some((el) => el.text !== undefined && el.text !== "")

diff --git a/client/src/components/Panels/ProviderAwareToolBox.vue b/client/src/components/Panels/ProviderAwareToolBox.vue
@@ -28,7 +28,7 @@ export default {
         ToolPanelViewProvider,
     },
     setup() {
-        const { config, isLoaded: isConfigLoaded } = useConfig(true);
+        const { config, isConfigLoaded } = useConfig(true);
         return { config, isConfigLoaded };
     },
     methods: {

diff --git a/client/src/components/Panels/ProviderAwareToolBoxWorkflow.vue b/client/src/components/Panels/ProviderAwareToolBoxWorkflow.vue
@@ -48,7 +48,7 @@ export default {
         },
     },
     setup() {
-        const { config, isLoaded: isConfigLoaded } = useConfig(true);
+        const { config, isConfigLoaded } = useConfig(true);
         return { config, isConfigLoaded };
     },
     methods: {

diff --git a/client/src/components/Panels/ToolBox.test.js b/client/src/components/Panels/ToolBox.test.js
@@ -10,7 +10,7 @@ useConfig.mockReturnValue({
     config: {
         toolbox_auto_sort: true,
     },
-    isLoaded: true,
+    isConfigLoaded: true,
 });
 
 describe("ToolBox", () => {

diff --git a/client/src/components/Sharing/Sharing.vue b/client/src/components/Sharing/Sharing.vue
@@ -307,7 +307,7 @@ export default {
         },
     },
     setup() {
-        const { config, isLoaded: isConfigLoaded } = useConfig(true);
+        const { config, isConfigLoaded } = useConfig(true);
         return { config, isConfigLoaded };
     },
     data() {

diff --git a/client/src/components/StsDownloadButton.vue b/client/src/components/StsDownloadButton.vue
@@ -64,7 +64,7 @@ export default {
         },
     },
     setup() {
-        const { config, isLoaded: isConfigLoaded } = useConfig(true);
+        const { config, isConfigLoaded } = useConfig(true);
         return { config, isConfigLoaded };
     },
     data() {

diff --git a/client/src/components/Tool/ToolCard.test.js b/client/src/components/Tool/ToolCard.test.js
@@ -12,7 +12,7 @@ jest.mock("@/schema");
 jest.mock("@/composables/config", () => ({
     useConfig: jest.fn(() => ({
         config: { enable_tool_source_display: false },
-        isLoaded: true,
+        isConfigLoaded: true,
     })),
 }));
 

diff --git a/client/src/components/Tool/ToolForm.vue b/client/src/components/Tool/ToolForm.vue
@@ -149,7 +149,7 @@ export default {
         },
     },
     setup() {
-        const { config, isLoaded: isConfigLoaded } = useConfig(true);
+        const { config, isConfigLoaded } = useConfig(true);
         return { config, isConfigLoaded };
     },
     data() {

diff --git a/client/src/components/Toolshed/RepositoryDetails/Index.vue b/client/src/components/Toolshed/RepositoryDetails/Index.vue
@@ -94,7 +94,7 @@ export default {
         },
     },
     setup() {
-        const { config, isLoaded: isConfigLoaded } = useConfig(true);
+        const { config, isConfigLoaded } = useConfig(true);
         return { config, isConfigLoaded };
     },
     data() {

diff --git a/client/src/components/Upload/UploadModal.test.js b/client/src/components/Upload/UploadModal.test.js
@@ -17,7 +17,7 @@ jest.mock("@/schema");
 jest.mock("@/composables/config", () => ({
     useConfig: jest.fn(() => ({
         config: {},
-        isLoaded: true,
+        isConfigLoaded: true,
     })),
 }));
 

diff --git a/client/src/components/Upload/UploadModal.vue b/client/src/components/Upload/UploadModal.vue
@@ -13,7 +13,7 @@ import UploadModalContent from "./UploadModalContent";
 const { currentUser } = storeToRefs(useUserStore());
 const { currentHistoryId } = useUserHistories(currentUser);
 
-const { config, isLoaded } = useConfig();
+const { config, isConfigLoaded } = useConfig();
 
 function getDefaultOptions() {
     const baseOptions = {
@@ -27,7 +27,7 @@ function getDefaultOptions() {
         immediateFiles: null,
     };
 
-    const configOptions = isLoaded.value
+    const configOptions = isConfigLoaded.value
         ? {
               uploadPath: config.value.nginx_upload_path ?? `${getAppRoot()}api/tools`,
               chunkUploadSize: config.value.chunk_upload_size,

diff --git a/client/src/components/User/DiskUsage/DiskUsageSummary.vue b/client/src/components/User/DiskUsage/DiskUsageSummary.vue
@@ -56,7 +56,7 @@ export default {
         QuotaUsageSummary,
     },
     setup() {
-        const { config, isLoaded: isConfigLoaded } = useConfig(true);
+        const { config, isConfigLoaded } = useConfig(true);
         return { config, isConfigLoaded };
     },
     data() {

diff --git a/client/src/components/User/ThemeSelector.vue b/client/src/components/User/ThemeSelector.vue
@@ -6,7 +6,7 @@ import { useCurrentTheme } from "@/composables/user";
 import { withPrefix } from "@/utils/redirect";
 
 const { currentTheme, setCurrentTheme } = useCurrentTheme();
-const { config, isLoaded } = useConfig();
+const { config, isConfigLoaded } = useConfig();
 
 const show = ref(false);
 const currentValue = computed({
@@ -23,7 +23,7 @@ function getLogo(themeDetails) {
 }
 
 watch(
-    () => isLoaded.value,
+    () => isConfigLoaded.value,
     () => {
         const themes = Object.keys(config.value.themes);
         show.value = themes?.length > 1 ?? false;

diff --git a/client/src/components/User/UserPreferences.vue b/client/src/components/User/UserPreferences.vue
@@ -155,7 +155,7 @@ export default {
         },
     },
     setup() {
-        const { config, isLoaded: isConfigLoaded } = useConfig(true);
+        const { config, isConfigLoaded } = useConfig(true);
         return { config, isConfigLoaded };
     },
     data() {

diff --git a/client/src/components/Workflow/Editor/Forms/FormTool.test.js b/client/src/components/Workflow/Editor/Forms/FormTool.test.js
@@ -11,7 +11,7 @@ jest.mock("@/schema");
 jest.mock("@/composables/config", () => ({
     useConfig: jest.fn(() => ({
         config: { enable_tool_source_display: false },
-        isLoaded: true,
+        isConfigLoaded: true,
     })),
 }));
 

diff --git a/client/src/components/Workflow/InvocationReport.vue b/client/src/components/Workflow/InvocationReport.vue
@@ -31,7 +31,7 @@ export default {
         },
     },
     setup() {
-        const { config, isLoaded: isConfigLoaded } = useConfig(true);
+        const { config, isConfigLoaded } = useConfig(true);
         return { config, isConfigLoaded };
     },
     data() {

diff --git a/client/src/components/Workflow/Run/WorkflowRunFormSimple.vue b/client/src/components/Workflow/Run/WorkflowRunFormSimple.vue
@@ -80,7 +80,7 @@ export default {
         },
     },
     setup() {
-        const { config, isLoaded: isConfigLoaded } = useConfig(true);
+        const { config, isConfigLoaded } = useConfig(true);
         return { config, isConfigLoaded };
     },
     data() {

diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.test.js b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.test.js
@@ -11,7 +11,7 @@ useConfig.mockReturnValue({
     config: {
         enable_celery_tasks: true,
     },
-    isLoaded: true,
+    isConfigLoaded: true,
 });
 
 const invocationJobsSummaryById = {

diff --git a/client/src/composables/config.ts b/client/src/composables/config.ts
@@ -7,14 +7,14 @@ export function useConfig(fetchOnce = false) {
     const store = useConfigStore();
 
     const config = computed(() => store.config);
-    const isLoaded = computed(() => store.isLoaded);
+    const isConfigLoaded = computed(() => store.isLoaded);
 
     // Anytime we mount this (for now), make sure to load.
     onMounted(() => {
-        if (!(fetchOnce && isLoaded)) {
+        if (!(fetchOnce && isConfigLoaded)) {
             store.loadConfig();
         }
     });
 
-    return { config, isLoaded };
+    return { config, isConfigLoaded };
 }
diff --git a/client/src/composables/toolTrainingMaterial.ts b/client/src/composables/toolTrainingMaterial.ts
@@ -25,12 +25,6 @@ type TrainingMaterialResponse = {
     [id: string]: TrainingDetails;
 };
 
-type Config = {
-    tool_training_recommendations: boolean;
-    tool_training_recommendations_api_url: string;
-    tool_training_recommendations_link: string;
-};
-
 export type TutorialDetails = {
     category: string;
     title: string;
@@ -61,10 +55,10 @@ function mapToolIds() {
 
 /** Training information about given tool */
 export function useToolTrainingMaterial(id: string, name: string, version: string, owner?: string) {
-    const { config, isLoaded }: { config: Ref<Config>; isLoaded: Ref<boolean> } = useConfig();
+    const { config, isConfigLoaded } = useConfig();
     const apiEnabled = computed(() => {
         return Boolean(
-            isLoaded.value &&
+            isConfigLoaded.value &&
                 config.value.tool_training_recommendations &&
                 config.value.tool_training_recommendations_api_url
         );
@@ -73,9 +67,9 @@ export function useToolTrainingMaterial(id: string, name: string, version: strin
     const cacheLoaded = ref(false);
 
     watch(
-        () => isLoaded.value,
+        () => isConfigLoaded.value,
         async () => {
-            if (!isLoaded.value) {
+            if (!isConfigLoaded.value) {
                 return;
             }
 

diff --git a/client/src/entry/analysis/modules/Admin.vue b/client/src/entry/analysis/modules/Admin.vue
@@ -6,7 +6,7 @@ import { useConfig } from "@/composables/config";
 import AdminPanel from "@/components/admin/AdminPanel.vue";
 import FlexPanel from "@/components/Panels/FlexPanel.vue";
 
-const { config, isLoaded } = useConfig();
+const { config, isConfigLoaded } = useConfig();
 
 const panelProperties = computed(() => {
     return {
@@ -18,7 +18,7 @@ const panelProperties = computed(() => {
 </script>
 
 <template>
-    <div v-if="isLoaded" id="columns" class="d-flex">
+    <div v-if="isConfigLoaded" id="columns" class="d-flex">
         <FlexPanel side="left">
             <AdminPanel v-bind="panelProperties" />
         </FlexPanel>