From 2c75ccb00407cae0924032cb309bd80589a640df Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 30 Jan 2025 15:24:02 +0530
Subject: [PATCH 1/3] feat: Ability to rearrange attributes in sidebar (#10784)

---
 .../ContactCustomAttributes.vue               |  36 ++-
 .../conversation/ConversationInfo.vue         |  59 ++---
 .../customAttributes/CustomAttributes.vue     | 220 +++++++++++++-----
 3 files changed, 233 insertions(+), 82 deletions(-)

diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactCustomAttributes.vue b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactCustomAttributes.vue
index f2a5c1ee8..4964668df 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactCustomAttributes.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactCustomAttributes.vue
@@ -2,6 +2,7 @@
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useMapGetter } from 'dashboard/composables/store';
+import { useUISettings } from 'dashboard/composables/useUISettings';
 
 import ContactCustomAttributeItem from 'dashboard/components-next/Contacts/ContactsSidebar/ContactCustomAttributeItem.vue';
 
@@ -14,6 +15,8 @@ const props = defineProps({
 
 const { t } = useI18n();
 
+const { uiSettings } = useUISettings();
+
 const searchQuery = ref('');
 
 const contactAttributes = useMapGetter('attributes/getContactAttributes') || [];
@@ -46,20 +49,49 @@ const processContactAttributes = (
   }, []);
 };
 
+const sortAttributesOrder = computed(
+  () =>
+    uiSettings.value.conversation_elements_order_conversation_contact_panel ??
+    []
+);
+
+const sortByUISettings = attributes => {
+  // Get saved order from UI settings
+  // Same as conversation panel contact attribute order
+  const order = sortAttributesOrder.value;
+
+  // If no order defined, return original array
+  if (!order?.length) return attributes;
+
+  const orderMap = new Map(order.map((key, index) => [key, index]));
+
+  // Sort attributes based on their position in saved order
+  return [...attributes].sort((a, b) => {
+    // Get positions, use Infinity if not found in order (pushes to end)
+    const aPos = orderMap.get(a.attributeKey) ?? Infinity;
+    const bPos = orderMap.get(b.attributeKey) ?? Infinity;
+    return aPos - bPos;
+  });
+};
+
 const usedAttributes = computed(() => {
-  return processContactAttributes(
+  const attributes = processContactAttributes(
     contactAttributes.value,
     props.selectedContact?.customAttributes,
     (key, custom) => key in custom
   );
+
+  return sortByUISettings(attributes);
 });
 
 const unusedAttributes = computed(() => {
-  return processContactAttributes(
+  const attributes = processContactAttributes(
     contactAttributes.value,
     props.selectedContact?.customAttributes,
     (key, custom) => !(key in custom)
   );
+
+  return sortByUISettings(attributes);
 });
 
 const filteredUnusedAttributes = computed(() => {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationInfo.vue
index ec44d5a3f..621d13e5c 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationInfo.vue
@@ -47,63 +47,68 @@ const staticElements = computed(() =>
     {
       content: initiatedAt,
       title: 'CONTACT_PANEL.INITIATED_AT',
+      key: 'static-initiated-at',
+      type: 'static_attribute',
     },
     {
       content: browserLanguage,
       title: 'CONTACT_PANEL.BROWSER_LANGUAGE',
+      key: 'static-browser-language',
+      type: 'static_attribute',
     },
     {
       content: referer,
       title: 'CONTACT_PANEL.INITIATED_FROM',
-      type: 'link',
+      key: 'static-referer',
+      type: 'static_attribute',
     },
     {
       content: browserName,
       title: 'CONTACT_PANEL.BROWSER',
+      key: 'static-browser',
+      type: 'static_attribute',
     },
     {
       content: platformName,
       title: 'CONTACT_PANEL.OS',
+      key: 'static-platform',
+      type: 'static_attribute',
     },
     {
       content: createdAtIp,
       title: 'CONTACT_PANEL.IP_ADDRESS',
+      key: 'static-ip-address',
+      type: 'static_attribute',
     },
   ].filter(attribute => !!attribute.content.value)
 );
-
-const evenClass = [
-  '[&>*:nth-child(odd)]:!bg-white [&>*:nth-child(even)]:!bg-slate-25',
-  'dark:[&>*:nth-child(odd)]:!bg-slate-900 dark:[&>*:nth-child(even)]:!bg-slate-800/50',
-];
 </script>
 
 <template>
   <div class="conversation--details">
-    <div :class="evenClass">
-      <ContactDetailsItem
-        v-for="element in staticElements"
-        :key="element.title"
-        :title="$t(element.title)"
-        :value="element.content.value"
-        class="border-b border-solid border-slate-50 dark:border-slate-700/50"
-      >
-        <a
-          v-if="element.type === 'link'"
-          :href="referer"
-          rel="noopener noreferrer nofollow"
-          target="_blank"
-          class="text-woot-400 dark:text-woot-600"
-        >
-          {{ referer }}
-        </a>
-      </ContactDetailsItem>
-    </div>
     <CustomAttributes
-      :start-at="staticElements.length % 2 === 0 ? 'even' : 'odd'"
+      :static-elements="staticElements"
       attribute-class="conversation--attribute"
       attribute-from="conversation_panel"
       attribute-type="conversation_attribute"
-    />
+    >
+      <template #staticItem="{ element }">
+        <ContactDetailsItem
+          :key="element.title"
+          :title="$t(element.title)"
+          :value="element.content.value"
+        >
+          <a
+            v-if="element.key === 'static-referer'"
+            :href="element.content.value"
+            rel="noopener noreferrer nofollow"
+            target="_blank"
+            class="text-n-brand"
+          >
+            {{ element.content.value }}
+          </a>
+        </ContactDetailsItem>
+      </template>
+    </CustomAttributes>
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributes.vue b/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributes.vue
index 251d876a9..01fbe9b71 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributes.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/customAttributes/CustomAttributes.vue
@@ -1,5 +1,6 @@
 <script setup>
-import { computed, onMounted } from 'vue';
+import { computed, onMounted, ref } from 'vue';
+import Draggable from 'vuedraggable';
 import { useToggle } from '@vueuse/core';
 import { useRoute } from 'vue-router';
 import { useStore, useStoreGetters } from 'dashboard/composables/store';
@@ -23,10 +24,11 @@ const props = defineProps({
     type: String,
     default: '',
   },
-  startAt: {
-    type: String,
-    default: 'even',
-    validator: value => value === 'even' || value === 'odd',
+  // Combine static elements with custom attributes components
+  // To allow for custom ordering
+  staticElements: {
+    type: Array,
+    default: () => [],
   },
 });
 
@@ -36,6 +38,8 @@ const route = useRoute();
 const { t } = useI18n();
 const { uiSettings, updateUISettings } = useUISettings();
 
+const dragging = ref(false);
+
 const [showAllAttributes, toggleShowAllAttributes] = useToggle(false);
 
 const currentChat = computed(() => getters.getSelectedChat.value);
@@ -68,7 +72,7 @@ const toggleButtonText = computed(() =>
     : t('CUSTOM_ATTRIBUTES.SHOW_LESS')
 );
 
-const filteredAttributes = computed(() =>
+const filteredCustomAttributes = computed(() =>
   attributes.value.map(attribute => {
     // Check if the attribute key exists in customAttributes
     const hasValue = Object.hasOwnProperty.call(
@@ -80,6 +84,8 @@ const filteredAttributes = computed(() =>
 
     return {
       ...attribute,
+      type: 'custom_attribute',
+      key: attribute.attribute_key,
       // Set value from customAttributes if it exists, otherwise use default value
       value: hasValue
         ? customAttributes.value[attribute.attribute_key]
@@ -88,27 +94,112 @@ const filteredAttributes = computed(() =>
   })
 );
 
-const displayedAttributes = computed(() => {
-  // Show only the first 5 attributes or all depending on showAllAttributes
-  if (showAllAttributes.value || filteredAttributes.value.length <= 5) {
-    return filteredAttributes.value;
-  }
-  return filteredAttributes.value.slice(0, 5);
-});
-
-const showMoreUISettingsKey = computed(
-  () => `show_all_attributes_${props.attributeFrom}`
+// Order key name for UI settings
+const orderKey = computed(
+  () => `conversation_elements_order_${props.attributeFrom}`
 );
 
+const combinedElements = computed(() => {
+  // Get saved order from UI settings
+  const savedOrder = uiSettings.value[orderKey.value] ?? [];
+  const allElements = [
+    ...props.staticElements,
+    ...filteredCustomAttributes.value,
+  ];
+
+  // If no saved order exists, return in default order
+  if (!savedOrder.length) return allElements;
+
+  return allElements.sort((a, b) => {
+    // Find positions of elements in saved order
+    const aPosition = savedOrder.indexOf(a.key);
+    const bPosition = savedOrder.indexOf(b.key);
+
+    // Handle cases where elements are not in saved order:
+    // - New elements (not in saved order) go to the end
+    // - If both elements are new, maintain their relative order
+    if (aPosition === -1 && bPosition === -1) return 0;
+    if (aPosition === -1) return 1;
+    if (bPosition === -1) return -1;
+
+    return aPosition - bPosition;
+  });
+});
+
+const displayedElements = computed(() => {
+  if (showAllAttributes.value || combinedElements.value.length <= 5) {
+    return combinedElements.value;
+  }
+
+  // Show first 5 elements in the order they appear
+  return combinedElements.value.slice(0, 5);
+});
+
+// Reorder elements with static elements position preserved
+// There is case where all the static elements will not be available (API, Email channels, etc).
+// In that case, we need to preserve the order of the static elements and
+// insert them in the correct position.
+const reorderElementsWithStaticPreservation = (
+  savedOrder = [],
+  currentOrder = []
+) => {
+  const finalOrder = [...currentOrder];
+  const visibleKeys = new Set(currentOrder);
+
+  // Process hidden static elements from saved order
+  savedOrder
+    // Find static elements that aren't currently visible
+    .filter(key => key.startsWith('static-') && !visibleKeys.has(key))
+    .forEach(staticKey => {
+      // Find next visible element after this static element in saved order
+      const nextVisible = savedOrder
+        .slice(savedOrder.indexOf(staticKey))
+        .find(key => visibleKeys.has(key));
+
+      // If next visible element found, insert before it; otherwise add to end
+      if (nextVisible) {
+        finalOrder.splice(finalOrder.indexOf(nextVisible), 0, staticKey);
+      } else {
+        finalOrder.push(staticKey);
+      }
+    });
+
+  return finalOrder;
+};
+
+const onDragEnd = () => {
+  dragging.value = false;
+  // Get the saved and current saved order
+  const savedOrder = uiSettings.value[orderKey.value] ?? [];
+  const currentOrder = combinedElements.value.map(({ key }) => key);
+
+  const finalOrder = reorderElementsWithStaticPreservation(
+    savedOrder,
+    currentOrder
+  );
+
+  updateUISettings({
+    [orderKey.value]: finalOrder,
+  });
+};
+
 const initializeSettings = () => {
+  const currentOrder = uiSettings.value[orderKey.value];
+  if (!currentOrder) {
+    const initialOrder = combinedElements.value.map(element => element.key);
+    updateUISettings({
+      [orderKey.value]: initialOrder,
+    });
+  }
+
   showAllAttributes.value =
-    uiSettings.value[showMoreUISettingsKey.value] || false;
+    uiSettings.value[`show_all_attributes_${props.attributeFrom}`] || false;
 };
 
 const onClickToggle = () => {
   toggleShowAllAttributes();
   updateUISettings({
-    [showMoreUISettingsKey.value]: showAllAttributes.value,
+    [`show_all_attributes_${props.attributeFrom}`]: showAllAttributes.value,
   });
 };
 
@@ -169,48 +260,65 @@ const evenClass = [
   '[&>*:nth-child(odd)]:!bg-n-background [&>*:nth-child(even)]:!bg-n-slate-2',
   'dark:[&>*:nth-child(odd)]:!bg-n-background dark:[&>*:nth-child(even)]:!bg-n-solid-1',
 ];
-const oddClass = [
-  '[&>*:nth-child(odd)]:!bg-n-slate-2 [&>*:nth-child(even)]:!bg-n-background',
-  'dark:[&>*:nth-child(odd)]:!bg-n-solid-1 dark:[&>*:nth-child(even)]:!bg-n-background',
-];
-
-const wrapperClass = computed(() => {
-  return props.startAt === 'even' ? evenClass : oddClass;
-});
 </script>
 
-<!-- TODO: After migration to Vue 3, remove the top level div -->
 <template>
-  <div :class="wrapperClass" class="last:rounded-b-lg">
-    <CustomAttribute
-      v-for="attribute in displayedAttributes"
-      :key="attribute.id"
-      class="last:rounded-b-lg border-b border-n-weak/50 dark:border-n-weak/90"
-      :attribute-key="attribute.attribute_key"
-      :attribute-type="attribute.attribute_display_type"
-      :values="attribute.attribute_values"
-      :label="attribute.attribute_display_name"
-      :description="attribute.attribute_description"
-      :value="attribute.value"
-      show-actions
-      :attribute-regex="attribute.regex_pattern"
-      :regex-cue="attribute.regex_cue"
-      :contact-id="contactId"
-      @update="onUpdate"
-      @delete="onDelete"
-      @copy="onCopy"
-    />
+  <div class="conversation--details">
+    <Draggable
+      :list="displayedElements"
+      :disabled="!showAllAttributes"
+      animation="200"
+      ghost-class="ghost"
+      handle=".drag-handle"
+      item-key="key"
+      class="last:rounded-b-lg overflow-hidden"
+      :class="evenClass"
+      @start="dragging = true"
+      @end="onDragEnd"
+    >
+      <template #item="{ element }">
+        <div
+          class="drag-handle relative border-b border-n-weak/50 dark:border-n-weak/90"
+          :class="{
+            'cursor-grab': showAllAttributes,
+            'last:border-transparent dark:last:border-transparent':
+              combinedElements.length <= 5,
+          }"
+        >
+          <template v-if="element.type === 'static_attribute'">
+            <slot name="staticItem" :element="element" />
+          </template>
+
+          <template v-else>
+            <CustomAttribute
+              :key="element.id"
+              :attribute-key="element.attribute_key"
+              :attribute-type="element.attribute_display_type"
+              :values="element.attribute_values"
+              :label="element.attribute_display_name"
+              :description="element.attribute_description"
+              :value="element.value"
+              show-actions
+              :attribute-regex="element.regex_pattern"
+              :regex-cue="element.regex_cue"
+              :contact-id="contactId"
+              @update="onUpdate"
+              @delete="onDelete"
+              @copy="onCopy"
+            />
+          </template>
+        </div>
+      </template>
+    </Draggable>
+
     <p
-      v-if="!displayedAttributes.length && emptyStateMessage"
-      class="p-3 text-center last:rounded-b-lg"
+      v-if="!displayedElements.length && emptyStateMessage"
+      class="p-3 text-center"
     >
       {{ emptyStateMessage }}
     </p>
-    <!-- Show more and show less buttons show it if the filteredAttributes length is greater than 5 -->
-    <div
-      v-if="filteredAttributes.length > 5"
-      class="flex px-2 py-2 last:rounded-b-lg"
-    >
+    <!-- Show more and show less buttons show it if the combinedElements length is greater than 5 -->
+    <div v-if="combinedElements.length > 5" class="flex px-2 py-2">
       <woot-button
         size="small"
         :icon="showAllAttributes ? 'chevron-up' : 'chevron-down'"
@@ -224,3 +332,9 @@ const wrapperClass = computed(() => {
     </div>
   </div>
 </template>
+
+<style lang="scss" scoped>
+.ghost {
+  @apply opacity-50 bg-n-slate-3 dark:bg-n-slate-9;
+}
+</style>

From 55f1690d9e74fd1f2a58f7d0fde3d3abfb447ee0 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Thu, 30 Jan 2025 15:52:01 +0530
Subject: [PATCH 2/3] fix: docker github action for ce images (#10800)

- Fix the docker tag issue during push stage for ce image build
---
 .github/workflows/publish_foss_docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish_foss_docker.yml b/.github/workflows/publish_foss_docker.yml
index 8149ee290..3075a7f3d 100644
--- a/.github/workflows/publish_foss_docker.yml
+++ b/.github/workflows/publish_foss_docker.yml
@@ -79,7 +79,7 @@ jobs:
           file: docker/Dockerfile
           platforms: ${{ matrix.platform }}
           push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
-          outputs: type=image,name=${{ env.DOCKER_TAG }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=${{ env.DOCKER_REPO }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |

From b811c27ab5955413667bc48f9283403e6b792e99 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 31 Jan 2025 06:33:12 +0530
Subject: [PATCH 3/3] feat: Hide empty folders from sidebar (#10786)

This PR updates the sidebar to hide empty folders. So, in case the user
has not created any folders, or teams, the section in the sidebar will
be hidden
---
 .../sidebar/SidebarSubGroup.vue               | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarSubGroup.vue b/app/javascript/dashboard/components-next/sidebar/SidebarSubGroup.vue
index a938a202e..8e3c3009e 100644
--- a/app/javascript/dashboard/components-next/sidebar/SidebarSubGroup.vue
+++ b/app/javascript/dashboard/components-next/sidebar/SidebarSubGroup.vue
@@ -2,7 +2,6 @@
 import { computed, ref } from 'vue';
 import SidebarGroupLeaf from './SidebarGroupLeaf.vue';
 import SidebarGroupSeparator from './SidebarGroupSeparator.vue';
-import SidebarGroupEmptyLeaf from './SidebarGroupEmptyLeaf.vue';
 
 import { useSidebarContext } from './provider';
 import { useEventListener } from '@vueuse/core';
@@ -26,11 +25,6 @@ const accessibleItems = computed(() =>
 );
 
 const hasAccessibleItems = computed(() => {
-  if (props.children.length === 0) {
-    // cases like segment, folder and labels where users can create new items
-    return true;
-  }
-
   return accessibleItems.value.length > 0;
 });
 
@@ -55,7 +49,7 @@ useEventListener(scrollableContainer, 'scroll', () => {
     :icon
     class="my-1"
   />
-  <ul class="m-0 list-none reset-base relative group">
+  <ul v-if="children.length" class="m-0 list-none reset-base relative group">
     <!-- Each element has h-8, which is 32px, we will show 7 items with one hidden at the end,
     which is 14rem. Then we add 16px so that we have some text visible from the next item  -->
     <div
@@ -64,16 +58,13 @@ useEventListener(scrollableContainer, 'scroll', () => {
         'max-h-[calc(14rem+16px)] overflow-y-scroll no-scrollbar': isScrollable,
       }"
     >
-      <template v-if="children.length">
-        <SidebarGroupLeaf
-          v-for="child in children"
-          v-show="isExpanded || activeChild?.name === child.name"
-          v-bind="child"
-          :key="child.name"
-          :active="activeChild?.name === child.name"
-        />
-      </template>
-      <SidebarGroupEmptyLeaf v-else v-show="isExpanded" class="ml-3 rtl:mr-3" />
+      <SidebarGroupLeaf
+        v-for="child in children"
+        v-show="isExpanded || activeChild?.name === child.name"
+        v-bind="child"
+        :key="child.name"
+        :active="activeChild?.name === child.name"
+      />
     </div>
     <div
       v-if="isScrollable && isExpanded"