merge dev into main

src/modules/login/components/LoginMain.vue

@@ -17,16 +17,15 @@
       <div v-else class="v_gapped_container">
         <!-- Institution Shibboleth Login -->
         <b-button
-          v-if="selectedInstitution"
+          v-if="selectedInstitution && !isFirstLogin"
           variant="primary"
           @click="toInstitutionLoginPage"
         >
           {{ selectedInstitution.displayName }}
         </b-button>
-
-        <!-- Other Institutional Account -->
+        <!-- Institutional Account -->
         <b-button variant="primary" @click="switchInstitution">
-          {{ $t("page.login.button_other_institution") }}
+          {{ institutionButtonText }}
         </b-button>
 
         <!-- ORCID Login Button -->
@@ -85,10 +84,15 @@ export default defineComponent({
     },
     redirectUrl(): string | null {
       const query = this.$route.query["redirect"];
-      if (query) {
-        return query as string;
-      }
-      return null;
+      return query ? (query as string) : null;
+    },
+    isFirstLogin(): boolean {
+      return !this.selectedInstitution;
+    },
+    institutionButtonText(): string {
+      return this.isFirstLogin
+        ? this.$t("page.login.button_institution").toString()
+        : this.$t("page.login.button_other_institution").toString();
     },
   },