Browse Source

Maintenance: Desktop View - Subscriber text/styling improvements

Co-authored-by: Benjamin Scharf <bs@zammad.com>
Co-authored-by: Dominik Klein <dk@zammad.com>
Benjamin Scharf 4 months ago
parent
commit
1363e7f854

+ 1 - 1
app/frontend/apps/desktop/pages/ticket/__tests__/ticket-detail-view-subscribers.spec.ts

@@ -165,7 +165,7 @@ describe('Ticket detail view', () => {
         ticketMetaSidebar.queryByLabelText('Avatar (Adam Doe)'),
       ).not.toBeInTheDocument()
 
-      const toggle = view.getByLabelText('Subscribe')
+      const toggle = view.getByLabelText('Subscribe me')
       expect(toggle).toBeInTheDocument()
 
       await view.events.click(toggle)

+ 6 - 5
app/frontend/apps/desktop/pages/ticket/components/TicketSidebar/TicketSidebarInformation/TicketSidebarInformationContent/TicketSubscribers.vue

@@ -45,29 +45,30 @@ const handleToggleInput = async () => {
 <template>
   <div class="flex flex-col gap-2">
     <div
-      class="flex w-full flex-col rounded-lg bg-blue-200 p-2.5 dark:bg-gray-700"
+      class="flex w-full flex-col rounded-lg bg-blue-200 px-3 py-3.5 dark:bg-gray-700"
     >
       <div
         class="flex gap-2"
         :class="{
-          'border-b border-white/10 pb-2': subscribers.length,
+          'border-b border-neutral-100 pb-2 dark:border-gray-900':
+            subscribers.length,
         }"
       >
         <FormKit
           type="toggle"
           :model-value="isSubscribed"
-          :label="__('Subscribe')"
+          :label="__('Subscribe me')"
           :variants="{
             true: __('yes'),
             false: __('no'),
           }"
           :disabled="isSubscriptionLoading"
           outer-class="grow"
-          wrapper-class="!px-0"
+          wrapper-class="!px-0 $remove:h-10"
           @input-raw="handleToggleInput"
         />
       </div>
-      <div v-if="totalSubscribers > 0" class="flex flex-wrap gap-1.5 pt-2.5">
+      <div v-if="totalSubscribers > 0" class="flex flex-wrap gap-2 pt-2.5">
         <CommonUserAvatar
           v-for="subscriber in subscribers"
           :key="subscriber.id"

+ 2 - 2
app/frontend/apps/desktop/pages/ticket/components/TicketSidebar/TicketSidebarInformation/__tests__/TicketSubscribers.spec.ts

@@ -80,7 +80,7 @@ describe('TicketSubscribers', () => {
   it('renders a toggle to subscribe/unsubscribe', () => {
     const view = renderTicketSubscribers()
 
-    const toggle = view.getByLabelText('Subscribe')
+    const toggle = view.getByLabelText('Subscribe me')
 
     expect(toggle).toBeInTheDocument()
     expect(toggle).not.toBeChecked()
@@ -91,7 +91,7 @@ describe('TicketSubscribers', () => {
       ticket: provideTestTicket(true),
     })
 
-    const toggle = view.getByLabelText('Subscribe')
+    const toggle = view.getByLabelText('Subscribe me')
 
     expect(toggle).toBeChecked()
   })

+ 15 - 12
i18n/zammad.pot

@@ -113,7 +113,7 @@ msgid "%s (option)"
 msgstr ""
 
 #: app/frontend/apps/desktop/components/CommonSelect/CommonSelect.vue:303
-#: app/frontend/apps/desktop/components/Form/fields/FieldAutoComplete/FieldAutoCompleteInput.vue:579
+#: app/frontend/apps/desktop/components/Form/fields/FieldAutoComplete/FieldAutoCompleteInput.vue:583
 #: app/frontend/apps/desktop/components/Form/fields/FieldSelect/FieldSelectInput.vue:258
 #: app/frontend/apps/desktop/components/Form/fields/FieldTreeSelect/FieldTreeSelectInputDropdown.vue:374
 #: app/frontend/apps/mobile/components/Form/fields/FieldAutoComplete/FieldAutoCompleteInput.vue:149
@@ -2806,7 +2806,7 @@ msgid "Clear Search"
 msgstr ""
 
 #: app/assets/javascripts/app/views/generic/searchable_select.jst.eco:56
-#: app/frontend/apps/desktop/components/Form/fields/FieldAutoComplete/FieldAutoCompleteInput.vue:662
+#: app/frontend/apps/desktop/components/Form/fields/FieldAutoComplete/FieldAutoCompleteInput.vue:666
 #: app/frontend/apps/desktop/components/Form/fields/FieldDate/FieldDateTimeInput.vue:138
 #: app/frontend/apps/desktop/components/Form/fields/FieldSelect/FieldSelectInput.vue:321
 #: app/frontend/apps/desktop/components/Form/fields/FieldTreeSelect/FieldTreeSelectInput.vue:370
@@ -8939,12 +8939,12 @@ msgstr ""
 
 #: app/assets/javascripts/app/controllers/agent_ticket_merge.coffee:7
 #: app/assets/javascripts/app/controllers/ticket_zoom/sidebar_ticket.coffee:120
-#: app/frontend/apps/desktop/pages/ticket/components/TicketDetailView/actions/TicketMerge/TicketMergeFlyout.vue:110
+#: app/frontend/apps/desktop/pages/ticket/components/TicketDetailView/actions/TicketMerge/TicketMergeFlyout.vue:116
 #: app/frontend/apps/desktop/pages/ticket/components/TicketSidebar/TicketSidebarInformation/TicketSidebarInformationContent.vue:45
 msgid "Merge"
 msgstr ""
 
-#: app/frontend/apps/desktop/pages/ticket/components/TicketDetailView/actions/TicketMerge/TicketMergeFlyout.vue:117
+#: app/frontend/apps/desktop/pages/ticket/components/TicketDetailView/actions/TicketMerge/TicketMergeFlyout.vue:123
 msgid "Merge Tickets"
 msgstr ""
 
@@ -11419,7 +11419,7 @@ msgstr ""
 
 #: app/assets/javascripts/app/views/agent_ticket_merge.jst.eco:5
 #: app/assets/javascripts/app/views/link/ticket/add.jst.eco:30
-#: app/frontend/apps/desktop/pages/ticket/components/TicketDetailView/TicketSimpleTable/TicketSimpleTableWrapper.vue:69
+#: app/frontend/apps/desktop/pages/ticket/components/TicketDetailView/TicketRelationAndRecentLists/TicketRelationAndRecentLists.vue:69
 msgid "Recent Customer Tickets"
 msgstr ""
 
@@ -11429,7 +11429,7 @@ msgstr ""
 
 #: app/assets/javascripts/app/views/agent_ticket_merge.jst.eco:8
 #: app/assets/javascripts/app/views/link/ticket/add.jst.eco:36
-#: app/frontend/apps/desktop/pages/ticket/components/TicketDetailView/TicketSimpleTable/TicketSimpleTableWrapper.vue:76
+#: app/frontend/apps/desktop/pages/ticket/components/TicketDetailView/TicketRelationAndRecentLists/TicketRelationAndRecentLists.vue:76
 msgid "Recently Viewed Tickets"
 msgstr ""
 
@@ -13515,11 +13515,14 @@ msgstr ""
 #: app/assets/javascripts/app/controllers/_ui_element/object_perform_action.coffee:148
 #: app/assets/javascripts/app/controllers/_ui_element/object_selector.coffee:206
 #: app/assets/javascripts/app/views/widget/mention.jst.eco:4
-#: app/frontend/apps/desktop/pages/ticket/components/TicketSidebar/TicketSidebarInformation/TicketSidebarInformationContent/TicketSubscribers.vue:59
 #: app/frontend/apps/mobile/pages/ticket/components/TicketDetailView/TicketActionsDialog.vue:57
 msgid "Subscribe"
 msgstr ""
 
+#: app/frontend/apps/desktop/pages/ticket/components/TicketSidebar/TicketSidebarInformation/TicketSidebarInformationContent/TicketSubscribers.vue:60
+msgid "Subscribe me"
+msgstr ""
+
 #: app/assets/javascripts/app/views/generic/ical_feed.jst.eco:29
 msgid "Subscribe to iCalendar feed"
 msgstr ""
@@ -13685,7 +13688,7 @@ msgstr ""
 msgid "Target Language"
 msgstr ""
 
-#: app/frontend/apps/desktop/pages/ticket/components/TicketDetailView/actions/TicketMerge/TicketMergeFlyout.vue:56
+#: app/frontend/apps/desktop/pages/ticket/components/TicketDetailView/actions/TicketMerge/TicketMergeFlyout.vue:61
 msgid "Target Ticket"
 msgstr ""
 
@@ -15646,7 +15649,7 @@ msgstr ""
 msgid "Ticket information"
 msgstr ""
 
-#: app/frontend/apps/desktop/pages/ticket/components/TicketDetailView/actions/TicketMerge/TicketMergeFlyout.vue:95
+#: app/frontend/apps/desktop/pages/ticket/components/TicketDetailView/actions/TicketMerge/TicketMergeFlyout.vue:100
 msgid "Ticket merged successfully"
 msgstr ""
 
@@ -16446,7 +16449,7 @@ msgstr ""
 msgid "Unsaved Changes"
 msgstr ""
 
-#: app/frontend/apps/desktop/components/Form/fields/FieldAutoComplete/FieldAutoCompleteInput.vue:589
+#: app/frontend/apps/desktop/components/Form/fields/FieldAutoComplete/FieldAutoCompleteInput.vue:593
 #: app/frontend/apps/desktop/components/Form/fields/FieldSelect/FieldSelectInput.vue:267
 #: app/frontend/apps/desktop/components/Form/fields/FieldTreeSelect/FieldTreeSelectInput.vue:322
 msgid "Unselect Option"
@@ -18710,7 +18713,7 @@ msgstr ""
 #: app/assets/javascripts/app/views/integration/exchange.jst.eco:52
 #: app/assets/javascripts/app/views/integration/ldap.jst.eco:32
 #: app/assets/javascripts/app/views/object_manager/attribute/boolean.jst.eco:22
-#: app/frontend/apps/desktop/pages/ticket/components/TicketSidebar/TicketSidebarInformation/TicketSidebarInformationContent/TicketSubscribers.vue:62
+#: app/frontend/apps/desktop/pages/ticket/components/TicketSidebar/TicketSidebarInformation/TicketSidebarInformationContent/TicketSubscribers.vue:63
 #: app/frontend/apps/mobile/pages/ticket/views/TicketInformation/TicketInformationDetails.vue:90
 #: app/frontend/shared/components/ObjectAttributes/attributes/AttributeBoolean/AttributeBoolean.vue:15
 #: app/frontend/shared/entities/object-attributes/form/resolver/fields/active.ts:16
@@ -19234,7 +19237,7 @@ msgstr ""
 #: app/assets/javascripts/app/models/public_link.coffee:10
 #: app/assets/javascripts/app/views/integration/ldap.jst.eco:32
 #: app/assets/javascripts/app/views/object_manager/attribute/boolean.jst.eco:15
-#: app/frontend/apps/desktop/pages/ticket/components/TicketSidebar/TicketSidebarInformation/TicketSidebarInformationContent/TicketSubscribers.vue:61
+#: app/frontend/apps/desktop/pages/ticket/components/TicketSidebar/TicketSidebarInformation/TicketSidebarInformationContent/TicketSubscribers.vue:62
 #: app/frontend/apps/mobile/pages/ticket/views/TicketInformation/TicketInformationDetails.vue:89
 #: app/frontend/shared/components/ObjectAttributes/attributes/AttributeBoolean/AttributeBoolean.vue:15
 #: app/frontend/shared/entities/object-attributes/form/resolver/fields/active.ts:15