Merge branch 'main' into prod-x-feature-deployment

juspay · Jan 9, 2024 · 9f65bf2 · 9f65bf2
2 parents f838f0d + 29d917e
commit 9f65bf2
Show file tree

Hide file tree

Showing 66 changed files with 775 additions and 865 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,17 @@
+{
+  "env": {
+    "browser": true,
+    "es2021": true,
+    "node": true,
+    "shelljs": true
+  },
+  "extends": [],
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module"
+  },
+  "plugins": ["react-hooks"],
+  "rules": {
+    "react-hooks/rules-of-hooks": "error"
+  }
+}
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -60,7 +60,6 @@ body:
     validations:
       required: false
 
-
   - type: checkboxes
     id: no-duplicate-issues
     attributes:

diff --git a/.github/workflows/eslint-check.yml b/.github/workflows/eslint-check.yml
@@ -0,0 +1,30 @@
+name: ESLint
+
+on: [push]
+
+jobs:
+  eslint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.AUTO_RELEASE_PAT }}
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Install dependencies
+        run: npm install --force
+
+      - name: Build Rescript
+        run: npm run re:build
+
+      - name: Run ESLint
+        run: npm run lint:hooks
+        env:
+          CI: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,68 @@ All notable changes to this project will be documented in this file. See [conven
 
 - - -
 
+## 1.22.0 (2024-01-09)
+
+### Features
+
+- Modal added for Switch merchant switch. ([#213](https://github.com/juspay/hyperswitch-control-center/pull/213)) ([`660c706`](https://github.com/juspay/hyperswitch-control-center/commit/660c706b26c6a7177b36dd416483e4435e686fd4))
+
+**Full Changelog:** [`v1.21.0...v1.22.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.21.0...v1.22.0)
+
+- - -
+
+
+## 1.21.0 (2024-01-09)
+
+### Features
+
+- Customers module ([#198](https://github.com/juspay/hyperswitch-control-center/pull/198)) ([`c307fd7`](https://github.com/juspay/hyperswitch-control-center/commit/c307fd7bde4b3d43d54022b67f6be2265fc70eca))
+
+### Bug Fixes
+
+- Eslint issue ([#205](https://github.com/juspay/hyperswitch-control-center/pull/205)) ([`011edf1`](https://github.com/juspay/hyperswitch-control-center/commit/011edf188a610b7dd6977d32006cda3c5b029965))
+- Filters enhance ([#160](https://github.com/juspay/hyperswitch-control-center/pull/160)) ([`77cebce`](https://github.com/juspay/hyperswitch-control-center/commit/77cebced9bfd9621f7c15b40c92b82f9c8be8c4f))
+
+**Full Changelog:** [`v1.20.0...v1.21.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.20.0...v1.21.0)
+
+- - -
+
+
+## 1.20.0 (2024-01-08)
+
+### Features
+
+- Added new filters for payments ([#172](https://github.com/juspay/hyperswitch-control-center/pull/172)) ([`fd648de`](https://github.com/juspay/hyperswitch-control-center/commit/fd648de4e7cc0fde72b7316f9679abc248e0118f))
+
+### Bug Fixes
+
+- Connector integration status and disabled ui change ([#192](https://github.com/juspay/hyperswitch-control-center/pull/192)) ([`f784ef2`](https://github.com/juspay/hyperswitch-control-center/commit/f784ef27762098645886396e5043c219e566fa91))
+- Revert useField in TextInput ([#199](https://github.com/juspay/hyperswitch-control-center/pull/199)) ([`47cc5ed`](https://github.com/juspay/hyperswitch-control-center/commit/47cc5ede71736e1c6ecd5045b6f3b4c4b829436b))
+
+### Miscellaneous Tasks
+
+- Analytics files Js.Dict -> Dict migration ([#194](https://github.com/juspay/hyperswitch-control-center/pull/194)) ([`71934b5`](https://github.com/juspay/hyperswitch-control-center/commit/71934b58d459ca979d7d150c41478e05b205ebcc))
+
+**Full Changelog:** [`v1.19.5...v1.20.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.19.5...v1.20.0)
+
+- - -
+
+
+## 1.19.5 (2024-01-08)
+
+### Bug Fixes
+
+- Add merchant fix ([#184](https://github.com/juspay/hyperswitch-control-center/pull/184)) ([`7bc7226`](https://github.com/juspay/hyperswitch-control-center/commit/7bc7226cf2ee0c70b8dc49c73de91020c2f9b8e7))
+
+### Miscellaneous Tasks
+
+- Add eslint hook ([#166](https://github.com/juspay/hyperswitch-control-center/pull/166)) ([`4a10a94`](https://github.com/juspay/hyperswitch-control-center/commit/4a10a94728ec6d62897e3299c2c924301ad86f0f))
+
+**Full Changelog:** [`v1.19.4...v1.19.5`](https://github.com/juspay/hyperswitch-control-center/compare/v1.19.4...v1.19.5)
+
+- - -
+
+
 ## 1.19.4 (2024-01-05)
 
 ### Bug Fixes

diff --git a/docs/CODE_OF_CONDUCT.md b/docs/CODE_OF_CONDUCT.md
@@ -2,4 +2,4 @@
 
 The hyperswitch control center project adheres to the [Rescript](https://rescript-lang.org/community/code-of-conduct) and
 [React](https://github.com/facebook/react/blob/main/CODE_OF_CONDUCT.md) code of conduct.
-This describes the minimum behavior expected from all contributors.
+This describes the minimum behavior expected from all contributors.
diff --git a/docs/SECURITY.md b/docs/SECURITY.md
@@ -1,3 +1,5 @@
 # Security Policy
+
 ## Reporting a security issue
-The hyperswitch project team welcomes security reports and is committed to providing prompt attention to security issues. Security issues should be reported privately via the [advisories page on GitHub](https://github.com/juspay/hyperswitch/security/advisories/new) or by email at hyperswitch@juspay.in. Security issues should not be reported via the public GitHub Issue tracker.
+
+The hyperswitch project team welcomes security reports and is committed to providing prompt attention to security issues. Security issues should be reported privately via the [advisories page on GitHub](https://github.com/juspay/hyperswitch/security/advisories/new) or by email at hyperswitch@juspay.in. Security issues should not be reported via the public GitHub Issue tracker.
diff --git a/package.json b/package.json
@@ -19,19 +19,23 @@
     "re:format": "rescript format -all",
     "postinstall": "git config core.hooksPath .githooks && chmod +x .githooks/commit-msg",
     "cy:open": "cypress open",
-    "cy:run": "cypress run"
+    "cy:run": "cypress run",
+    "lint:hooks": "eslint src/ --max-warnings 0"
   },
   "husky": {
     "hooks": {
       "pre-commit": "npm run pre-commit"
     }
   },
   "devDependencies": {
+    "@eslint/create-config": "0.4.6",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
     "copy-webpack-plugin": "^9.0.0",
     "css-loader": "^5.0.1",
     "css-minimizer-webpack-plugin": "^5.0.1",
     "cypress": "^13.6.0",
+    "eslint": "latest",
+    "eslint-plugin-react-hooks": "^4.6.0",
     "file-loader": "^6.2.0",
     "husky": "^8.0.3",
     "mini-css-extract-plugin": "^1.3.1",

diff --git a/src/components/AnalyticsComponent/NestedDropdownWithCalendar.res b/src/components/AnalyticsComponent/NestedDropdownWithCalendar.res
diff --git a/src/components/Button.res b/src/components/Button.res
@@ -364,8 +364,9 @@ let make = (
   let parentRef = React.useRef(Js.Nullable.null)
   let dummyRef = React.useRef(Js.Nullable.null)
   let buttonRef = disableRipple ? dummyRef : parentRef
+  let rippleEffect = RippleEffectBackground.useHorizontalRippleHook(buttonRef)
   if !isPhoneDropdown {
-    RippleEffectBackground.useHorizontalRippleHook(buttonRef)
+    rippleEffect
   }
 
   let customTextOverFlowClass = switch textStyleClass {