Update paywall restrictions

- add secret type for installation_config in the super admin console
- hide tokens by default on the UI

Before
----
<img width="891" alt="image"
src="https://github.com/user-attachments/assets/1c51b3bb-47f9-49bf-bb0d-75b84d8d2eeb"
/>


After
----
<img width="958" alt="image"
src="https://github.com/user-attachments/assets/b7eca1ff-1cc0-4259-9977-6109eb38ad64"
/>

---------

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>

.github/workflows/nightly_installer.yml

@@ -16,7 +16,7 @@ on:
 
 jobs:
   nightly:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
 
     - name: get installer

Gemfile.lock

@@ -799,7 +799,7 @@ GEM
     unf_ext (0.0.8.2)
     unicode-display_width (2.4.2)
     uniform_notifier (1.16.0)
-    uri (0.13.0)
+    uri (1.0.3)
     uri_template (0.7.0)
     valid_email2 (5.2.6)
       activemodel (>= 3.2)

app/assets/stylesheets/administrate/components/_buttons.scss

@@ -1,8 +1,8 @@
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"],
-.button {
+button:not(.reset-base),
+input[type='button']:not(.reset-base),
+input[type='reset']:not(.reset-base),
+input[type='submit']:not(.reset-base),
+.button:not(.reset-base) {
   appearance: none;
   background-color: $color-woot;
   border: 0;

app/assets/stylesheets/administrate/custom_styles.scss

@@ -10,7 +10,6 @@
 
   .icon-container {
     margin-right: 2px;
-
   }
 
   .value-container {

app/dashboards/account_dashboard.rb

@@ -78,7 +78,11 @@ class AccountDashboard < Administrate::BaseDashboard
   #   COLLECTION_FILTERS = {
   #     open: ->(resources) { resources.where(open: true) }
   #   }.freeze
-  COLLECTION_FILTERS = {}.freeze
+  COLLECTION_FILTERS = {
+    active: ->(resources) { resources.where(status: :active) },
+    suspended: ->(resources) { resources.where(status: :suspended) },
+    recent: ->(resources) { resources.where('created_at > ?', 30.days.ago) }
+  }.freeze
 
   # Overwrite this method to customize how accounts are displayed
   # across all pages of the admin dashboard.

app/dashboards/user_dashboard.rb

@@ -94,7 +94,12 @@ class UserDashboard < Administrate::BaseDashboard
   #   COLLECTION_FILTERS = {
   #     open: ->(resources) { resources.where(open: true) }
   #   }.freeze
-  COLLECTION_FILTERS = {}.freeze
+  COLLECTION_FILTERS = {
+    super_admin: ->(resources) { resources.where(type: 'SuperAdmin') },
+    confirmed: ->(resources) { resources.where.not(confirmed_at: nil) },
+    unconfirmed: ->(resources) { resources.where(confirmed_at: nil) },
+    recent: ->(resources) { resources.where('created_at > ?', 30.days.ago) }
+  }.freeze
 
   # Overwrite this method to customize how users are displayed
   # across all pages of the admin dashboard.

app/helpers/filters/filter_helper.rb

@@ -1,4 +1,4 @@
-module FilterHelper
+module Filters::FilterHelper
   def build_condition_query(model_filters, query_hash, current_index)
     current_filter = model_filters[query_hash['attribute_key']]
 
@@ -89,4 +89,18 @@ module FilterHelper
     operator = condition['query_operator'].upcase
     raise CustomExceptions::CustomFilter::InvalidQueryOperator.new({}) unless %w[AND OR].include?(operator)
   end
+
+  def conversation_status_values(values)
+    return Conversation.statuses.values if values.include?('all')
+
+    values.map { |x| Conversation.statuses[x.to_sym] }
+  end
+
+  def conversation_priority_values(values)
+    values.map { |x| Conversation.priorities[x.to_sym] }
+  end
+
+  def message_type_values(values)
+    values.map { |x| Message.message_types[x.to_sym] }
+  end
 end

app/javascript/dashboard/App.vue

@@ -4,7 +4,6 @@ import AddAccountModal from '../dashboard/components/layout/sidebarComponents/Ad
 import LoadingState from './components/widgets/LoadingState.vue';
 import NetworkNotification from './components/NetworkNotification.vue';
 import UpdateBanner from './components/app/UpdateBanner.vue';
-import UpgradeBanner from './components/app/UpgradeBanner.vue';
 import PaymentPendingBanner from './components/app/PaymentPendingBanner.vue';
 import PendingEmailVerificationBanner from './components/app/PendingEmailVerificationBanner.vue';
 import vueActionCable from './helper/actionCable';
@@ -31,7 +30,6 @@ export default {
     UpdateBanner,
     PaymentPendingBanner,
     WootSnackbarBox,
-    UpgradeBanner,
     PendingEmailVerificationBanner,
   },
   setup() {
@@ -146,7 +144,6 @@ export default {
     <template v-if="currentAccountId">
       <PendingEmailVerificationBanner v-if="hideOnOnboardingView" />
       <PaymentPendingBanner v-if="hideOnOnboardingView" />
-      <UpgradeBanner />
     </template>
     <router-view v-slot="{ Component }">
       <transition name="fade" mode="out-in">

app/javascript/dashboard/components-next/filter/contactProvider.js

@@ -2,7 +2,10 @@ import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useOperators } from './operators';
 import { useMapGetter } from 'dashboard/composables/store.js';
-import { buildAttributesFilterTypes } from './helper/filterHelper.js';
+import {
+  buildAttributesFilterTypes,
+  CONTACT_ATTRIBUTES,
+} from './helper/filterHelper.js';
 import countries from 'shared/constants/countries.js';
 
 /**
@@ -59,7 +62,11 @@ export function useContactFilterContext() {
    * @type {import('vue').ComputedRef<FilterType[]>}
    */
   const customFilterTypes = computed(() =>
-    buildAttributesFilterTypes(contactAttributes.value, getOperatorTypes)
+    buildAttributesFilterTypes(
+      contactAttributes.value,
+      getOperatorTypes,
+      'contact'
+    )
   );
 
   /**
@@ -67,8 +74,8 @@ export function useContactFilterContext() {
    */
   const filterTypes = computed(() => [
     {
-      attributeKey: 'name',
-      value: 'name',
+      attributeKey: CONTACT_ATTRIBUTES.NAME,
+      value: CONTACT_ATTRIBUTES.NAME,
       attributeName: t('CONTACTS_LAYOUT.FILTER.NAME'),
       label: t('CONTACTS_LAYOUT.FILTER.NAME'),
       inputType: 'plainText',
@@ -77,8 +84,8 @@ export function useContactFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'email',
-      value: 'email',
+      attributeKey: CONTACT_ATTRIBUTES.EMAIL,
+      value: CONTACT_ATTRIBUTES.EMAIL,
       attributeName: t('CONTACTS_LAYOUT.FILTER.EMAIL'),
       label: t('CONTACTS_LAYOUT.FILTER.EMAIL'),
       inputType: 'plainText',
@@ -87,8 +94,8 @@ export function useContactFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'phone_number',
-      value: 'phone_number',
+      attributeKey: CONTACT_ATTRIBUTES.PHONE_NUMBER,
+      value: CONTACT_ATTRIBUTES.PHONE_NUMBER,
       attributeName: t('CONTACTS_LAYOUT.FILTER.PHONE_NUMBER'),
       label: t('CONTACTS_LAYOUT.FILTER.PHONE_NUMBER'),
       inputType: 'plainText',
@@ -97,8 +104,8 @@ export function useContactFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'identifier',
-      value: 'identifier',
+      attributeKey: CONTACT_ATTRIBUTES.IDENTIFIER,
+      value: CONTACT_ATTRIBUTES.IDENTIFIER,
       attributeName: t('CONTACTS_LAYOUT.FILTER.IDENTIFIER'),
       label: t('CONTACTS_LAYOUT.FILTER.IDENTIFIER'),
       inputType: 'plainText',
@@ -107,8 +114,8 @@ export function useContactFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'country_code',
-      value: 'country_code',
+      attributeKey: CONTACT_ATTRIBUTES.COUNTRY_CODE,
+      value: CONTACT_ATTRIBUTES.COUNTRY_CODE,
       attributeName: t('FILTER.ATTRIBUTES.COUNTRY_NAME'),
       label: t('FILTER.ATTRIBUTES.COUNTRY_NAME'),
       inputType: 'searchSelect',
@@ -118,8 +125,8 @@ export function useContactFilterContext() {
       attributeModel: 'additional',
     },
     {
-      attributeKey: 'city',
-      value: 'city',
+      attributeKey: CONTACT_ATTRIBUTES.CITY,
+      value: CONTACT_ATTRIBUTES.CITY,
       attributeName: t('CONTACTS_LAYOUT.FILTER.CITY'),
       label: t('CONTACTS_LAYOUT.FILTER.CITY'),
       inputType: 'plainText',
@@ -128,8 +135,8 @@ export function useContactFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'created_at',
-      value: 'created_at',
+      attributeKey: CONTACT_ATTRIBUTES.CREATED_AT,
+      value: CONTACT_ATTRIBUTES.CREATED_AT,
       attributeName: t('CONTACTS_LAYOUT.FILTER.CREATED_AT'),
       label: t('CONTACTS_LAYOUT.FILTER.CREATED_AT'),
       inputType: 'date',
@@ -138,8 +145,8 @@ export function useContactFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'last_activity_at',
-      value: 'last_activity_at',
+      attributeKey: CONTACT_ATTRIBUTES.LAST_ACTIVITY_AT,
+      value: CONTACT_ATTRIBUTES.LAST_ACTIVITY_AT,
       attributeName: t('CONTACTS_LAYOUT.FILTER.LAST_ACTIVITY'),
       label: t('CONTACTS_LAYOUT.FILTER.LAST_ACTIVITY'),
       inputType: 'date',
@@ -148,8 +155,8 @@ export function useContactFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'referer',
-      value: 'referer',
+      attributeKey: CONTACT_ATTRIBUTES.REFERER,
+      value: CONTACT_ATTRIBUTES.REFERER,
       attributeName: t('CONTACTS_LAYOUT.FILTER.REFERER_LINK'),
       label: t('CONTACTS_LAYOUT.FILTER.REFERER_LINK'),
       inputType: 'plainText',
@@ -158,8 +165,8 @@ export function useContactFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'blocked',
-      value: 'blocked',
+      attributeKey: CONTACT_ATTRIBUTES.BLOCKED,
+      value: CONTACT_ATTRIBUTES.BLOCKED,
       attributeName: t('CONTACTS_LAYOUT.FILTER.BLOCKED'),
       label: t('CONTACTS_LAYOUT.FILTER.BLOCKED'),
       inputType: 'searchSelect',

app/javascript/dashboard/components-next/filter/helper/filterHelper.js

@@ -1,3 +1,35 @@
+/**
+ * Standard attributes of the conversation model
+ */
+export const CONVERSATION_ATTRIBUTES = {
+  STATUS: 'status',
+  PRIORITY: 'priority',
+  ASSIGNEE_ID: 'assignee_id',
+  INBOX_ID: 'inbox_id',
+  TEAM_ID: 'team_id',
+  DISPLAY_ID: 'display_id',
+  CAMPAIGN_ID: 'campaign_id',
+  LABELS: 'labels',
+  BROWSER_LANGUAGE: 'browser_language',
+  COUNTRY_CODE: 'country_code',
+  REFERER: 'referer',
+  CREATED_AT: 'created_at',
+  LAST_ACTIVITY_AT: 'last_activity_at',
+};
+
+export const CONTACT_ATTRIBUTES = {
+  NAME: 'name',
+  EMAIL: 'email',
+  PHONE_NUMBER: 'phone_number',
+  IDENTIFIER: 'identifier',
+  COUNTRY_CODE: 'country_code',
+  CITY: 'city',
+  CREATED_AT: 'created_at',
+  LAST_ACTIVITY_AT: 'last_activity_at',
+  REFERER: 'referer',
+  BLOCKED: 'blocked',
+};
+
 /**
  * Determines the input type for a custom attribute based on its key
  * @param {string} key - The attribute display type key
@@ -20,24 +52,37 @@ export const getCustomAttributeInputType = key => {
 
 /**
  * Builds filter types for custom attributes
+ * This also removes any conflicting attributes
  * @param {Array} attributes - The attributes array
  * @param {Function} getOperatorTypes - Function to get operator types
  * @returns {Array} Array of filter types
  */
-export const buildAttributesFilterTypes = (attributes, getOperatorTypes) => {
-  return attributes.map(attr => ({
-    attributeKey: attr.attributeKey,
-    value: attr.attributeKey,
-    attributeName: attr.attributeDisplayName,
-    label: attr.attributeDisplayName,
-    inputType: getCustomAttributeInputType(attr.attributeDisplayType),
-    filterOperators: getOperatorTypes(attr.attributeDisplayType),
-    options:
-      attr.attributeDisplayType === 'list'
-        ? attr.attributeValues.map(item => ({ id: item, name: item }))
-        : [],
-    attributeModel: 'customAttributes',
-  }));
+export const buildAttributesFilterTypes = (
+  attributes,
+  getOperatorTypes,
+  filterModel = 'conversation'
+) => {
+  const standardAttributes = Object.values(
+    filterModel === 'conversation'
+      ? CONVERSATION_ATTRIBUTES
+      : CONTACT_ATTRIBUTES
+  );
+
+  return attributes
+    .filter(attr => !standardAttributes.includes(attr.attributeKey))
+    .map(attr => ({
+      attributeKey: attr.attributeKey,
+      value: attr.attributeKey,
+      attributeName: attr.attributeDisplayName,
+      label: attr.attributeDisplayName,
+      inputType: getCustomAttributeInputType(attr.attributeDisplayType),
+      filterOperators: getOperatorTypes(attr.attributeDisplayType),
+      options:
+        attr.attributeDisplayType === 'list'
+          ? attr.attributeValues.map(item => ({ id: item, name: item }))
+          : [],
+      attributeModel: 'customAttributes',
+    }));
 };
 
 /**

app/javascript/dashboard/components-next/filter/provider.js

@@ -3,7 +3,10 @@ import { useI18n } from 'vue-i18n';
 import { useOperators } from './operators';
 import { useMapGetter } from 'dashboard/composables/store.js';
 import { useChannelIcon } from 'next/icon/provider';
-import { buildAttributesFilterTypes } from './helper/filterHelper';
+import {
+  buildAttributesFilterTypes,
+  CONVERSATION_ATTRIBUTES,
+} from './helper/filterHelper';
 import countries from 'shared/constants/countries.js';
 import languages from 'dashboard/components/widgets/conversation/advancedFilterItems/languages.js';
 
@@ -70,7 +73,11 @@ export function useConversationFilterContext() {
    * @type {import('vue').ComputedRef<FilterType[]>}
    */
   const customFilterTypes = computed(() =>
-    buildAttributesFilterTypes(conversationAttributes.value, getOperatorTypes)
+    buildAttributesFilterTypes(
+      conversationAttributes.value,
+      getOperatorTypes,
+      'conversation'
+    )
   );
 
   /**
@@ -78,8 +85,8 @@ export function useConversationFilterContext() {
    */
   const filterTypes = computed(() => [
     {
-      attributeKey: 'status',
-      value: 'status',
+      attributeKey: CONVERSATION_ATTRIBUTES.STATUS,
+      value: CONVERSATION_ATTRIBUTES.STATUS,
       attributeName: t('FILTER.ATTRIBUTES.STATUS'),
       label: t('FILTER.ATTRIBUTES.STATUS'),
       inputType: 'multiSelect',
@@ -94,8 +101,24 @@ export function useConversationFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'assignee_id',
-      value: 'assignee_id',
+      attributeKey: CONVERSATION_ATTRIBUTES.PRIORITY,
+      value: CONVERSATION_ATTRIBUTES.PRIORITY,
+      attributeName: t('FILTER.ATTRIBUTES.PRIORITY'),
+      label: t('FILTER.ATTRIBUTES.PRIORITY'),
+      inputType: 'multiSelect',
+      options: ['low', 'medium', 'high', 'urgent'].map(id => {
+        return {
+          id,
+          name: t(`CONVERSATION.PRIORITY.OPTIONS.${id.toUpperCase()}`),
+        };
+      }),
+      dataType: 'text',
+      filterOperators: equalityOperators.value,
+      attributeModel: 'standard',
+    },
+    {
+      attributeKey: CONVERSATION_ATTRIBUTES.ASSIGNEE_ID,
+      value: CONVERSATION_ATTRIBUTES.ASSIGNEE_ID,
       attributeName: t('FILTER.ATTRIBUTES.ASSIGNEE_NAME'),
       label: t('FILTER.ATTRIBUTES.ASSIGNEE_NAME'),
       inputType: 'searchSelect',
@@ -110,8 +133,8 @@ export function useConversationFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'inbox_id',
-      value: 'inbox_id',
+      attributeKey: CONVERSATION_ATTRIBUTES.INBOX_ID,
+      value: CONVERSATION_ATTRIBUTES.INBOX_ID,
       attributeName: t('FILTER.ATTRIBUTES.INBOX_NAME'),
       label: t('FILTER.ATTRIBUTES.INBOX_NAME'),
       inputType: 'searchSelect',
@@ -126,8 +149,8 @@ export function useConversationFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'team_id',
-      value: 'team_id',
+      attributeKey: CONVERSATION_ATTRIBUTES.TEAM_ID,
+      value: CONVERSATION_ATTRIBUTES.TEAM_ID,
       attributeName: t('FILTER.ATTRIBUTES.TEAM_NAME'),
       label: t('FILTER.ATTRIBUTES.TEAM_NAME'),
       inputType: 'searchSelect',
@@ -137,8 +160,8 @@ export function useConversationFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'display_id',
-      value: 'display_id',
+      attributeKey: CONVERSATION_ATTRIBUTES.DISPLAY_ID,
+      value: CONVERSATION_ATTRIBUTES.DISPLAY_ID,
       attributeName: t('FILTER.ATTRIBUTES.CONVERSATION_IDENTIFIER'),
       label: t('FILTER.ATTRIBUTES.CONVERSATION_IDENTIFIER'),
       inputType: 'plainText',
@@ -147,8 +170,8 @@ export function useConversationFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'campaign_id',
-      value: 'campaign_id',
+      attributeKey: CONVERSATION_ATTRIBUTES.CAMPAIGN_ID,
+      value: CONVERSATION_ATTRIBUTES.CAMPAIGN_ID,
       attributeName: t('FILTER.ATTRIBUTES.CAMPAIGN_NAME'),
       label: t('FILTER.ATTRIBUTES.CAMPAIGN_NAME'),
       inputType: 'searchSelect',
@@ -161,8 +184,8 @@ export function useConversationFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'labels',
-      value: 'labels',
+      attributeKey: CONVERSATION_ATTRIBUTES.LABELS,
+      value: CONVERSATION_ATTRIBUTES.LABELS,
       attributeName: t('FILTER.ATTRIBUTES.LABELS'),
       label: t('FILTER.ATTRIBUTES.LABELS'),
       inputType: 'multiSelect',
@@ -185,8 +208,8 @@ export function useConversationFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'browser_language',
-      value: 'browser_language',
+      attributeKey: CONVERSATION_ATTRIBUTES.BROWSER_LANGUAGE,
+      value: CONVERSATION_ATTRIBUTES.BROWSER_LANGUAGE,
       attributeName: t('FILTER.ATTRIBUTES.BROWSER_LANGUAGE'),
       label: t('FILTER.ATTRIBUTES.BROWSER_LANGUAGE'),
       inputType: 'searchSelect',
@@ -196,8 +219,8 @@ export function useConversationFilterContext() {
       attributeModel: 'additional',
     },
     {
-      attributeKey: 'country_code',
-      value: 'country_code',
+      attributeKey: CONVERSATION_ATTRIBUTES.COUNTRY_CODE,
+      value: CONVERSATION_ATTRIBUTES.COUNTRY_CODE,
       attributeName: t('FILTER.ATTRIBUTES.COUNTRY_NAME'),
       label: t('FILTER.ATTRIBUTES.COUNTRY_NAME'),
       inputType: 'searchSelect',
@@ -207,8 +230,8 @@ export function useConversationFilterContext() {
       attributeModel: 'additional',
     },
     {
-      attributeKey: 'referer',
-      value: 'referer',
+      attributeKey: CONVERSATION_ATTRIBUTES.REFERER,
+      value: CONVERSATION_ATTRIBUTES.REFERER,
       attributeName: t('FILTER.ATTRIBUTES.REFERER_LINK'),
       label: t('FILTER.ATTRIBUTES.REFERER_LINK'),
       inputType: 'plainText',
@@ -217,8 +240,8 @@ export function useConversationFilterContext() {
       attributeModel: 'additional',
     },
     {
-      attributeKey: 'created_at',
-      value: 'created_at',
+      attributeKey: CONVERSATION_ATTRIBUTES.CREATED_AT,
+      value: CONVERSATION_ATTRIBUTES.CREATED_AT,
       attributeName: t('FILTER.ATTRIBUTES.CREATED_AT'),
       label: t('FILTER.ATTRIBUTES.CREATED_AT'),
       inputType: 'date',
@@ -227,8 +250,8 @@ export function useConversationFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'last_activity_at',
-      value: 'last_activity_at',
+      attributeKey: CONVERSATION_ATTRIBUTES.LAST_ACTIVITY_AT,
+      value: CONVERSATION_ATTRIBUTES.LAST_ACTIVITY_AT,
       attributeName: t('FILTER.ATTRIBUTES.LAST_ACTIVITY'),
       label: t('FILTER.ATTRIBUTES.LAST_ACTIVITY'),
       inputType: 'date',

app/javascript/dashboard/components-next/message/MessageMeta.vue

@@ -49,7 +49,7 @@ const isSent = computed(() => {
     isASmsInbox.value ||
     isATelegramChannel.value
   ) {
-    return status.value === MESSAGE_STATUS.SENT;
+    return sourceId.value && status.value === MESSAGE_STATUS.SENT;
   }
 
   // All messages will be mark as sent for the Line channel, as there is no source ID.
@@ -67,7 +67,7 @@ const isDelivered = computed(() => {
     isASmsInbox.value ||
     isAFacebookInbox.value
   ) {
-    return status.value === MESSAGE_STATUS.DELIVERED;
+    return sourceId.value && status.value === MESSAGE_STATUS.DELIVERED;
   }
   // All messages marked as delivered for the web widget inbox and API inbox once they are sent.
   if (isAWebWidgetInbox.value || isAPIInbox.value) {
@@ -88,7 +88,7 @@ const isRead = computed(() => {
     isATwilioChannel.value ||
     isAFacebookInbox.value
   ) {
-    return status.value === MESSAGE_STATUS.READ;
+    return sourceId.value && status.value === MESSAGE_STATUS.READ;
   }
 
   if (isAWebWidgetInbox.value || isAPIInbox.value) {

app/javascript/dashboard/components/app/PaymentPaywall.vue

@@ -0,0 +1,79 @@
+<script setup>
+import { computed, onMounted } from 'vue';
+import { useStore } from 'vuex';
+import { useAccount } from 'dashboard/composables/useAccount';
+import { differenceInDays } from 'date-fns';
+import { useRoute } from 'vue-router';
+
+const ALWAYS_ON_ROUTES = [
+  'agent_list',
+  'settings_inbox_list',
+  'billing_settings_index',
+];
+
+const { accountId } = useAccount();
+const store = useStore();
+const route = useRoute();
+const routeName = computed(() => {
+  return route.name || '';
+});
+const isOnChatwootCloud = computed(
+  () => store.getters['globalConfig/isOnChatwootCloud']
+);
+const account = computed(() =>
+  store.getters['accounts/getAccount'](accountId.value)
+);
+
+const isTrialAccount = computed(() => {
+  if (!account.value) return false;
+
+  const createdAt = new Date(account.value.created_at);
+  const diffDays = differenceInDays(new Date(), createdAt);
+
+  return diffDays <= 15;
+});
+
+const testLimit = ({ allowed, consumed }) => {
+  return consumed > allowed;
+};
+
+const isLimitExceeded = computed(() => {
+  if (ALWAYS_ON_ROUTES.includes(routeName.value)) {
+    return false;
+  }
+
+  if (!account.value) return false;
+
+  const { limits } = account.value;
+  if (!limits) return false;
+
+  const { conversation, non_web_inboxes: nonWebInboxes } = limits;
+  return testLimit(conversation) || testLimit(nonWebInboxes);
+});
+
+const shouldShowBanner = computed(() => {
+  if (!isOnChatwootCloud.value) {
+    return false;
+  }
+
+  if (isTrialAccount.value) {
+    return false;
+  }
+
+  return isLimitExceeded.value;
+});
+
+const fetchLimits = () => store.dispatch('accounts/limits');
+
+onMounted(() => {
+  if (isOnChatwootCloud.value) {
+    fetchLimits();
+  }
+});
+</script>
+
+<template>
+  <div v-if="shouldShowBanner">Limits exceeded</div>
+
+  <slot v-else />
+</template>

app/javascript/dashboard/routes/dashboard/Dashboard.vue

@@ -9,7 +9,7 @@ import AddAccountModal from 'dashboard/components/layout/sidebarComponents/AddAc
 import AccountSelector from 'dashboard/components/layout/sidebarComponents/AccountSelector.vue';
 import AddLabelModal from 'dashboard/routes/dashboard/settings/labels/AddLabel.vue';
 import NotificationPanel from 'dashboard/routes/dashboard/notifications/components/NotificationPanel.vue';
-
+import PaymentPaywall from 'dashboard/components/app/PaymentPaywall.vue';
 import { useUISettings } from 'dashboard/composables/useUISettings';
 import { useAccount } from 'dashboard/composables/useAccount';
 
@@ -29,6 +29,7 @@ export default {
     CommandBar,
     WootKeyShortcutModal,
     AddAccountModal,
+    PaymentPaywall,
     AccountSelector,
     AddLabelModal,
     NotificationPanel,
@@ -194,7 +195,9 @@ export default {
       @show-add-label-popup="showAddLabelPopup"
     />
     <main class="flex flex-1 h-full min-h-0 px-0 overflow-hidden">
-      <router-view />
+      <PaymentPaywall>
+        <router-view />
+      </PaymentPaywall>
       <CommandBar />
       <AccountSelector
         :show-account-modal="showAccountModal"

app/javascript/dashboard/store/modules/accounts.js

@@ -23,6 +23,7 @@ const state = {
 
 export const getters = {
   getAccount: $state => id => {
+    console.log('account', id);
     return findRecordById($state, id);
   },
   getUIFlags($state) {

app/models/custom_attribute_definition.rb

@@ -22,6 +22,12 @@
 #  index_custom_attribute_definitions_on_account_id  (account_id)
 #
 class CustomAttributeDefinition < ApplicationRecord
+  STANDARD_ATTRIBUTES = {
+    :conversation => %w[status priority assignee_id inbox_id team_id display_id campaign_id labels browser_language country_code referer created_at
+                        last_activity_at],
+    :contact => %w[name email phone_number identifier country_code city created_at last_activity_at referer blocked]
+  }.freeze
+
   scope :with_attribute_model, ->(attribute_model) { attribute_model.presence && where(attribute_model: attribute_model) }
   validates :attribute_display_name, presence: true
 
@@ -31,6 +37,7 @@ class CustomAttributeDefinition < ApplicationRecord
 
   validates :attribute_display_type, presence: true
   validates :attribute_model, presence: true
+  validate :attribute_must_not_conflict, on: :create
 
   enum attribute_model: { conversation_attribute: 0, contact_attribute: 1 }
   enum attribute_display_type: { text: 0, number: 1, currency: 2, percent: 3, link: 4, date: 5, list: 6, checkbox: 7 }
@@ -48,4 +55,11 @@ class CustomAttributeDefinition < ApplicationRecord
   def update_widget_pre_chat_custom_fields
     ::Inboxes::UpdateWidgetPreChatCustomFieldsJob.perform_later(account, self)
   end
+
+  def attribute_must_not_conflict
+    model_keys = attribute_model.to_sym == :conversation_attribute ? :conversation : :contact
+    return unless attribute_key.in?(STANDARD_ATTRIBUTES[model_keys])
+
+    errors.add(:attribute_key, I18n.t('errors.custom_attribute_definition.key_conflict'))
+  end
 end

app/services/filter_service.rb

@@ -1,7 +1,7 @@
 require 'json'
 
 class FilterService
-  include FilterHelper
+  include Filters::FilterHelper
   include CustomExceptions::CustomFilter
 
   ATTRIBUTE_MODEL = 'conversation_attribute'.freeze
@@ -43,18 +43,15 @@ class FilterService
   end
 
   def filter_values(query_hash)
-    case query_hash['attribute_key']
-    when 'status'
-      return Conversation.statuses.values if query_hash['values'].include?('all')
+    attribute_key = query_hash['attribute_key']
+    values = query_hash['values']
 
-      query_hash['values'].map { |x| Conversation.statuses[x.to_sym] }
-    when 'message_type'
-      query_hash['values'].map { |x| Message.message_types[x.to_sym] }
-    when 'content'
-      downcase_array_values(query_hash['values'])
-    else
-      case_insensitive_values(query_hash)
-    end
+    return conversation_status_values(values) if attribute_key == 'status'
+    return conversation_priority_values(values) if attribute_key == 'priority'
+    return message_type_values(values) if attribute_key == 'message_type'
+    return downcase_array_values(values) if attribute_key == 'content'
+
+    case_insensitive_values(query_hash)
   end
 
   def downcase_array_values(values)

app/views/super_admin/app_configs/show.html.erb

@@ -1,11 +1,19 @@
 <% content_for(:title) do %>
   Configure Settings - <%= @config.titleize %>
 <% end %>
+
 <header class="main-content__header" role="banner">
   <h1 class="main-content__page-title" id="page-title">
     <%= content_for(:title) %>
   </h1>
 </header>
+
+<style>
+.eye-icon.eye-hide path {
+  d: path('M3 3l18 18M10.5 10.677a2 2 0 002.823 2.823M7.362 7.561C5.68 8.74 4.279 10.42 3 12c1.889 2.991 5.282 6 9 6 1.55 0 3.043-.523 4.395-1.35M12 6c4.008 0 6.701 3.009 9 6a15.66 15.66 0 01-1.078 1.5');
+}
+</style>
+
 <section class="main-content__body">
   <%= form_with url: super_admin_app_config_url(config: @config) , method: :post do |form| %>
     <% @allowed_configs.each do |key| %>
@@ -15,18 +23,36 @@
         </div>
         <div class="-mt-2 field-unit__field ">
           <% if @installation_configs[key]&.dig('type') == 'boolean' %>
-            <%= form.select "app_config[#{key}]", 
-              [["True", true], ["False", false]], 
+            <%= form.select "app_config[#{key}]",
+              [["True", true], ["False", false]],
               { selected: ActiveModel::Type::Boolean.new.cast(@app_config[key]) },
-              class: "mt-2 border border-slate-100 p-1 rounded-md" 
+              class: "mt-2 border border-slate-100 p-1 rounded-md"
             %>
           <% elsif @installation_configs[key]&.dig('type') == 'code' %>
-            <%= form.text_area "app_config[#{key}]", 
-                value: @app_config[key], 
+            <%= form.text_area "app_config[#{key}]",
+                value: @app_config[key],
                 rows: 12,
                 wrap: 'off',
                 class: "mt-2 border font-mono text-xs border-slate-100 p-1 rounded-md overflow-scroll"
             %>
+          <% elsif @installation_configs[key]&.dig('type') == 'secret' %>
+            <div class="relative">
+              <%= form.password_field "app_config[#{key}]",
+                  id: "app_config_#{key}",
+                  value: @app_config[key],
+                  class: "mt-2 border border-slate-100 p-1.5 pr-8 rounded-md w-full"
+              %>
+              <button
+                type="button"
+                class="absolute reset-base !bg-white top-1/2 !outline-0 !text-n-slate-11 -translate-y-1/2 right-2 p-1 hover:!bg-n-slate-5 rounded-sm toggle-password"
+                data-target="app_config_<%= key %>"
+              >
+                <svg class="eye-icon" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
+                  <path d="M12 5C5.63636 5 2 12 2 12C2 12 5.63636 19 12 19C18.3636 19 22 12 22 12C22 12 18.3636 5 12 5Z"/>
+                  <path d="M12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z"/>
+                </svg>
+              </button>
+            </div>
           <% else %>
             <%= form.text_field "app_config[#{key}]", value: @app_config[key] %>
           <% end %>
@@ -43,3 +69,26 @@
     </div>
   <% end %>
 </section>
+
+<% content_for :javascript do %>
+  <script>
+  document.addEventListener('DOMContentLoaded', () => {
+    document.querySelectorAll('.toggle-password').forEach(button => {
+      button.addEventListener('click', () => {
+        const targetId = button.dataset.target;
+        const input = document.getElementById(targetId);
+        const type = input.type === 'password' ? 'text' : 'password';
+        input.type = type;
+
+        // Toggle icon
+        const svg = button.querySelector('.eye-icon');
+        if (type === 'password') {
+          svg.classList.remove('eye-hide')
+        } else {
+          svg.classList.add('eye-hide')
+        }
+      });
+    });
+  });
+  </script>
+<% end %>

app/views/super_admin/application/_filters.html.erb

@@ -0,0 +1,63 @@
+<%#
+# Filters
+
+This partial is used on the `index` page to display available filters
+for a collection of resources.
+
+## Local variables:
+
+- `page`:
+  An instance of [Administrate::Page::Collection][1].
+  Contains helper methods to help display a table,
+  and knows which attributes should be displayed in the resource's table.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Collection
+%>
+
+<% 
+  # Get the dashboard class name from the resource name
+  resource_name = page.resource_name.classify
+  dashboard_class_name = "#{resource_name}Dashboard"
+  dashboard_class = dashboard_class_name.constantize
+  
+  # Get the current filter if any
+  current_filter = nil
+  if params[:search] && params[:search].include?(':')
+    current_filter = params[:search].split(':').first
+  end
+%>
+
+<% if dashboard_class.const_defined?(:COLLECTION_FILTERS) && !dashboard_class::COLLECTION_FILTERS.empty? %>
+  <div class="flex items-center bg-gray-100 border-0 rounded-md shadow-none relative w-[260px]">
+    <div class="flex items-center h-10 px-2 w-full">
+      <div class="flex items-center justify-center flex-shrink-0 mr-2 text-gray-500" title="Filter by">
+        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+          <polygon points="22 3 2 3 10 12.46 10 19 14 21 14 12.46 22 3"></polygon>
+        </svg>
+      </div>
+      <div class="flex-1 h-full min-w-0 relative">
+        <select id="filter-select" class="appearance-none bg-gray-100 border-0 text-gray-700 cursor-pointer text-sm h-full overflow-hidden truncate whitespace-nowrap w-full pr-7 pl-0 py-2 focus:outline-none bg-[url('data:image/svg+xml,%3Csvg xmlns=%27http://www.w3.org/2000/svg%27 width=%2712%27 height=%2712%27 viewBox=%270 0 12 12%27%3E%3Cpath fill=%27%23293f54%27 d=%27M6 9L1 4h10z%27/%3E%3C/svg%3E')] bg-[right_0.25rem_center] bg-no-repeat bg-[length:0.75rem]" onchange="applyFilter(this.value)">
+          <option value="">All records</option>
+          <% dashboard_class::COLLECTION_FILTERS.each do |filter_name, _| %>
+            <option value="<%= filter_name %>" <%= 'selected' if filter_name.to_s == current_filter %>>
+              <%= filter_name.to_s.titleize %>
+            </option>
+          <% end %>
+        </select>
+        <% if current_filter %>
+          <a href="?" class="flex items-center justify-center rounded-full text-gray-500 text-xl font-bold h-[18px] w-[18px] leading-none absolute right-5 top-1/2 -translate-y-1/2 no-underline z-2 hover:text-gray-900" title="Clear filter">×</a>
+        <% end %>
+      </div>
+    </div>
+  </div>
+
+  <script>
+    function applyFilter(filterName) {
+      if (filterName) {
+        window.location.href = "?search=" + encodeURIComponent(filterName) + "%3A";
+      } else {
+        window.location.href = "?";
+      }
+    }
+  </script>
+<% end %> 

app/views/super_admin/application/_search.html.erb

@@ -0,0 +1,24 @@
+<form class="search" role="search">
+  <label class="search__label" for="search">
+    <svg class="search__eyeglass-icon" role="img">
+      <title>
+        <%= t("administrate.search.label", resource: resource_name) %>
+      </title>
+      <use xlink:href="#icon-eyeglass" />
+    </svg>
+  </label>
+
+  <input class="search__input"
+         id="search"
+         type="search"
+         name="search"
+         placeholder="<%= t("administrate.search.label", resource: resource_name) %>"
+         value="<%= search_term %>">
+
+  <%= link_to clear_search_params, class: "search__clear-link" do %>
+    <svg class="search__clear-icon" role="img">
+      <title><%= t("administrate.search.clear") %></title>
+      <use xlink:href="#icon-cancel" />
+    </svg>
+  <% end %>
+</form> 

app/views/super_admin/application/index.html.erb

@@ -28,27 +28,36 @@ It renders the `_table` partial to display details about the resources.
 <% end %>
 
 <header class="main-content__header" role="banner">
-  <h1 class="main-content__page-title" id="page-title">
-    <%= content_for(:title) %>
-  </h1>
+  <div class="flex items-center justify-between w-full">
+    <h1 class="main-content__page-title m-0 mr-6" id="page-title">
+      <%= content_for(:title) %>
+    </h1>
 
-  <% if show_search_bar %>
-    <%= render(
-      "search",
-      search_term: search_term,
-      resource_name: display_resource_name(page.resource_name)
-    ) %>
-  <% end %>
+    <div class="flex items-center">
+      <% if show_search_bar %>
+        <div class="flex items-center">
+          <%= render("filters", page: page) %>
+          <div class="ml-3">
+            <%= render(
+              "search",
+              search_term: search_term,
+              resource_name: display_resource_name(page.resource_name)
+            ) %>
+          </div>
+        </div>
+      <% end %>
 
-  <div>
-    <%= link_to(
-      t(
-        "administrate.actions.new_resource",
-        name: page.resource_name.titleize.downcase
-      ),
-      [:new, namespace, page.resource_path.to_sym],
-      class: "button",
-    ) if accessible_action?(new_resource, :new) %>
+      <div class="whitespace-nowrap ml-4">
+        <%= link_to(
+          t(
+            "administrate.actions.new_resource",
+            name: page.resource_name.titleize.downcase
+          ),
+          [:new, namespace, page.resource_path.to_sym],
+          class: "button",
+        ) if accessible_action?(new_resource, :new) %>
+      </div>
+    </div>
   </div>
 </header>
 

config/installation_config.yml

@@ -103,13 +103,16 @@
   display_title: 'Facebook Verify Token'
   description: 'The verify token used for Facebook Messenger Webhook'
   locked: false
+  type: secret
 - name: FB_APP_SECRET
   display_title: 'Facebook App Secret'
   locked: false
+  type: secret
 - name: IG_VERIFY_TOKEN
   display_title: 'Instagram Verify Token'
   description: 'The verify token used for Instagram Webhook'
   locked: false
+  type: secret
 - name: FACEBOOK_API_VERSION
   display_title: 'Facebook API Version'
   description: 'Configure this if you want to use a different Facebook API version. Make sure its prefixed with `v`'
@@ -131,6 +134,7 @@
 - name: AZURE_APP_SECRET
   display_title: 'Azure App Secret'
   locked: false
+  type: secret
 # End of Microsoft Email Channel Config
 
 # MARK: Captain Config
@@ -138,6 +142,7 @@
   display_title: 'OpenAI API Key'
   description: 'The API key used to authenticate requests to OpenAI services for Captain AI.'
   locked: false
+  type: secret
 - name: CAPTAIN_OPEN_AI_MODEL
   display_title: 'OpenAI Model'
   description: 'The OpenAI model configured for use in Captain AI. Default: gpt-4o-mini'
@@ -146,6 +151,7 @@
   display_title: 'FireCrawl API Key (optional)'
   description: 'The FireCrawl API key for the Captain AI service'
   locked: false
+  type: secret
 - name: CAPTAIN_CLOUD_PLAN_LIMITS
   display_title: 'Captain Cloud Plan Limits'
   description: 'The limits for the Captain AI service for different plans'
@@ -160,11 +166,13 @@
   display_title: 'Inbox Token'
   description: 'The Chatwoot Inbox Token for Contact Support in Cloud'
   locked: false
+  type: secret
 - name: CHATWOOT_INBOX_HMAC_KEY
   value:
   display_title: 'Inbox HMAC Key'
   description: 'The Chatwoot Inbox HMAC Key for Contact Support in Cloud'
   locked: false
+  type: secret
 - name: CHATWOOT_CLOUD_PLANS
   display_title: 'Cloud Plans'
   value:
@@ -180,10 +188,12 @@
   value:
   display_title: 'Analytics Token'
   description: 'The June.so analytics token for Chatwoot cloud'
+  type: secret
 - name: CLEARBIT_API_KEY
   value:
   display_title: 'Clearbit API Key'
   description: 'This API key is used for onboarding the users, to pre-fill account data.'
+  type: secret
 - name: DASHBOARD_SCRIPTS
   value:
   display_title: 'Dashboard Scripts'
@@ -206,12 +216,14 @@
 - name: CHATWOOT_SUPPORT_WEBSITE_TOKEN
   value:
   description: 'The Chatwoot website token, used to identify the Chatwoot inbox and display the "Contact Support" option on the billing page'
+  type: secret
 - name: CHATWOOT_SUPPORT_SCRIPT_URL
   value:
   description: 'The Chatwoot script base URL, to display the "Contact Support" option on the billing page'
 - name: CHATWOOT_SUPPORT_IDENTIFIER_HASH
   value:
   description: 'The Chatwoot identifier hash, to validate the contact in the live chat window.'
+  type: secret
 - name: ACCOUNT_SECURITY_NOTIFICATION_WEBHOOK_URL
   display_title: Webhook URL to post security analysis
   value:
@@ -245,6 +257,7 @@
   display_title: 'Firebase Credentials'
   value:
   locked: false
+  type: secret
   description: 'Contents on your firebase credentials json file'
 ## ------ End of Configs added for FCM v1 notifications ------ ##
 
@@ -259,4 +272,5 @@
   value:
   locked: false
   description: 'Linear client secret'
+  type: secret
 ## ------ End of Configs added for Linear ------ ##

config/locales/en.yml

@@ -82,6 +82,8 @@ en:
       invalid_operator: Invalid operator. The allowed operators for %{attribute_name} are [%{allowed_keys}].
       invalid_query_operator: Query operator must be either "AND" or "OR".
       invalid_value: Invalid value. The values provided for %{attribute_name} are invalid
+    custom_attribute_definition:
+      key_conflict: The provided key is not allowed as it might conflict with default attributes.
   reports:
     period: Reporting period %{since} to %{until}
     utc_warning: The report generated is in UTC timezone

spec/controllers/api/v1/accounts/custom_attribute_definitions_controller_spec.rb

@@ -89,6 +89,30 @@ RSpec.describe 'Custom Attribute Definitions API', type: :request do
         json_response = response.parsed_body
         expect(json_response['attribute_key']).to eq 'developer_id'
       end
+
+      context 'when creating with a conflicting attribute_key' do
+        let(:standard_key) { CustomAttributeDefinition::STANDARD_ATTRIBUTES[:conversation].first }
+        let(:conflicting_payload) do
+          {
+            custom_attribute_definition: {
+              attribute_display_name: 'Conflicting Key',
+              attribute_key: standard_key,
+              attribute_model: 'conversation_attribute',
+              attribute_display_type: 'text'
+            }
+          }
+        end
+
+        it 'returns error for conflicting key' do
+          post "/api/v1/accounts/#{account.id}/custom_attribute_definitions",
+               headers: user.create_new_auth_token,
+               params: conflicting_payload
+
+          expect(response).to have_http_status(:unprocessable_entity)
+          json_response = response.parsed_body
+          expect(json_response['message']).to include('The provided key is not allowed as it might conflict with default attributes.')
+        end
+      end
     end
   end
 

spec/services/conversations/filter_service_spec.rb

@@ -77,6 +77,63 @@ describe Conversations::FilterService do
         expect(result[:count][:all_count]).to be conversations.count
       end
 
+      it 'filter conversations by priority' do
+        conversation = create(:conversation, account: account, inbox: inbox, assignee: user_1, priority: :high)
+        params[:payload] = [
+          {
+            attribute_key: 'priority',
+            filter_operator: 'equal_to',
+            values: ['high'],
+            query_operator: nil,
+            custom_attribute_type: ''
+          }.with_indifferent_access
+        ]
+        result = filter_service.new(params, user_1).perform
+        expect(result[:conversations].length).to eq 1
+        expect(result[:conversations][0][:id]).to eq conversation.id
+      end
+
+      it 'filter conversations by multiple priority values' do
+        high_priority = create(:conversation, account: account, inbox: inbox, assignee: user_1, priority: :high)
+        urgent_priority = create(:conversation, account: account, inbox: inbox, assignee: user_1, priority: :urgent)
+        create(:conversation, account: account, inbox: inbox, assignee: user_1, priority: :low)
+
+        params[:payload] = [
+          {
+            attribute_key: 'priority',
+            filter_operator: 'equal_to',
+            values: %w[high urgent],
+            query_operator: nil,
+            custom_attribute_type: ''
+          }.with_indifferent_access
+        ]
+        result = filter_service.new(params, user_1).perform
+        expect(result[:conversations].length).to eq 2
+        expect(result[:conversations].pluck(:id)).to include(high_priority.id, urgent_priority.id)
+      end
+
+      it 'filter conversations with not_equal_to priority operator' do
+        create(:conversation, account: account, inbox: inbox, assignee: user_1, priority: :high)
+        create(:conversation, account: account, inbox: inbox, assignee: user_1, priority: :urgent)
+        low_priority = create(:conversation, account: account, inbox: inbox, assignee: user_1, priority: :low)
+        medium_priority = create(:conversation, account: account, inbox: inbox, assignee: user_1, priority: :medium)
+
+        params[:payload] = [
+          {
+            attribute_key: 'priority',
+            filter_operator: 'not_equal_to',
+            values: %w[high urgent],
+            query_operator: nil,
+            custom_attribute_type: ''
+          }.with_indifferent_access
+        ]
+        result = filter_service.new(params, user_1).perform
+
+        # Only include conversations with medium and low priority, excluding high and urgent
+        expect(result[:conversations].length).to eq 2
+        expect(result[:conversations].pluck(:id)).to include(low_priority.id, medium_priority.id)
+      end
+
       it 'filter conversations by additional_attributes and status with pagination' do
         params[:payload] = payload
         params[:page] = 2