Browse Source

Feature: Desktop view - Ticket detail view subscriber improvements.

Co-authored-by: Dusan Vuckovic <dv@zammad.com>
Co-authored-by: Ivan Stamenkovic <is@zammad.com>
Co-authored-by: Martin Gruner <mg@zammad.com>
Martin Gruner 4 months ago
parent
commit
c69000bfda

+ 1 - 3
app/frontend/apps/desktop/components/Form/fields/FieldAgent/FieldAgentOptionIcon.vue

@@ -13,9 +13,7 @@ defineProps<{
   <CommonUserAvatar
     v-if="option.user"
     :entity="option.user"
-    :class="{
-      'opacity-30': option.disabled,
-    }"
     size="xs"
+    no-indicator
   />
 </template>

+ 1 - 0
app/frontend/apps/desktop/components/Form/fields/FieldCustomer/FieldCustomerOptionIcon.vue

@@ -15,6 +15,7 @@ defineProps<{
     v-if="option.object?.__typename === 'User'"
     :entity="option.object"
     size="xs"
+    no-indicator
   />
   <CommonOrganizationAvatar
     v-else-if="option.object?.__typename === 'Organization'"

+ 0 - 2
app/frontend/apps/desktop/components/UserTaskbarTabs/UserTaskbarTabs.vue

@@ -237,8 +237,6 @@ const { popover, popoverTarget, toggle, isOpen: popoverIsOpen } = usePopover()
           <ul
             ref="dnd-parent"
             class="flex flex-col gap-1.5 overflow-y-auto p-1"
-            data-theme="dark"
-            :style="{ colorScheme: 'dark' }"
           >
             <li
               v-for="tabEntityKey in dndTaskbarTabListOrder"

+ 2 - 0
app/frontend/apps/desktop/components/layout/LayoutPage.vue

@@ -36,6 +36,8 @@ const {
       id="main-sidebar"
       :name="storageKeyId"
       :aria-label="$t('Main sidebar')"
+      data-theme="dark"
+      :style="{ colorScheme: 'dark' }"
       :current-width="currentSidebarWidth"
       :max-width="maxSidebarWidth"
       :min-width="minSidebarWidth"

+ 1 - 1
app/frontend/apps/desktop/components/layout/LayoutSidebar/LeftSidebar/AvatarMenu/AvatarMenu.vue

@@ -54,7 +54,7 @@ const { popover, popoverTarget, toggle, isOpen: popoverIsOpen } = usePopover()
     <CommonUserAvatar
       v-if="user"
       :entity="user"
-      class="!flex border-gray-900"
+      class="!flex"
       :size="avatarSize"
       personal
     />

+ 4 - 0
app/frontend/apps/desktop/initializer/assets/no-notifications.svg

@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.1465 15.8536L0.146454 0.853591L0.853561 0.146484L15.8536 15.1465L15.1465 15.8536Z" />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.6023 13.0165L10.6023 12.0165H3.44789C3.85161 10.7265 4.07662 9.36841 4.20495 8.25619C4.29466 7.47875 4.33947 6.79908 4.36192 6.31267C4.37166 6.10169 4.37722 5.92644 4.38039 5.79462L4.10233 5.51656H3.38462C3.7286 5.51656 3.9543 5.51658 4.10233 5.51656L3.43148 4.84571C3.40088 5.05579 3.38462 5.27913 3.38462 5.51656C3.38462 5.51656 3.38462 9.111 2.39617 12.0165C2.27865 12.362 2.14714 12.6978 2.00001 13.0165H11.6023ZM4.34269 2.92849L5.04991 3.63571C5.13367 3.54675 5.22224 3.4662 5.31375 3.39268C5.86677 2.94839 6.58822 2.7183 7.18952 2.60704L8 2.45708L8.81049 2.60704C9.41179 2.7183 10.1332 2.94839 10.6863 3.39268C11.1964 3.8025 11.6154 4.4309 11.6154 5.51656L11.6154 5.51859L11.6154 5.52226L11.6154 5.53447L11.6158 5.57786C11.6162 5.61504 11.6169 5.66849 11.6183 5.73675C11.6212 5.87323 11.6269 6.06915 11.6381 6.31267C11.6605 6.79908 11.7054 7.47875 11.7951 8.25619C11.8838 9.02547 12.0188 9.91239 12.2272 10.813L13.6985 12.2843C13.666 12.1958 13.6344 12.1065 13.6038 12.0165C12.6154 9.111 12.6154 5.51656 12.6154 5.51656C12.6154 2.71346 10.3488 1.87471 8.99243 1.62373C8.99743 1.5832 9.00001 1.54192 9.00001 1.50004C9.00001 0.947753 8.55229 0.500038 8.00001 0.500038C7.44772 0.500038 7.00001 0.947753 7.00001 1.50004C7.00001 1.54192 7.00258 1.5832 7.00758 1.62373C6.21883 1.76967 5.12232 2.11437 4.34269 2.92849ZM11.6154 5.51656H12.6154C11.6154 5.51656 11.6154 5.51656 11.6154 5.51656ZM6.00001 14C6.00001 15.1046 6.89544 16 8.00001 16C9.10458 16 10 15.1046 10 14H6.00001Z" />
+</svg>

+ 5 - 0
app/frontend/apps/desktop/initializer/assets/user-idle.svg

@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.00002 7.5C1.00002 6.94772 1.44774 6.5 2.00002 6.5H7.75002C8.45783 6.5 9.09594 6.92637 9.36681 7.5803C9.63768 8.23423 9.48796 8.98694 8.98746 9.48744L6.97489 11.5H8.50002C9.05231 11.5 9.50002 11.9477 9.50002 12.5V14C9.50002 14.5523 9.05231 15 8.50002 15H2.75002C2.04221 15 1.4041 14.5736 1.13323 13.9197C0.862365 13.2658 1.01209 12.5131 1.51258 12.0126L3.52515 10H2.00002C1.44774 10 1.00002 9.55228 1.00002 9V7.5ZM5.93936 9L2.21969 12.7197C2.00519 12.9342 1.94103 13.2568 2.05711 13.537C2.1732 13.8173 2.44667 14 2.75002 14H8.50002V12.5H4.56068L8.28035 8.78033C8.49485 8.56583 8.55902 8.24324 8.44293 7.96299C8.32684 7.68273 8.05337 7.5 7.75002 7.5H2.00002V9H5.93936Z" />
+<path d="M12.2143 3.25H9V4.1875H11.1205L9.19627 6.20797C9.06695 6.34376 9.031 6.54355 9.10487 6.7159C9.17873 6.88825 9.3482 7 9.53572 7H12.75V6.0625H10.6295L12.5537 4.04203C12.683 3.90624 12.719 3.70645 12.6451 3.5341C12.5713 3.36175 12.4018 3.25 12.2143 3.25Z" />
+<path d="M12.0682 1H14.5227C14.7136 1 14.8862 1.11003 14.9614 1.27973C15.0366 1.44943 15 1.64614 14.8683 1.77984L13.5909 3.07692H14.9318V4H13.0098C13.079 3.80403 13.075 3.58508 12.9898 3.38638C12.8875 3.14774 12.6834 2.97365 12.4411 2.90601L13.4091 1.92308H12.0682V1Z" />
+</svg>

+ 6 - 0
app/frontend/apps/desktop/initializer/assets/user-inactive.svg

@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.4572 12.2906C13.5119 12.084 13.5167 11.8573 13.457 11.6222C12.9342 9.56051 11.4476 8.23639 9.68688 7.64986C9.39056 7.55115 9.08648 7.47333 8.77792 7.4164L10.3129 9.01536C11.079 9.45296 11.7165 10.0877 12.1312 10.9094L13.4572 12.2906Z" />
+<path d="M6.88321 8.3307C4.84935 8.53445 3.04931 9.75038 2.51227 11.868C2.4819 11.9878 2.51062 12.0806 2.57451 12.1569C2.64733 12.2439 2.76155 12.3 2.88172 12.3H10.6938L11.6538 13.3H2.88172C2.03152 13.3 1.31451 12.5231 1.54296 11.6222C2.06581 9.56051 3.55238 8.23639 5.31311 7.64986C5.55102 7.57061 5.79393 7.50482 6.04014 7.4525L6.88321 8.3307Z" />
+<path d="M4.71457 3.18374C5.15743 2.0797 6.23767 1.30005 7.5 1.30005C9.15685 1.30005 10.5 2.64319 10.5 4.30005C10.5 5.19628 10.107 6.00073 9.48392 6.55044C9.19935 6.80151 8.86678 6.99945 8.50175 7.12873L7.69702 6.29047C8.70911 6.1915 9.5 5.33814 9.5 4.30005C9.5 3.19548 8.60457 2.30005 7.5 2.30005C6.48982 2.30005 5.65456 3.04898 5.51919 4.02189L4.71457 3.18374Z" />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.6393 14.6463L1.63931 2.14631L2.36069 1.45378L14.3607 13.9538L13.6393 14.6463Z" />
+</svg>

+ 3 - 0
app/frontend/apps/desktop/initializer/assets/vacation2.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.12356 0.24702C6.39029 0.175549 6.66446 0.33384 6.73593 0.600573L6.96678 1.46212C10.2142 0.824203 13.4485 2.46991 14.2462 5.44692L13.2802 5.70574C13.1628 5.26727 12.5329 4.8707 11.6933 5.09569C10.8536 5.32067 10.5065 5.97902 10.6239 6.41749L9.65802 6.67631C9.60754 6.48793 9.43146 6.28896 9.06968 6.16658C8.82888 6.08512 8.53049 6.04895 8.20316 6.07632L9.38847 10.5H15C15.2761 10.5 15.5 10.7238 15.5 11C15.5 11.2761 15.2761 11.5 15 11.5H9.65642L10.23 13.6406C10.3015 13.9073 10.1432 14.1815 9.87644 14.2529C9.6097 14.3244 9.33554 14.1661 9.26407 13.8994L8.62115 11.5H1C0.723858 11.5 0.5 11.2761 0.5 11C0.5 10.7238 0.723858 10.5 1 10.5H8.3532L7.23723 6.33514C6.94007 6.4751 6.69974 6.65562 6.53192 6.84657C6.27981 7.13345 6.2268 7.3938 6.27728 7.58217L5.31135 7.84099C5.19386 7.40252 4.56404 7.00596 3.72438 7.23094C2.88473 7.45593 2.53757 8.11428 2.65506 8.55275L1.68913 8.81156C0.891443 5.83456 2.86956 2.79219 6.00086 1.72094L5.77001 0.859392C5.69854 0.592659 5.85683 0.318491 6.12356 0.24702ZM5.02708 3.28147C3.72212 4.09873 2.85019 5.34308 2.59371 6.67221C2.85386 6.48947 3.15113 6.34927 3.46557 6.26502C3.97595 6.12826 4.52088 6.14177 4.99777 6.29859C4.90937 5.68692 4.85676 5.02862 4.88008 4.40692C4.89444 4.02429 4.93799 3.64001 5.02708 3.28147ZM8.59036 2.32669C10.1291 2.38198 11.5064 3.02365 12.3931 4.04648C12.0764 4.01829 11.7489 4.04551 11.4345 4.12976C10.9241 4.26652 10.4589 4.55068 10.1243 4.92494C9.89503 4.35101 9.61145 3.7546 9.2804 3.22786C9.07665 2.90367 8.8468 2.59265 8.59036 2.32669ZM5.9655 5.99616C6.35085 5.6356 6.86685 5.35365 7.45001 5.19739C8.03317 5.04113 8.62102 5.02731 9.13502 5.14689C8.93668 4.66843 8.70051 4.18446 8.43373 3.75998C8.14608 3.30229 7.84304 2.94659 7.54175 2.73341C7.25151 2.52805 6.99312 2.4728 6.73826 2.54109C6.4834 2.60938 6.28725 2.78642 6.13857 3.1094C5.98423 3.44465 5.89965 3.90422 5.87938 4.44442C5.86058 4.94542 5.89803 5.48263 5.9655 5.99616Z" />
+</svg>

+ 10 - 0
app/frontend/apps/desktop/initializer/desktopIconsAliasesMap.ts

@@ -113,4 +113,14 @@ export default {
 
   // Conflicting names
   mobile: 'phone',
+
+  // Avatar indicator
+  'avatar-indicator-inactive': 'user-inactive',
+  'avatar-indicator-without-access': 'no-notifications',
+  'avatar-indicator-out-of-office': 'vacation2',
+  'avatar-indicator-editing-desktop': 'pencil',
+  'avatar-indicator-editing-mobile': 'phone-pencil',
+  'avatar-indicator-desktop': 'avatar-indicator-desktop',
+  'avatar-indicator-mobile': 'phone',
+  'avatar-indicator-idle': 'user-idle',
 }

Some files were not shown because too many files changed in this diff