Skip to content

Commit

Permalink
Merge branch 'main' of github.com:aiven/klaw into issue1593
Browse files Browse the repository at this point in the history
  • Loading branch information
muralibasani committed Oct 11, 2023
2 parents 84ee4ed + f37a091 commit 2c7120f
Show file tree
Hide file tree
Showing 73 changed files with 609 additions and 516 deletions.
8 changes: 4 additions & 4 deletions coral/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
"add-precommit": "git config --local core.hooksPath .githooks/"
},
"lint-staged": {
"**/*.{ts,tsx,js}": [
"**/!(*api.d).{ts,tsx,js}": [
"prettier --check",
"eslint"
],
"**/*.css": [
"**/*.{md, css}": [
"prettier --check"
],
"../openapi.yaml": [
Expand Down Expand Up @@ -72,7 +72,7 @@
"@testing-library/jest-dom": "^6.1.3",
"@testing-library/react": "^14.0.0",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "^14.4.3",
"@testing-library/user-event": "^14.5.1",
"@types/jest": "^29.5.5",
"@types/lodash": "^4.14.199",
"@types/node": "^18.17.14",
Expand All @@ -81,7 +81,7 @@
"@typescript-eslint/eslint-plugin": "^5.59.1",
"@typescript-eslint/parser": "^5.62.0",
"@vitejs/plugin-react": "^4.1.0",
"eslint": "^8.49.0",
"eslint": "^8.51.0",
"eslint-config-prettier": "^9.0.0",
"eslint-import-resolver-typescript": "^3.5.5",
"eslint-plugin-import": "^2.27.5",
Expand Down
113 changes: 54 additions & 59 deletions coral/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ describe("AclApprovals", () => {
env: "ALL",
pageNo: "1",
requestStatus: "CREATED",
operationType: "ALL",
search: "",
};

Expand Down
Loading

0 comments on commit 2c7120f

Please sign in to comment.