Merge branch 'dev' into 'main'

merge dev into main

See merge request !497

src/modules/resource/components/resource-page/metadata/MetadataManagerHeader.vue

@@ -2,11 +2,10 @@
   <b-row id="metadataManagerButtonRowTop" align-h="between">
     <b-col>
       <!-- Input Group with Upload button -->
-      <b-input-group id="metadataManagerUploadMenu">
+      <b-input-group id="metadataManagerUploadMenu" class="d-inline-block">
         <!-- Upload Folder Button -->
         <b-dropdown
           id="buttonSelectFoldersWrapper"
-          size="sm"
           left
           :disabled="uploadDisabled || editableDataUrl"
         >
@@ -39,16 +38,7 @@
         v-if="uploadDisabled && uploadDisabledReason"
         target="metadataManagerUploadMenu"
         triggers="hover"
-        placement="bottom"
-        boundary="viewport"
-      >
-        {{ uploadDisabledReason }}
-      </b-tooltip>
-      <b-tooltip
-        v-if="uploadDisabled && uploadDisabledReason"
-        target="buttonSelectFoldersWrapper"
-        triggers="hover"
-        placement="bottom"
+        placement="bottom-start"
         boundary="viewport"
       >
         {{ uploadDisabledReason }}
@@ -61,7 +51,6 @@
         <b-dropdown
           v-if="!isGuest"
           id="addColumnDropDown"
-          size="sm"
           right
           :disabled="!showDetail || shownFiles.length === 0"
         >
@@ -198,11 +187,11 @@ export default defineComponent({
     },
     uploadDisabledReason(): TranslateResult | null {
       if (this.isUploading)
-        return this.$t("page.resource.metadataManagerBtnCantUploadArchived");
+        return this.$t("page.resource.metadataManagerBtnCantUploadUploading");
       else if (this.readOnly)
         return this.$t("page.resource.metadataManagerBtnCantUploadReadonly");
       else if (this.resource.archived)
-        return this.$t("page.resource.metadataManagerBtnCantUploadUploading");
+        return this.$t("page.resource.metadataManagerBtnCantUploadArchived");
       else if (this.isGitLab && !this.gitlabBranchProps?.canPush)
         return this.$t("resourceType.gitlab.cantPush", {
           branch: this.gitlabBranchProps?.name,