Commit Graph
1869 Commits
Author SHA1 Message Date
iamsivin 545e352d13 chore: Minor fix after merge conflicts 2024-07-31 11:19:55 +05:30
Sivin VargheseandGitHub 98fa2957a1 Merge branch 'develop' into feat/setup-eslint-rules 2024-07-31 11:18:32 +05:30
Sivin VargheseandGitHub f7102d7f8b fix: Table styles (#9860)
# Pull Request Template

## Description

This PR will fix table style breakage in the portal and inbox pre-chat
form settings pages.

## Type of change

- [x] Bug fix (non-breaking change which fixes an issue)

## How Has This Been Tested?

**Before**

1. 
<img width="1563" alt="image"
src="https://github.com/user-attachments/assets/b9eb7962-90ba-4a73-8221-08cb00e699e3">

2. 
<img width="1190" alt="image"
src="https://github.com/user-attachments/assets/d60ca321-9743-4c30-ba3c-a34633f6f360">

3. 
<img width="1190" alt="image"
src="https://github.com/user-attachments/assets/a0a91780-030e-4154-b80b-7dd7bade08e7">

4. 
<img width="1190" alt="image"
src="https://github.com/user-attachments/assets/dbd99e24-f907-48c4-b460-db2f03453bda">


**After**
1.
<img width="1613" alt="image"
src="https://github.com/user-attachments/assets/aa5cb340-965d-4956-b1e7-79d955a62f19">

2. 
<img width="1203" alt="image"
src="https://github.com/user-attachments/assets/dcb2b9df-e6a5-48a4-a5dd-2c1fc25fc9b2">

3. 
<img width="1203" alt="image"
src="https://github.com/user-attachments/assets/409f3983-7987-4250-b311-cbea5e757e47">

4. 
<img width="1203" alt="image"
src="https://github.com/user-attachments/assets/27db4709-6b67-459a-a784-fd902f202964">



## Checklist:

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
2024-07-31 11:17:05 +05:30
iamsivin 66e53d7408 chore: Minor event fix after merge develop 2024-07-31 00:25:35 +05:30
iamsivin daa660ca44 Merge branch 'develop' into feat/setup-eslint-rules 2024-07-31 00:21:16 +05:30
ce8e1ec93d chore: Migrate all instances of old vuelidate to new v2 syntax [CW-3274] (#9623)
Removes all the old vuelidate syntax and replaced it with the new
`useValidate` composable and the `v$` helper.

| Component | Path | Migrated | Tested |

|------------------------------------|--------------------------------------------------------------|-----------------------------------------------|--------|
| Login page | app/javascript/v3/views/login/Index.vue |  |  |
| Custom Attributes settings page |
app/javascript/dashboard/components/CustomAttribute.vue |  |  |
| Account settings page |
app/javascript/dashboard/routes/dashboard/settings/account/Index.vue | 
|  |
| Add Account Modal |
app/javascript/dashboard/components/layout/sidebarComponents/AddAccountModal.vue
|  |  |
| AICTA Modal |
app/javascript/dashboard/components/widgets/AICTAModal.vue |  |  |
| Conversation Advanced Filters |
app/javascript/dashboard/components/widgets/conversation/ConversationAdvancedFilter.vue
| deprecated `$each` prop in validations object | |
| Email Transript Modal |
app/javascript/dashboard/components/widgets/conversation/EmailTranscriptModal.vue
|  |  |
| Linear Create Issue |
app/javascript/dashboard/components/widgets/conversation/linear/CreateIssue.vue
|  |  |
| Template Parser |
app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplateParser.vue
|  | |
| Delete Confirmation Modal |
app/javascript/dashboard/components/widgets/modal/ConfirmDeleteModal.vue
|  |  |
| Add Custom Attribute |
app/javascript/dashboard/modules/contact/components/AddCustomAttribute.vue
|  |  |
| Merge Contacts |
app/javascript/dashboard/modules/contact/components/MergeContact.vue | 
|  |
| Contacts Advanced Filters |
app/javascript/dashboard/routes/dashboard/contacts/components/ContactsAdvancedFilters.vue
| deprecated `$each` prop in validations object | |
| Contact Form |
app/javascript/dashboard/routes/dashboard/conversation/contact/ContactForm.vue
|  |  |
| Conversation Form |
app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
|  |  |
| Add Custom Views |
app/javascript/dashboard/routes/dashboard/customviews/AddCustomViews.vue
|  |  |
| Add Locale |
app/javascript/dashboard/routes/dashboard/helpcenter/components/AddLocale.vue
|  |  |
| Portal Settings Basic Form |
/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue
|  |  |
| Portal Settings Customization Form |
/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsCustomizationForm.vue
|  |  |
| Add Category |
app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/AddCategory.vue
|  |  |
| Edit Category |
app/javascript/dashboard/routes/dashboard/helpcenter/pages/categories/EditCategory.vue
|  |  |
| CSML Bot Editor |
app/javascript/dashboard/routes/dashboard/settings/agentBots/components/CSMLBotEditor.vue
|  |  |
| Add Agent |
app/javascript/dashboard/routes/dashboard/settings/agents/AddAgent.vue |
 |  |
| Edit Agent |
app/javascript/dashboard/routes/dashboard/settings/agents/EditAgent.vue
|  |  |
| Add Attribute |
app/javascript/dashboard/routes/dashboard/settings/attributes/AddAttribute.vue
|  |  |
| Edit Attribute |
app/javascript/dashboard/routes/dashboard/settings/attributes/EditAttribute.vue
|  |  |
| Add Campaign |
app/javascript/dashboard/routes/dashboard/settings/campaigns/AddCampaign.vue
|  |  |
| Edit Campaign |
app/javascript/dashboard/routes/dashboard/settings/campaigns/EditCampaign.vue
|  |  |
| Add Canned |
app/javascript/dashboard/routes/dashboard/settings/canned/AddCanned.vue
|  |  |
| Edit Canned |
app/javascript/dashboard/routes/dashboard/settings/canned/EditCanned.vue
|  |  |
| IMAP Settings |
app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue
|  |  |
| SMTP Settings |
app/javascript/dashboard/routes/dashboard/settings/inbox/SmtpSettings.vue
|  |  |
| Widget Builder |
app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue
|  |  |
| 360 Dialog Whatsapp |
app/javascript/dashboard/routes/dashboard/settings/inbox/channels/360DialogWhatsapp.vue
|  |  |
| Inbox API settings |
app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Api.vue
|  |  |
| SMS Bandwidth settings |
app/javascript/dashboard/routes/dashboard/settings/inbox/channels/BandwidthSms.vue
|  |  |
| Cloud Whatsapp Settings |
app/javascript/dashboard/routes/dashboard/settings/inbox/channels/CloudWhatsapp.vue
|  |  |
| Facebook Settings |
app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Facebook.vue
|  |  |
| Line Settings |
app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Line.vue
|  |  |
| Telegram Settings |
app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Telegram.vue
|  |  |
| Twillio Settings |
app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Twilio.vue
|  |  |
| Forward To option settings |
app/javascript/dashboard/routes/dashboard/settings/inbox/channels/emailChannels/ForwardToOption.vue
|  |  |
| Microsoft settings |
app/javascript/dashboard/routes/dashboard/settings/inbox/channels/emailChannels/Microsoft.vue
|  |  |
| Collaborators page |
app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
|  |  |
| Configuration Page |
app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
|  |  |
| Dashboard App Modal Settings |
app/javascript/dashboard/routes/dashboard/settings/integrations/DashboardApps/DashboardAppModal.vue
|  |  |
| Settings - Webhook Form |
app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
|  |  |
| Macro Form |
app/javascript/dashboard/routes/dashboard/settings/macros/MacroForm.vue
| deprecated `$each` prop in validations object | |
| Change Password |
app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue
|  |  |
| settings - User Basic Details |
app/javascript/dashboard/routes/dashboard/settings/profile/UserBasicDetails.vue
|  |  |
| Password Edit | app/javascript/v3/views/auth/password/Edit.vue |  | 
|
| Password Reset form |
app/javascript/v3/views/auth/reset/password/Index.vue |  |  |
| Signup form |
app/javascript/v3/views/auth/signup/components/Signup/Form.vue |  |  |
| Login form | app/javascript/v3/views/login/Index.vue |  |  |
| Custom Attributes |
app/javascript/dashboard/components/CustomAttribute.vue |  |  |
| Reply Email Head |
app/javascript/dashboard/components/widgets/conversation/ReplyEmailHead.vue
|  |  |
| Methods Mixin |
app/javascript/dashboard/mixins/automations/methodsMixin.js |  |  |
| Validations mixin |
app/javascript/dashboard/routes/dashboard/settings/labels/validationMixin.js
|  |  |
| SLA Form |
app/javascript/dashboard/routes/dashboard/settings/sla/SlaForm.vue |  |
 |
| SLA Time Input |
app/javascript/dashboard/routes/dashboard/settings/sla/SlaTimeInput.vue
|  |  |
| SLA Validation Mixin |
app/javascript/dashboard/routes/dashboard/settings/sla/validationMixin.js
|  |  |
| Team Form |
app/javascript/dashboard/routes/dashboard/settings/teams/TeamForm.vue |
 |  |
| Add Agents |
app/javascript/dashboard/routes/dashboard/settings/teams/Create/AddAgents.vue
|  |  |
| Edit Agents |
app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditAgents.vue
|  |  |


---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Pranav <pranav@chatwoot.com>
2024-07-30 15:08:22 +05:30
Fayaz AhmedandGitHub dc9da4bb24 fix: Contact merge dropdowns with adjusted margins-[CW-3494] (#9846)
# Pull Request Template

## Description
![CleanShot 2024-07-27 at 22 16
45@2x](https://github.com/user-attachments/assets/79a35610-1844-41cc-b006-09323892a54b)


Adjusts the margin for dropdown and sets the height to auto from
hardcoded 52px.

Fixes CW-3494

## Type of change

Please delete options that are not relevant.

- [x] Bug fix (non-breaking change which fixes an issue)

## How Has This Been Tested?

Tested locally, attached screenshot
2024-07-30 13:29:16 +05:30
Sivin VargheseandGitHub 1fcdf42cc8 Merge branch 'chore/vuelidate-v2-migration' into feat/setup-eslint-rules 2024-07-29 20:05:38 +05:30
Sivin VargheseandGitHub dca97875a7 Merge branch 'develop' into chore/vuelidate-v2-migration 2024-07-29 20:05:16 +05:30
Chatwoot BotandGitHub a196e23587 chore: Update translations (#9845) 2024-07-29 06:36:09 -07:00
iamsivin 743cb99d30 fix: apply ESLint rule vue/no-unused-properties 2024-07-29 17:23:56 +05:30
Sivin VargheseandGitHub 6aa03b3ce1 Merge branch 'chore/vuelidate-v2-migration' into feat/setup-eslint-rules 2024-07-29 17:23:13 +05:30
Shivam Mishra d9c918253d test: update test to check for translation keys 2024-07-29 12:40:09 +05:30
Sivin VargheseandGitHub 227be4df58 Merge branch 'chore/vuelidate-v2-migration' into feat/setup-eslint-rules 2024-07-28 08:34:34 +05:30
Sivin VargheseandGitHub 081e25395b Merge branch 'develop' into chore/vuelidate-v2-migration 2024-07-28 08:15:29 +05:30
Chatwoot BotandGitHub 066f0b990a chore: Update translations (#9841)
- update translations
2024-07-26 14:53:52 -07:00
Sivin VargheseandGitHub b80c825b7c Merge branch 'chore/vuelidate-v2-migration' into feat/setup-eslint-rules 2024-07-26 13:24:59 +05:30
iamsivin 0b2477c47e fix: apply ESLint rule vue/require-macro-variable-name 2024-07-26 12:47:47 +05:30
iamsivin 16bc70b6dc fix: apply ESLint rule vue/prefer-true-attribute-shorthand 2024-07-26 12:34:36 +05:30
Shivam Mishra d3d2e361b2 feat: translate error messages in automation 2024-07-26 12:21:08 +05:30
Shivam Mishra a55ec03eb1 feat: use transtion keys to mark errors 2024-07-26 12:21:08 +05:30
iamsivin fd6375fc6c fix: apply ESLint rule vue/prefer-separate-static-class 2024-07-26 12:02:22 +05:30
iamsivin 34ca9868a5 fix: apply ESLint rule vue/prefer-prop-type-boolean-first 2024-07-26 11:56:17 +05:30
iamsivin 29007de112 fix: apply ESLint rule vue/padding-line-between-blocks 2024-07-26 11:52:27 +05:30
iamsivin cef0491d15 fix: apply ESLint rule vue/no-useless-v-bind 2024-07-26 11:43:30 +05:30
iamsivin e1d0b56557 fix: apply ESLint rule vue/no-use-v-else-with-v-for 2024-07-26 11:21:47 +05:30
iamsivin 8742ef67db fix: apply ESLint rule vue/no-unused-refs 2024-07-26 11:13:04 +05:30
iamsivin af3c55937b fix: apply ESLint rule vue/no-unused-emit-declarations 2024-07-26 09:19:23 +05:30
iamsivin 7f520535dd fix: apply ESLint rule vue/no-static-inline-styles 2024-07-26 08:47:19 +05:30
Sivin VargheseandGitHub b651f5ec92 Merge branch 'chore/vuelidate-v2-migration' into feat/setup-eslint-rules 2024-07-26 08:28:58 +05:30
PranavandGitHub 3119f6cbf5 Merge branch 'develop' into chore/vuelidate-v2-migration 2024-07-25 16:29:38 -07:00
6694db093f feat: Update the design for dashboard_apps (#9840)
This PR migrates the dashboard apps page to the new layout and includes
the following updates:

- Create a compact design for the back button
- Add a back button to the settings header
- Reduce letter-spacing on the description
- Fix mobile styles
- Migrate the layout of dashboard apps/index to new layouts


Note: I've moved all feature help URLs from features.yml to the frontend. This change prevents features.yml from becoming bloated due to frontend modifications.

---------

Co-authored-by: Sojan Jose <sojan@pepalo.com>
2024-07-25 16:26:00 -07:00
Sivin VargheseandGitHub 96ab20b756 Merge branch 'chore/vuelidate-v2-migration' into feat/setup-eslint-rules 2024-07-26 02:03:17 +05:30
Sivin VargheseandGitHub ca465f0f3b Merge branch 'develop' into chore/vuelidate-v2-migration 2024-07-26 02:03:06 +05:30
iamsivin 063d216247 fix: apply ESLint rule vue/no-required-prop-with-default 2024-07-26 02:01:23 +05:30
iamsivin 1321a79b4c fix: apply ESLint rule vue/no-empty-component-block 2024-07-26 01:48:43 +05:30
iamsivin b316b47f74 fix: apply ESLint rule vue/no-bare-strings-in-template 2024-07-26 01:43:44 +05:30
Chatwoot BotandGitHub 027a540bbd chore: Update translations from Crowdin (#9835) 2024-07-25 11:58:22 -07:00
iamsivin a3229cee99 fix: apply ESLint rule vue/define-macros-order 2024-07-25 23:58:58 +05:30
iamsivin 89311b54d5 fix: Broken snapshot 2024-07-25 23:47:25 +05:30
iamsivin ecb0b4a4f4 fix: apply ESLint rule vue/custom-event-name-casing 2024-07-25 23:40:54 +05:30
iamsivin 2ef9274450 fix: apply ESLint rule vue/component-options-name-casing 2024-07-25 19:51:42 +05:30
iamsivin 3ce70f4e14 fix: apply ESLint rule vue/component-name-in-template-casing 2024-07-25 19:42:48 +05:30
iamsivin 0008fca511 fix: apply ESLint rule vue/component-tags-order 2024-07-25 19:33:28 +05:30
Shivam Mishra 9ef3e8ab74 feat: include "remove_assigned_team" in no params list 2024-07-25 16:35:42 +05:30
Shivam Mishra 63f8a49107 fix: ensure v$ is present 2024-07-25 16:35:42 +05:30
Sivin VargheseandGitHub 2f46f337f0 Merge branch 'develop' into chore/vuelidate-v2-migration 2024-07-25 15:35:05 +05:30
Sivin VargheseandGitHub 239c61095a fix: Show add/import/export buttons in mobile view (#9761) 2024-07-25 14:08:32 +05:30
Shivam MishraandGitHub 5695eafa29 Merge branch 'develop' into chore/vuelidate-v2-migration 2024-07-25 11:25:33 +05:30
Shivam Mishra 1bd654a8c5 test: fix usage of email validator 2024-07-25 11:13:20 +05:30