Merge branch 'develop' into feat/spike-poc-dashboard-side-panel

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
     -   id: check-merge-conflict
     -   id: debug-statements
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+    rev: v3.3.2
     hooks:
     -   id: pyupgrade
         args:
@@ -31,17 +31,17 @@ repos:
     hooks:
     -   id: black
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.2.0
+    rev: v1.4.1
     hooks:
     -   id: mypy
         exclude: (^docs/|^splunk_add_on_ucc_framework/commands/imports.py)
         additional_dependencies: ['types-PyYAML']
 -   repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
+    rev: 5.0.4
     hooks:
     -   id: flake8
         exclude: (^splunk_add_on_ucc_framework/commands/init_template/|^splunk_add_on_ucc_framework/commands/imports.py)
 -   repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.40.0
+    rev: v0.42.0
     hooks:
     -   id: markdownlint

pyproject.toml

@@ -42,7 +42,7 @@ classifiers = [
 python = "^3.7"
 jinja2 = ">=2,<4"
 addonfactory-splunk-conf-parser-lib = "^0.4.3"
-dunamai = "^1.9.0"
+dunamai = "^1.22.0"
 jsonschema = "^4.4.0"
 PyYAML = "^6.0"
 defusedxml = "^0.7.1"
@@ -52,8 +52,8 @@ colorama = "^0.4.6"
 mkdocs = "^1.4.2"
 importlib-metadata = {version="*", python="<3.8"}
 pytest = "^7.2.1"
-pytest-splunk-addon = "^5.0.0"
-pytest-splunk-addon-ui-smartx = "^5.0.0"
+pytest-splunk-addon = "^5.4.0"
+pytest-splunk-addon-ui-smartx = "^5.3.0"
 pytest-rerunfailures = "^11.1.1"
 mkdocs-material = "^9.1.3"
 mkdocstrings = {version=">=0", extras=["python"]}

tests/ui/pytest.ini

@@ -5,7 +5,7 @@ addopts = -vv
           --splunk-host=localhost
           --splunk-user=admin
           --splunk-password=Chang3d!
-          --splunk-hec-token=9b741d03-43e9-4164-908b-e09102327d22
+          --splunk-hec-token=4a8a737d-5452-426c-a6f7-106dca4e813f
           --browser=chrome
           --local
           --persist-browser
@@ -24,3 +24,4 @@ markers =
     execute_enterprise_cloud_false: tests not to be executed on enterprise cloud
     forwarder: tests to be run on forwarder/standalone
     sanity_test: tests for sanity check of addons
+    configuration: tests related to the configuration tab

ui/package.json

@@ -21,22 +21,22 @@
     "test-storybook:update-snapshots": "yarn run test-storybook -u"
   },
   "dependencies": {
-    "@splunk/dashboard-action-buttons": "^27.3.1",
-    "@splunk/dashboard-context": "^27.3.1",
-    "@splunk/dashboard-core": "^27.3.1",
-    "@splunk/dashboard-presets": "^27.3.1",
-    "@splunk/dashboard-state": "^27.3.1",
-    "@splunk/dashboard-types": "^27.3.1",
-    "@splunk/react-icons": "^4.7.0",
+    "@splunk/dashboard-action-buttons": "^27.4.0",
+    "@splunk/dashboard-context": "^27.4.0",
+    "@splunk/dashboard-core": "^27.4.0",
+    "@splunk/dashboard-presets": "^27.4.0",
+    "@splunk/dashboard-state": "^27.4.0",
+    "@splunk/dashboard-types": "^27.4.0",
+    "@splunk/react-icons": "^4.8.0",
     "@splunk/react-page": "^7.1.0",
     "@splunk/react-toast-notifications": "^0.11.3",
-    "@splunk/react-ui": "^4.37.0",
+    "@splunk/react-ui": "^4.38.0",
     "@splunk/search-job": "^3.1.0",
     "@splunk/splunk-utils": "^3.1.0",
-    "@splunk/themes": "^0.21.0",
+    "@splunk/themes": "^0.22.0",
     "@splunk/ui-utils": "^1.7.1",
-    "@splunk/visualization-context": "^26.2.1",
-    "@storybook/test": "^8.3.1",
+    "@splunk/visualization-context": "^26.3.0",
+    "@storybook/test": "^8.3.4",
     "axios": "^1.7.7",
     "immutability-helper": "^3.1.1",
     "license-webpack-plugin": "^4.0.2",
@@ -61,23 +61,23 @@
     "@splunk/babel-preset": "^4.0.0",
     "@splunk/eslint-config": "^4.0.0",
     "@splunk/webpack-configs": "^7.0.2",
-    "@storybook/addon-a11y": "^8.3.1",
-    "@storybook/addon-essentials": "^8.3.1",
-    "@storybook/addon-interactions": "^8.3.1",
-    "@storybook/addon-links": "^8.3.1",
+    "@storybook/addon-a11y": "^8.3.4",
+    "@storybook/addon-essentials": "^8.3.4",
+    "@storybook/addon-interactions": "^8.3.4",
+    "@storybook/addon-links": "^8.3.4",
     "@storybook/addon-webpack5-compiler-babel": "^3.0.3",
-    "@storybook/blocks": "^8.3.1",
-    "@storybook/react": "^8.3.1",
-    "@storybook/react-webpack5": "^8.3.1",
+    "@storybook/blocks": "^8.3.4",
+    "@storybook/react": "^8.3.4",
+    "@storybook/react-webpack5": "^8.3.4",
     "@storybook/test-runner": "^0.19.1",
     "@testing-library/dom": "^8.20.1",
     "@testing-library/jest-dom": "^6.5.0",
     "@testing-library/react": "^12.1.5",
     "@testing-library/user-event": "^14.5.2",
     "@types/jest": "^29.5.13",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^20.16.5",
-    "@types/react": "^16.14.61",
+    "@types/node": "^20.16.10",
+    "@types/react": "^16.14.62",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
     "babel-eslint": "^10.1.0",
@@ -93,33 +93,33 @@
     "eslint-plugin-jest": "^28.8.3",
     "eslint-plugin-jsx-a11y": "^6.10.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-react": "^7.36.1",
+    "eslint-plugin-react": "^7.37.1",
     "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-storybook": "^0.8.0",
+    "eslint-plugin-storybook": "^0.9.0",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-image-snapshot": "^6.4.0",
     "js-yaml": "^4.1.0",
-    "msw": "2.4.8",
+    "msw": "2.4.9",
     "msw-storybook-addon": "^2.0.3",
     "prettier": "^2.8.8",
     "querystring-es3": "^0.2.1",
-    "storybook": "^8.3.1",
+    "storybook": "^8.3.4",
     "style-loader": "^4.0.0",
     "stylelint": "^14.16.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.6.2",
     "undici": "^5.28.4",
     "url": "^0.11.4",
-    "webpack": "^5.94.0",
+    "webpack": "^5.95.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.1.0",
     "webpack-merge": "^6.0.1"
   },
   "resolutions": {
     "@npmcli/git": "^2.1.0",
-    "@types/react": "^16.14.61",
+    "@types/react": "^16.14.62",
     "css-what": "^5.1.0",
     "glob-parent": "^5.1.2",
     "postcss": "^8.4.47",

ui/src/components/EntityModal/EntityModal.test.tsx

@@ -39,11 +39,9 @@ describe('Oauth field disabled on edit - diableonEdit property', () => {
         render(<EntityModal {...props} handleRequestClose={handleRequestClose} />);
     };
 
-    const getDisabledOauthField = () =>
-        document.getElementsByClassName('oauth_oauth_text_jest_test')[1];
+    const getDisabledOauthField = () => document.querySelector('.oauth_oauth_text_jest_test input');
 
-    const getDisabledBasicField = () =>
-        document.getElementsByClassName('basic_oauth_text_jest_test')[1];
+    const getDisabledBasicField = () => document.querySelector('.basic_oauth_text_jest_test input');
 
     it('Oauth Oauth - disableonEdit = true, oauth field not disabled on create', async () => {
         setUpConfigWithDisabedOauth();
@@ -144,8 +142,7 @@ describe('Options - Enable field property', () => {
         render(<EntityModal {...props} handleRequestClose={handleRequestClose} />);
     };
 
-    const getDisabledOauthField = () =>
-        document.getElementsByClassName('oauth_oauth_text_jest_test')[1];
+    const getDisabledOauthField = () => document.querySelector('.oauth_oauth_text_jest_test input');
 
     it('Oauth Oauth - Enable field equal false, so field disabled', async () => {
         setUpConfigWithDisabledComplitelyOauthField();