From b7fb25fe7c784c4dcf639cf954445ac8452a85d9 Mon Sep 17 00:00:00 2001 From: RitvikSardana Date: Sun, 25 Aug 2024 09:53:08 +0530 Subject: [PATCH] fix(formatting): run new pre commit on the codebase --- .flake8 | 37 + .github/helpers/.flake8_strict | 73 + .pre-commit-config.yaml | 53 +- commitlint.config.js | 46 +- desk/postcss.config.js | 10 +- .../desk/global/AddNewAgentsDialog.vue | 390 ++- .../components/desk/global/CustomIcons.vue | 3052 ++++++++--------- .../desk/global/TimeDurationInput.vue | 220 +- .../canned_responses/CannedResponseList.vue | 153 +- .../CannedResponseListItem.vue | 82 +- .../ResponseTitleAndMessage.vue | 327 +- desk/src/components/global/Autocomplete.vue | 484 ++- desk/src/pages/onboarding/OnboardingIntro.vue | 20 +- desk/src/pages/onboarding/SetupName.vue | 66 +- .../src/pages/onboarding/SimpleOnboarding.vue | 2 +- desk/src/pages/onboarding/SuccessMessage.vue | 60 +- .../src/pages/onboarding/email/SetupEmail.vue | 6 +- .../pages/onboarding/email/SuccessMessage.vue | 18 +- desk/src/pages/onboarding/email/data.ts | 20 +- desk/src/stores/contact.ts | 34 +- helpdesk/api/account.py | 88 +- helpdesk/api/doc.py | 344 +- helpdesk/api/general.py | 64 +- helpdesk/api/session.py | 25 +- .../helpdesk/doctype/hd_agent/hd_agent.js | 6 +- .../helpdesk/doctype/hd_agent/hd_agent.py | 318 +- helpdesk/helpdesk/doctype/hd_article/api.py | 28 +- .../helpdesk/doctype/hd_article/hd_article.py | 117 +- .../hd_article_category.js | 6 +- .../hd_article_category.py | 83 +- .../hd_article_feedback.js | 6 +- .../hd_canned_response/hd_canned_response.js | 6 +- .../hd_canned_response/hd_canned_response.py | 63 +- .../doctype/hd_customer/hd_customer.js | 6 +- .../hd_desk_account_request.js | 6 +- .../hd_desk_account_request.py | 59 +- .../hd_escalation_rule/hd_escalation_rule.py | 70 +- .../doctype/hd_form_script/hd_form_script.py | 31 +- .../hd_notification/hd_notification.js | 6 +- .../hd_notification/hd_notification.py | 98 +- .../hd_organization/hd_organization.js | 6 +- .../hd_portal_signup_request.js | 6 +- .../hd_preset_filter/hd_preset_filter.js | 6 +- .../hd_service_holiday_list.js | 108 +- .../hd_service_holiday_list.py | 179 +- .../hd_service_holiday_list_calendar.js | 38 +- .../hd_service_level_agreement.js | 228 +- .../hd_service_level_agreement.py | 626 ++-- .../doctype/hd_settings/hd_settings.js | 8 +- .../doctype/hd_settings/hd_settings.py | 73 +- helpdesk/helpdesk/doctype/hd_team/hd_team.js | 6 +- helpdesk/helpdesk/doctype/hd_ticket/api.py | 319 +- .../helpdesk/doctype/hd_ticket/hd_ticket.py | 1614 ++++----- .../doctype/hd_ticket/test_hd_ticket.py | 173 +- .../hd_ticket_activity/hd_ticket_activity.js | 6 +- .../hd_ticket_comment/hd_ticket_comment.js | 6 +- .../patches/label_as_name.py | 14 +- .../hd_ticket_priority/hd_ticket_priority.js | 6 +- .../doctype/hd_ticket_template/api.py | 91 +- .../hd_ticket_template/hd_ticket_template.js | 4 +- .../hd_ticket_template/hd_ticket_template.py | 64 +- .../doctype/hd_ticket_type/hd_ticket_type.js | 4 +- .../first_response_time_for_tickets.js | 83 +- .../support_hour_distribution.js | 34 +- .../ticket_analytics/ticket_analytics.js | 233 +- .../ticket_analytics/ticket_analytics.py | 408 ++- .../report/ticket_summary/ticket_summary.js | 115 +- helpdesk/helpdesk/web_form/tickets/tickets.js | 4 +- .../patches/change_app_name_to_helpdesk.py | 2 +- helpdesk/patches/naming_autoincrement.py | 54 +- .../patches/template_remove_default_fields.py | 4 +- helpdesk/public/js/helpdesk.bundle.js | 2 +- helpdesk/public/js/utils.js | 140 +- helpdesk/search.py | 564 +-- helpdesk/setup/install.py | 431 +-- 75 files changed, 6171 insertions(+), 6071 deletions(-) create mode 100644 .flake8 create mode 100644 .github/helpers/.flake8_strict diff --git a/.flake8 b/.flake8 new file mode 100644 index 000000000..1828084a4 --- /dev/null +++ b/.flake8 @@ -0,0 +1,37 @@ +[flake8] +ignore = + E121, + E126, + E127, + E128, + E203, + E225, + E226, + E231, + E241, + E251, + E261, + E265, + E302, + E303, + E305, + E402, + E501, + E741, + W291, + W292, + W293, + W391, + W503, + W504, + F403, + B007, + B950, + W191, + E124, # closing bracket, irritating while writing QB code + E131, # continuation line unaligned for hanging indent + E123, # closing bracket does not match indentation of opening bracket's line + E101, # ensured by use of black + +max-line-length = 200 +exclude=.github/helper/semgrep_rules \ No newline at end of file diff --git a/.github/helpers/.flake8_strict b/.github/helpers/.flake8_strict new file mode 100644 index 000000000..64539b29b --- /dev/null +++ b/.github/helpers/.flake8_strict @@ -0,0 +1,73 @@ +[flake8] +ignore = + B007, + B009, + B010, + B950, + E101, + E111, + E114, + E116, + E117, + E121, + E122, + E123, + E124, + E125, + E126, + E127, + E128, + E131, + E201, + E202, + E203, + E211, + E221, + E222, + E223, + E224, + E225, + E226, + E228, + E231, + E241, + E242, + E251, + E261, + E262, + E265, + E266, + E271, + E272, + E273, + E274, + E301, + E302, + E303, + E305, + E306, + E402, + E501, + E502, + E701, + E702, + E703, + E741, + F403, + W191, + W291, + W292, + W293, + W391, + W503, + W504, + E711, + E129, + F841, + E713, + E712, + B023 + + +max-line-length = 200 +exclude=.github/helper/semgrep_rules,test_*.py \ No newline at end of file diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d2ee70380..00499d19d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,44 +1,41 @@ -exclude: 'node_modules|.git' +exclude: "node_modules|.git" default_stages: [commit] fail_fast: false - repos: - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.0.1 + - repo: https://github.com/psf/black + rev: 22.6.0 hooks: - - id: trailing-whitespace - files: "helpdesk.*" - exclude: ".*json$|.*txt$|.*csv|.*md" - - id: check-yaml - - id: no-commit-to-branch - args: ['--branch', 'develop'] - - id: check-merge-conflict - - id: check-ast + - id: black + types_or: [python, pyi] - repo: https://github.com/PyCQA/flake8 rev: 5.0.4 hooks: - id: flake8 - additional_dependencies: [ - 'flake8-bugbear', - ] - args: ['--config', '.github/helper/.flake8_strict'] - exclude: ".*setup.py$" - - - repo: https://github.com/adityahase/black - rev: 9cb0a69f4d0030cdf687eddf314468b39ed54119 - hooks: - - id: black - additional_dependencies: ['click==8.0.4'] + additional_dependencies: + - flake8-bugbear + - flake8-comprehensions + - flake8-simplify + args: ['--config', '.github/helpers/.flake8_strict'] - repo: https://github.com/pre-commit/mirrors-prettier - rev: v2.7.1 + rev: v2.6.2 hooks: - id: prettier - types_or: [javascript, vue, scss,ts] + additional_dependencies: + - prettier@2.6.2 + - prettier-plugin-tailwindcss@0.1.11 + types: [file] + types_or: [javascript, vue, html] + + - repo: https://github.com/timothycrosley/isort + rev: 5.12.0 + hooks: + - id: isort + args: [--profile, black] ci: - autoupdate_schedule: weekly - skip: [] - submodules: false \ No newline at end of file + autoupdate_schedule: weekly + skip: [] + submodules: false diff --git a/commitlint.config.js b/commitlint.config.js index 09de8b827..bd5cebceb 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -1,25 +1,25 @@ module.exports = { - parserPreset: "conventional-changelog-conventionalcommits", - rules: { - "subject-empty": [2, "never"], - "type-case": [2, "always", "lower-case"], - "type-empty": [2, "never"], - "type-enum": [ - 2, - "always", - [ - "build", - "chore", - "ci", - "docs", - "feat", - "fix", - "perf", - "refactor", - "revert", - "style", - "test", - ], - ], - }, + parserPreset: "conventional-changelog-conventionalcommits", + rules: { + "subject-empty": [2, "never"], + "type-case": [2, "always", "lower-case"], + "type-empty": [2, "never"], + "type-enum": [ + 2, + "always", + [ + "build", + "chore", + "ci", + "docs", + "feat", + "fix", + "perf", + "refactor", + "revert", + "style", + "test", + ], + ], + }, }; diff --git a/desk/postcss.config.js b/desk/postcss.config.js index 1b69d43b0..12a703d90 100644 --- a/desk/postcss.config.js +++ b/desk/postcss.config.js @@ -1,6 +1,6 @@ module.exports = { - plugins: { - tailwindcss: {}, - autoprefixer: {}, - }, -} + plugins: { + tailwindcss: {}, + autoprefixer: {}, + }, +}; diff --git a/desk/src/components/desk/global/AddNewAgentsDialog.vue b/desk/src/components/desk/global/AddNewAgentsDialog.vue index e21c61f5f..5e6a8e276 100644 --- a/desk/src/components/desk/global/AddNewAgentsDialog.vue +++ b/desk/src/components/desk/global/AddNewAgentsDialog.vue @@ -1,212 +1,208 @@ diff --git a/desk/src/components/desk/global/CustomIcons.vue b/desk/src/components/desk/global/CustomIcons.vue index fc02f9153..6e2145f97 100644 --- a/desk/src/components/desk/global/CustomIcons.vue +++ b/desk/src/components/desk/global/CustomIcons.vue @@ -1,1535 +1,1535 @@ diff --git a/desk/src/components/desk/global/TimeDurationInput.vue b/desk/src/components/desk/global/TimeDurationInput.vue index 1b5546728..b3559bc93 100644 --- a/desk/src/components/desk/global/TimeDurationInput.vue +++ b/desk/src/components/desk/global/TimeDurationInput.vue @@ -1,126 +1,126 @@ diff --git a/desk/src/components/desk/settings/canned_responses/CannedResponseList.vue b/desk/src/components/desk/settings/canned_responses/CannedResponseList.vue index e2add3add..e5479f730 100644 --- a/desk/src/components/desk/settings/canned_responses/CannedResponseList.vue +++ b/desk/src/components/desk/settings/canned_responses/CannedResponseList.vue @@ -1,86 +1,79 @@ diff --git a/desk/src/components/desk/settings/canned_responses/CannedResponseListItem.vue b/desk/src/components/desk/settings/canned_responses/CannedResponseListItem.vue index 855636cce..16946f0cf 100644 --- a/desk/src/components/desk/settings/canned_responses/CannedResponseListItem.vue +++ b/desk/src/components/desk/settings/canned_responses/CannedResponseListItem.vue @@ -1,47 +1,47 @@ diff --git a/desk/src/components/desk/settings/canned_responses/ResponseTitleAndMessage.vue b/desk/src/components/desk/settings/canned_responses/ResponseTitleAndMessage.vue index 54bf89eb4..878824c26 100644 --- a/desk/src/components/desk/settings/canned_responses/ResponseTitleAndMessage.vue +++ b/desk/src/components/desk/settings/canned_responses/ResponseTitleAndMessage.vue @@ -1,175 +1,164 @@ diff --git a/desk/src/components/global/Autocomplete.vue b/desk/src/components/global/Autocomplete.vue index 49ddd872f..aa7695424 100644 --- a/desk/src/components/global/Autocomplete.vue +++ b/desk/src/components/global/Autocomplete.vue @@ -1,265 +1,233 @@ diff --git a/desk/src/pages/onboarding/OnboardingIntro.vue b/desk/src/pages/onboarding/OnboardingIntro.vue index e821c4713..3bd7deb39 100644 --- a/desk/src/pages/onboarding/OnboardingIntro.vue +++ b/desk/src/pages/onboarding/OnboardingIntro.vue @@ -1,12 +1,12 @@ diff --git a/desk/src/pages/onboarding/SetupName.vue b/desk/src/pages/onboarding/SetupName.vue index 5dd02c1d6..c584f6dd8 100644 --- a/desk/src/pages/onboarding/SetupName.vue +++ b/desk/src/pages/onboarding/SetupName.vue @@ -1,22 +1,22 @@