change wording of the client side storage handling

client/src/api/fileSources.ts

@@ -14,23 +14,23 @@ export type FileSourceTypesDetail = Record<FileSourceTypes, { icon: IconDefiniti
 export const templateTypes: FileSourceTypesDetail = {
     azure: {
         icon: faCloud,
-        message: "This is a remote file source plugin based on the Azure service.",
+        message: "This is a repository plugin based on the Azure service.",
     },
     dropbox: {
         icon: faDropbox,
-        message: "This is a file source plugin that connects with the commercial Dropbox service.",
+        message: "This is a repository plugin that connects with the commercial Dropbox service.",
     },
     ftp: {
         icon: faNetworkWired,
-        message: "This is a remote file source plugin based on the FTP protocol.",
+        message: "This is a repository plugin based on the FTP/S protocol.",
     },
     googledrive: {
         icon: faGoogleDrive,
-        message: "This is a file source plugin that connects with the commercial Google Drive service.",
+        message: "This is a  repository plugin that connects with the commercial Google Drive service.",
     },
     onedata: {
         icon: faNetworkWired,
-        message: "This is a remote file source plugin based on the Onedata service.",
+        message: "This is a repository plugin based on the Onedata service.",
     },
     posix: {
         icon: faFolderTree,
@@ -40,23 +40,23 @@ export const templateTypes: FileSourceTypesDetail = {
     s3fs: {
         icon: faAws,
         message:
-            "This is a remote file source plugin based on the Amazon Simple Storage Service (S3) interface. The AWS interface has become an industry standard and many storage vendors support it and use it to expose 'object' based storage.",
+            "This is a repository plugin based on the Amazon Simple Storage Service (S3) interface. The AWS interface has become an industry standard and many storage vendors support it and use it to expose 'object' based storage.",
     },
     webdav: {
         icon: faNetworkWired,
-        message: "This is a remote file source plugin based on the WebDAV protocol.",
+        message: "This is a repository plugin based on the WebDAV protocol.",
     },
     elabftw: {
         icon: faNetworkWired,
-        message: "This is a remote file source that connects with an eLabFTW instance.",
+        message: "This is a repository plugin that connects with an eLabFTW instance.",
     },
     inveniordm: {
         icon: faNetworkWired,
-        message: "This is a remote file source that connects with an InvenioRDM instance.",
+        message: "This is a repository plugin that connects with an InvenioRDM instance.",
     },
     zenodo: {
         icon: faNetworkWired,
-        message: "This is a remote file source that connects with the Zenodo instance.",
+        message: "This is a repository plugin that connects with the Zenodo instance.",
     },
 };
 

client/src/api/objectStores.templates.ts

@@ -4,7 +4,7 @@ import { faCloud, faHdd, faNetworkWired, type IconDefinition } from "font-awesom
 import type { components } from "@/api/schema";
 import { contains } from "@/utils/filtering";
 
-const typeMessage = (type: string) => `This template produces storage locations of type ${type}.`;
+const typeMessage = (type: string) => `This template produces a new Galaxy Storage of type ${type}.`;
 
 export type ObjectStoreTemplateSummary = components["schemas"]["ObjectStoreTemplateSummary"];
 export type ObjectStoreTemplateSummaries = ObjectStoreTemplateSummary[];

client/src/components/Common/ExportForm.vue

@@ -28,7 +28,7 @@ const name = ref<string>("");
 
 const canExport = computed(() => name.value.length > 0 && directory.value.length > 0);
 
-const directoryDescription = computed(() => localize(`Select a 'remote files' directory to export ${props.what} to.`));
+const directoryDescription = computed(() => localize(`Select a 'repository' to export ${props.what} to.`));
 
 const nameDescription = computed(() => localize("Give the exported file a name."));
 

client/src/components/Common/RDMCredentialsInfo.vue

@@ -24,14 +24,14 @@ const repositoryName = props.selectedRepository?.label ?? "the selected reposito
         <span v-if="isPrivateFileSource && selectedRepository">
             in your
             <RouterLink :to="`/file_source_instances/${selectedRepository.id}/edit`" target="_blank">
-                Remote File Source settings
+                Repository settings
             </RouterLink>
         </span>
         <span v-else>
             <span v-if="!isPrivateFileSource">
                 in your <RouterLink to="/user/information" target="_blank">preferences page</RouterLink>
             </span>
-            or in your <RouterLink to="/file_sources/index" target="_blank"> remote file sources </RouterLink> section
+            or in your <RouterLink to="/file_sources/index" target="_blank"> repositories </RouterLink> section
         </span>
         to be able to export. You can also define some default options for the export in those settings, like the public
         name you want to associate with your records.

client/src/components/Dataset/DatasetStorage/RelocateDialog.vue

@@ -36,7 +36,7 @@ const toWhat = "This dataset will be relocated to";
                 :object-store="fromObjectStore"
                 @click="emit('closeModal')" />
         </b-button-group>
-        <p class="relocate-to">Select new storage location for the dataset:</p>
+        <p class="relocate-to">Select new Galaxy storage for the dataset:</p>
         <b-button-group vertical size="lg" class="select-button-group">
             <ObjectStoreSelectButton
                 v-for="objectStore in targetObjectStores"

client/src/components/FileSources/FileSourceTypeSpan.vue

@@ -4,17 +4,17 @@ import { computed } from "vue";
 import type { FileSourceTypes } from "@/api/fileSources";
 
 const MESSAGES = {
-    posix: "This is a simple path based file source that assumes the all the relevant paths are already mounted on the Galaxy server and target worker nodes.",
-    s3fs: "This is a remote file source plugin based on the Amazon Simple Storage Service (S3) interface. The AWS interface has become an industry standard and many storage vendors support it and use it to expose 'object' based storage.",
-    azure: "This is a remote file source plugin based on the Azure service.",
-    onedata: "This is a remote file source plugin based on the Onedata service.",
-    ftp: "This is a remote file source plugin based on the FTP protocol.",
-    webdav: "This is a remote file source plugin based on the WebDAV protocol.",
-    dropbox: "This is a file source plugin that connects with the commercial Dropbox service.",
-    googledrive: "This is a file source plugin that connects with the commercial Google Drive service.",
-    elabftw: "This is a remote file source that connects with an eLabFTW instance.",
-    inveniordm: "This is a remote file source that connects with an InvenioRDM instance.",
-    zenodo: "This is a remote file source that connects with https://zenodo.org/.",
+    posix: "This is a simple path based repository plugin that assumes the all the relevant paths are already mounted on the Galaxy server and target worker nodes.",
+    s3fs: "This is a repository plugin based on the Amazon Simple Storage Service (S3) interface. The AWS interface has become an industry standard and many storage vendors support it and use it to expose 'object' based storage.",
+    azure: "This is a repository plugin based on the Azure service.",
+    onedata: "This is a repository plugin based on the Onedata service.",
+    ftp: "This is a repository plugin based on the FTP protocol.",
+    webdav: "This is a repository plugin based on the WebDAV protocol.",
+    dropbox: "This is a repository plugin that connects with the commercial Dropbox service.",
+    googledrive: "This is a repository plugin that connects with the commercial Google Drive service.",
+    elabftw: "This is a repository plugin that connects with an eLabFTW instance.",
+    inveniordm: "This is a repository plugin that connects with an InvenioRDM instance.",
+    zenodo: "This is a repository plugin that connects with https://zenodo.org/.",
 };
 
 interface Props {

client/src/components/FileSources/Instances/CreateInstance.vue

@@ -29,7 +29,7 @@ const props = defineProps<Props>();
 
 const breadcrumbItems = computed(() => [
     { title: "User Preferences", to: "/user" },
-    { title: "Remote File Sources", to: "/file_source_instances/index" },
+    { title: "My Repositories", to: "/file_source_instances/index" },
     { title: "Create New", to: "/file_source_instances/create" },
     { title: template.value?.name || "Option" },
 ]);

client/src/components/FileSources/Instances/ManageIndex.vue

@@ -41,7 +41,7 @@ const { ConfigurationTestSummaryModal, showTestResults, testResults, test, testi
 <template>
     <div>
         <ConfigurationTestSummaryModal v-model="showTestResults" :error="testingError" :test-results="testResults" />
-        <ManageIndexHeader header="Remote File Sources" :message="message" create-route="/file_source_instances/create">
+        <ManageIndexHeader header="My Repositories" :message="message" create-route="/file_source_instances/create">
         </ManageIndexHeader>
         <BTable
             id="user-file-sources-index"

client/src/components/FileSources/Templates/CreateUserFileSource.vue

@@ -11,7 +11,7 @@ import SourceOptionsList from "@/components/ConfigTemplates/SourceOptionsList.vu
 
 const breadcrumbItems = [
     { title: "User Preferences", to: "/user" },
-    { title: "Remote File Sources", to: "/file_source_instances/index" },
+    { title: "My Repositories", to: "/file_source_instances/index" },
     { title: "Create New" },
 ];
 

client/src/components/History/Archiving/HistoryArchiveExportSelector.vue

@@ -207,12 +207,12 @@ function onArchiveHistoryWithExport() {
 
         <BModal v-model="isExportDialogOpen" title="Export history to permanent storage" size="lg" hide-footer>
             <BTabs card vertical lazy class="export-option-tabs">
-                <BTab id="to-remote-file-tab" title="To Remote File Source" active>
+                <BTab id="to-remote-file-tab" title="To Repository" active>
                     <p>
-                        <b>Exporting to a remote file source</b> will create a compressed archive of the history
-                        contents, copy it to a remote location (e.g. an FTP server) and create an export record with
-                        this information that will be associated with the archived history. You will be able to recreate
-                        the history later by importing it from the export record.
+                        <b>Exporting to a repository</b> will create a compressed archive of the history contents, copy
+                        it to a remote location (e.g. an FTP server) and create an export record with this information
+                        that will be associated with the archived history. You will be able to recreate the history
+                        later by importing it from the export record.
                     </p>
                     <ExportToFileSourceForm what="history" @export="doExportToFileSourceWithPrefix" />
                 </BTab>

client/src/components/History/Content/Dataset/DatasetMiscInfo.vue

@@ -9,7 +9,7 @@ const showErrorHelp = ref(false);
 const sharingError = ref(false);
 
 // old sharable error: Attempted to create shared output datasets in objectstore with sharing disabled
-// new sharable error: Job attempted to create sharable output datasets in a storage location with sharing disabled
+// new sharable error: Job attempted to create sharable output datasets in a Galaxy storage with sharing disabled
 const sharingErrorRex: RegExp = /with sharing disabled/g;
 const knownErrors = [{ regex: sharingErrorRex, modalRef: sharingError }];
 
@@ -40,7 +40,7 @@ function showHelp() {
         <b-modal v-if="sharingError" v-model="showErrorHelp" title="Dataset Sharing Misconfigured" ok-only>
             <p>
                 This error message indicates that your history is setup to allow sharing but your job was run in a
-                configuration to target a storage location that explicitly disables sharing.
+                configuration to target a Galaxy storage that explicitly disables sharing.
             </p>
             <p>
                 To fix this configure your history so that new datasets are private or target a different storage

client/src/components/History/CurrentHistory/HistoryCounter.vue

@@ -69,9 +69,9 @@ const canManageStorage = computed(
 
 const storageLocationTitle = computed(() => {
     if (isOnlyPreference.value) {
-        return "History Preferred Storage Location";
+        return "History Preferred Storage";
     } else {
-        return "History Storage Location";
+        return "History Storage";
     }
 });
 

client/src/components/History/CurrentHistory/PreferredStorePopover.vue

@@ -26,9 +26,9 @@ const preferredObjectStoreId = computed(() => {
 
 const title = computed(() => {
     if (isOnlyPreference.value) {
-        return "Preferred Storage Location";
+        return "Preferred Storage";
     } else {
-        return "Storage Location";
+        return "Storage";
     }
 });
 </script>
@@ -40,15 +40,15 @@ const title = computed(() => {
             <p>
                 <b
                     >This option only affects new datasets created in this history. Existing history datasets will
-                    remain at their current storage location.</b
+                    remain at their current storage.</b
                 >
             </p>
 
             <p v-if="historyPreferredObjectStoreId" class="history-preferred-object-store-inherited">
-                This storage location has been set at the history level.
+                This storage has been set at the history level.
             </p>
             <p v-else class="history-preferred-object-store-not-inherited">
-                This storage location has been inherited from your user preferences (set in
+                This storage has been inherited from your user preferences (set in
                 <router-link to="/user">User -> Preferences</router-link> -> {{ title }}). If that option is updated,
                 this history will target that new default.
             </p>

client/src/components/History/CurrentHistory/SelectPreferredStore.vue

@@ -57,7 +57,7 @@ async function handleSubmit(preferredObjectStoreId: string | null, isPrivate: bo
         if (!historyPrivate) {
             if (
                 confirm(
-                    "Your history is set to create sharable datasets, but the target storage location is private. Change the history configuration so new datasets are private by default?"
+                    "Your history is set to create sharable datasets, but the target storage is private. Change the history configuration so new datasets are private by default?"
                 )
             ) {
                 try {

client/src/components/History/Export/HistoryExport.vue

@@ -245,7 +245,7 @@ function updateExportParams(newParams: ExportParams) {
 
                         <BAlert show variant="warning">
                             History archive downloads can expire and are removed at regular intervals. For permanent
-                            storage, export to a <b>remote file</b> or download and then import the archive on another
+                            storage, export to a <b>repository</b> or download and then import the archive on another
                             Galaxy server.
                         </BAlert>
 
@@ -268,12 +268,12 @@ function updateExportParams(newParams: ExportParams) {
                     <BTab
                         v-if="hasWritableFileSources"
                         id="file-source-tab"
-                        title="to remote file"
+                        title="to repository"
                         title-link-class="tab-export-to-file">
                         <p>
                             If you need a "more permanent" way of storing your history archive you can export it
-                            directly to one of the available remote file sources here. You will be able to re-import it
-                            later as long as it remains available on the remote server.
+                            directly to one of the available repositories. You will be able to re-import it later as
+                            long as it remains available on the remote server.
                         </p>
 
                         <ExportToFileSourceForm

client/src/components/HistoryExport/Index.vue

@@ -29,7 +29,7 @@ const props = defineProps<ExportHistoryProps>();
                             <ToLink :history-id="props.historyId" />
                         </b-card-text>
                     </BTab>
-                    <BTab title="to a remote file" title-link-class="tab-export-to-file">
+                    <BTab title="to a repository" title-link-class="tab-export-to-file">
                         <b-card-text>
                             <ToRemoteFile :history-id="props.historyId" />
                         </b-card-text>

client/src/components/HistoryExport/ToLink.vue

@@ -20,7 +20,7 @@
             <p>Use this link to download the archive or import it on another Galaxy server.</p>
             <b-alert show variant="warning"
                 >History archives are removed at regular intervals. For permanent storage download the archive, export
-                to a remote file or import the archive on another Galaxy server.
+                to a repository or import the archive on another Galaxy server.
             </b-alert>
         </div>
         <div v-else-if="hasReadyExport">

client/src/components/HistoryImport.vue

@@ -45,7 +45,7 @@
                             <FontAwesomeIcon icon="upload" />
                         </b-form-radio>
                         <b-form-radio v-if="hasFileSources" value="remoteFilesUri">
-                            Select a remote file (e.g. Galaxy's FTP)
+                            Select a repository (e.g. Galaxy's FTP)
                             <FontAwesomeIcon icon="folder-open" />
                         </b-form-radio>
                     </b-form-radio-group>
@@ -66,7 +66,7 @@
                 <b-form-group v-else-if="importType === 'upload'" label="Archived History File">
                     <b-form-file v-model="sourceFile" />
                 </b-form-group>
-                <b-form-group v-show="importType === 'remoteFilesUri'" label="Remote File">
+                <b-form-group v-show="importType === 'remoteFilesUri'" label="Repository">
                     <!-- using v-show so we can have a persistent ref and launch dialog on select -->
                     <FilesInput ref="filesInput" v-model="sourceRemoteFilesUri" />
                 </b-form-group>

client/src/components/ObjectStore/DescribeObjectStore.vue

@@ -47,15 +47,15 @@ export default {
         <div>
             <span v-localize>{{ what }}</span>
             <span v-if="storageInfo.name" class="display-os-by-name">
-                a Galaxy <ObjectStoreRestrictionSpan :is-private="isPrivate" /> storage location named
+                a Galaxy <ObjectStoreRestrictionSpan :is-private="isPrivate" /> storage named
                 <b>{{ storageInfo.name }}</b>
             </span>
             <span v-else-if="storageInfo.object_store_id" class="display-os-by-id">
-                a Galaxy <ObjectStoreRestrictionSpan :is-private="isPrivate" /> storage location with id
+                a Galaxy <ObjectStoreRestrictionSpan :is-private="isPrivate" /> storage with id
                 <b>{{ storageInfo.object_store_id }}</b>
             </span>
             <span v-else class="display-os-default">
-                the default configured Galaxy <ObjectStoreRestrictionSpan :is-private="isPrivate" /> storage location </span
+                the default configured Galaxy <ObjectStoreRestrictionSpan :is-private="isPrivate" /> storage </span
             >.
         </div>
         <ObjectStoreBadges :badges="badges"> </ObjectStoreBadges>
@@ -67,7 +67,7 @@ export default {
             <b-spinner v-if="isLoadingUsage" />
             <QuotaUsageBar v-else-if="quotaUsage" :quota-usage="quotaUsage" :embedded="true" />
         </QuotaSourceUsageProvider>
-        <div v-else>Galaxy has no quota configured for this storage location.</div>
+        <div v-else>Galaxy has no quota configured for this storage.</div>
         <ConfigurationMarkdown
             v-if="storageInfo.description"
             :markdown="storageInfo.description"

client/src/components/ObjectStore/Instances/CreateForm.vue

@@ -13,7 +13,7 @@ interface CreateFormProps {
     uuid?: string;
 }
 const props = defineProps<CreateFormProps>();
-const title = "Create a new storage location for your data";
+const title = "Create a new Galaxy storage for your data";
 
 const emit = defineEmits<{
     (e: "created", objectStore: UserConcreteObjectStore): void;