From 091c0612e3f672d89803d7a035616a04575a3eb2 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Wed, 24 Apr 2024 12:40:29 +0200
Subject: [PATCH] Small fixes [SCI-10381][SCI-10665][SCI-10666]

---
 .../javascripts/shared/inline_editing.js      |  1 +
 .../vue/shared/access_modal/edit.vue          | 76 +++++++++----------
 .../vue/shared/string_with_ellipsis.vue       | 19 +++--
 3 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/app/assets/javascripts/shared/inline_editing.js b/app/assets/javascripts/shared/inline_editing.js
index 657fe46a4..dd8813a5c 100644
--- a/app/assets/javascripts/shared/inline_editing.js
+++ b/app/assets/javascripts/shared/inline_editing.js
@@ -155,6 +155,7 @@ let inlineEditing = (function() {
       if (inputField(container).attr('disabled')) {
         saveAllEditFields();
         let input = inputField(container);
+        input.val(container.attr('data-original-name'));
         input.attr('disabled', false)
           .removeClass('hidden')
           .focus();
diff --git a/app/javascript/vue/shared/access_modal/edit.vue b/app/javascript/vue/shared/access_modal/edit.vue
index e85655a5c..71ead9411 100644
--- a/app/javascript/vue/shared/access_modal/edit.vue
+++ b/app/javascript/vue/shared/access_modal/edit.vue
@@ -1,44 +1,44 @@
 <template>
   <div>
-    <div v-if="roles.length > 0 && visible && default_role" class="p-2 flex items-center gap-2 border-solid border-0 border-b border-b-sn-sleepy-grey">
-      <div>
-        <img src="/images/icon/team.png" class="rounded-full w-8 h-8">
-      </div>
-      <div>
-        {{ i18n.t('access_permissions.everyone_else', { team_name: params.object.team }) }}
-      </div>
-      <GeneralDropdown @open="loadUsers" @close="closeFlyout">
-        <template v-slot:field>
-          <i class="sn-icon sn-icon-info"></i>
-        </template>
-        <template v-slot:flyout>
-          <perfect-scrollbar class="flex flex-col max-h-96 max-w-[280px] relative pr-4 gap-y-px">
-            <div v-for="user in this.autoAssignedUsers"
-                :key="user.attributes.user.id"
-                :title="user.attributes.user.name"
-                class="rounded px-3 py-2.5 flex items-center hover:no-underline leading-5 gap-2">
-              <img :src="user.attributes.user.avatar_url" class="w-6 h-6 rounded-full">
-              <span class="truncate">{{ user.attributes.user.name }}</span>
-            </div>
-          </perfect-scrollbar>
-        </template>
-      </GeneralDropdown>
-      <MenuDropdown
-        v-if="params.object.top_level_assignable && params.object.urls.update_access"
-        class="ml-auto"
-        :listItems="rolesFromatted(default_role)"
-        :btnText="this.roles.find((role) => role[0] == default_role)[1]"
-        :position="'right'"
-        :caret="true"
-        @setRole="(...args) => this.changeDefaultRole(...args)"
-        @removeRole="() => this.changeDefaultRole()"
-      ></MenuDropdown>
-      <div class="ml-auto btn btn-light pointer-events-none" v-else>
-        {{ this.roles.find((role) => role[0] == default_role)[1] }}
-        <div class="h-6 w-6"></div>
-      </div>
-    </div>
     <perfect-scrollbar class="h-[50vh] relative">
+      <div v-if="roles.length > 0 && visible && default_role" class="p-2 flex items-center gap-2 border-solid border-0 border-b border-b-sn-sleepy-grey">
+        <div>
+          <img src="/images/icon/team.png" class="rounded-full w-8 h-8">
+        </div>
+        <div>
+          {{ i18n.t('access_permissions.everyone_else', { team_name: params.object.team }) }}
+        </div>
+        <GeneralDropdown @open="loadUsers" @close="closeFlyout">
+          <template v-slot:field>
+            <i class="sn-icon sn-icon-info"></i>
+          </template>
+          <template v-slot:flyout>
+            <perfect-scrollbar class="flex flex-col max-h-96 max-w-[280px] relative pr-4 gap-y-px">
+              <div v-for="user in this.autoAssignedUsers"
+                  :key="user.attributes.user.id"
+                  :title="user.attributes.user.name"
+                  class="rounded px-3 py-2.5 flex items-center hover:no-underline leading-5 gap-2">
+                <img :src="user.attributes.user.avatar_url" class="w-6 h-6 rounded-full">
+                <span class="truncate">{{ user.attributes.user.name }}</span>
+              </div>
+            </perfect-scrollbar>
+          </template>
+        </GeneralDropdown>
+        <MenuDropdown
+          v-if="params.object.top_level_assignable && params.object.urls.update_access"
+          class="ml-auto"
+          :listItems="rolesFromatted(default_role)"
+          :btnText="this.roles.find((role) => role[0] == default_role)[1]"
+          :position="'right'"
+          :caret="true"
+          @setRole="(...args) => this.changeDefaultRole(...args)"
+          @removeRole="() => this.changeDefaultRole()"
+        ></MenuDropdown>
+        <div class="ml-auto btn btn-light pointer-events-none" v-else>
+          {{ this.roles.find((role) => role[0] == default_role)[1] }}
+          <div class="h-6 w-6"></div>
+        </div>
+      </div>
       <div v-for="userAssignment in manuallyAssignedUsers"
             :key="userAssignment.id"
             class="p-2 flex items-center gap-2">
diff --git a/app/javascript/vue/shared/string_with_ellipsis.vue b/app/javascript/vue/shared/string_with_ellipsis.vue
index b846b30fd..801979ce3 100644
--- a/app/javascript/vue/shared/string_with_ellipsis.vue
+++ b/app/javascript/vue/shared/string_with_ellipsis.vue
@@ -1,11 +1,18 @@
 <template>
 <div :title="text" class="flex items-center">
-  <div class="truncate">
-    {{ text.slice(0, endCharacters * -1) }}
-  </div>
-  <div class="shrink-0">
-    {{ text.slice(text.length - endCharacters) }}
-  </div>
+  <template v-if="text.length <= endCharacters">
+    <div class="shrink-0">
+      {{ text }}
+    </div>
+  </template>
+  <template v-else>
+    <div class="truncate">
+      {{ text.slice(0, endCharacters * -1) }}
+    </div>
+    <div class="shrink-0">
+      {{ text.slice(text.length - endCharacters) }}
+    </div>
+  </template>
 </div>
 </template>