Merge pull request #1941 from frappe/develop

chore: dev to main
frappe · Aug 28, 2024 · 958a357 · 958a357
2 parents 1b98c1c + 8e8330c
commit 958a357
Show file tree

Hide file tree

Showing 191 changed files with 8,427 additions and 8,305 deletions.
diff --git a/.flake8 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
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,13 @@
+# Since version 2.23 (released in August 2019), git-blame has a feature
+# to ignore or bypass certain commits.
+#
+# This file contains a list of commits that are not likely what you
+# are looking for in a blame, such as mass reformatting or renaming.
+# You can set this file as a default ignore file for blame by running
+# the following command.
+#
+# $ git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+# bulk formatting
+b7fb25fe7c784c4dcf639cf954445ac8452a85d9
+353aaae07a5f56c5686caa79ce5d1e2e1544494a
diff --git a/.github/helpers/.flake8_strict 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
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -23,55 +23,25 @@ jobs:
           npm install @commitlint/cli @commitlint/config-conventional
           npx commitlint --verbose --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }}
 
-  eslint:
-    name: ESLint - Reviewdog
-    permissions:
-      contents: read
-      pull-requests: write
+  linter:
+    name: 'Frappe Linter'
     runs-on: ubuntu-latest
-    steps:
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-      - uses: actions/checkout@v3
-      - run: npm install -g yarn
-      - run: yarn install --frozen-lockfile
-      - uses: reviewdog/action-eslint@v1
-        with:
-          eslint_flags: '--ext vue --ext js --ext ts --ext json .'
-          fail_on_error: true
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          reporter: github-pr-review
+    if: github.event_name == 'pull_request'
 
-  black:
-    name: Black - Reviewdog
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.10'
-      - uses: actions/checkout@v3
-      - run: pip install black-with-tabs
-      - uses: reviewdog/action-black@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          reporter: github-pr-review
+      - uses: actions/checkout@v2
 
-  semgrep:
-    name: Semgrep Rules
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v2
         with:
           python-version: '3.10'
 
+      - name: Install and Run Pre-commit
+        uses: pre-commit/[email protected]
+
       - name: Download Semgrep rules
         run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules
-      
+
       - name: Download semgrep
         run: pip install semgrep
 

diff --git a/.husky/pre-commit b/.husky/pre-commit
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,44 +1,40 @@
-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:
+          - [email protected]
+        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
+  autoupdate_schedule: weekly
+  skip: []
+  submodules: false
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 [frappedesk.com](https://frappedesk.com)
 
 <div align="center" style="max-height: 40px;">
-	<a href="https://frappecloud.com/fdesk/signup">
+	<a href="https://frappecloud.com/helpdesk/signup">
 		<img src=".github/try-on-f-cloud-button.svg" height="50">
 	</a>
 </div>

diff --git 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/index.html b/desk/index.html
@@ -12,10 +12,10 @@
     <div id="popovers"></div>
     <script type="module" src="/src/main.js"></script>
     <script>
-      window.csrf_token = "{{ csrf_token }}"
-	  window.frappe_version = "{{ frappe_version }}"
-	  window.helpdesk_version = "{{ helpdesk_version }}"
-      window.site_name = "{{ site_name }}"
+      window.csrf_token = "{{ csrf_token }}";
+      window.frappe_version = "{{ frappe_version }}";
+      window.helpdesk_version = "{{ helpdesk_version }}";
+      window.site_name = "{{ site_name }}";
     </script>
   </body>
 </html>
diff --git 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/StarRating.vue b/desk/src/components/StarRating.vue
@@ -3,7 +3,7 @@
     <svg
       v-for="i in [1, 0.8, 0.6, 0.4, 0.2]"
       :key="i"
-      class="peer fill-gray-300 -all"
+      class="-all peer fill-gray-300"
       :class="{
         'fill-yellow-400': i <= rating,
         'cursor-pointer': !static,