diff --git a/package-lock.json b/package-lock.json index 0c8e005ef..4e9b8d6f6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28271,176 +28271,6 @@ "dev": true, "requires": {} }, - "@cypress/code-coverage": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/@cypress/code-coverage/-/code-coverage-3.10.0.tgz", - "integrity": "sha512-K5pW2KPpK4vKMXqxd6vuzo6m9BNgpAv1LcrrtmqAtOJ1RGoEILXYZVost0L6Q+V01NyY7n7jXIIfS7LR3nP6YA==", - "dev": true, - "requires": { - "@cypress/webpack-preprocessor": "^5.11.0", - "chalk": "4.1.2", - "dayjs": "1.10.7", - "debug": "4.3.4", - "execa": "4.1.0", - "globby": "11.0.4", - "istanbul-lib-coverage": "3.0.0", - "js-yaml": "3.14.1", - "nyc": "15.1.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "dayjs": { - "version": "1.10.7", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz", - "integrity": "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==", - "dev": true - }, - "execa": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", - "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.0", - "get-stream": "^5.0.0", - "human-signals": "^1.1.1", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.0", - "onetime": "^5.1.0", - "signal-exit": "^3.0.2", - "strip-final-newline": "^2.0.0" - } - }, - "get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "globby": { - "version": "11.0.4", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", - "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", - "dev": true, - "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", - "slash": "^3.0.0" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "human-signals": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", - "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", - "dev": true - }, - "ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", - "dev": true - }, - "istanbul-lib-coverage": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", - "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", - "dev": true - }, - "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "@cypress/react": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@cypress/react/-/react-7.0.2.tgz", - "integrity": "sha512-TTV7XNMDOO9mZUFWiGbd44Od/jqMVX/QbHYKQmK1XT3nIVFs0EvKJuHJmwN7wxLOR/+6twtyX6vTD8z8XBTliQ==", - "dev": true, - "requires": {} - }, "@cypress/request": { "version": "2.88.11", "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz", diff --git a/src/SmartComponents/ComplianceSystems/ComplianceSystems.js b/src/SmartComponents/ComplianceSystems/ComplianceSystems.js index 8acb3c6d8..dce830a94 100644 --- a/src/SmartComponents/ComplianceSystems/ComplianceSystems.js +++ b/src/SmartComponents/ComplianceSystems/ComplianceSystems.js @@ -44,6 +44,7 @@ export const ComplianceSystems = () => { Columns.customName({ showLink: true, }), + Columns.inventoryColumn('groups'), Columns.inventoryColumn('tags'), Columns.OS, Columns.Policies, diff --git a/src/SmartComponents/CreatePolicy/EditPolicySystems.js b/src/SmartComponents/CreatePolicy/EditPolicySystems.js index 4f2cd8a4a..ae447063a 100644 --- a/src/SmartComponents/CreatePolicy/EditPolicySystems.js +++ b/src/SmartComponents/CreatePolicy/EditPolicySystems.js @@ -101,6 +101,7 @@ export const EditPolicySystems = ({ }, sortBy: ['name'], }, + Columns.inventoryColumn('groups'), Columns.inventoryColumn('tags'), Columns.OperatingSystem, ]} diff --git a/src/SmartComponents/EditPolicy/EditPolicySystemsTab.js b/src/SmartComponents/EditPolicy/EditPolicySystemsTab.js index d15242a9b..f438c6645 100644 --- a/src/SmartComponents/EditPolicy/EditPolicySystemsTab.js +++ b/src/SmartComponents/EditPolicy/EditPolicySystemsTab.js @@ -56,6 +56,7 @@ const EditPolicySystemsTab = ({ policy, onSystemSelect, selectedSystems }) => { { Columns.customName({ showLink: true, }), + Columns.inventoryColumn('groups'), Columns.inventoryColumn('tags'), Columns.OS, Columns.SsgVersion, diff --git a/src/SmartComponents/ReportDetails/ReportDetails.js b/src/SmartComponents/ReportDetails/ReportDetails.js index 004b8f1f0..dec412295 100644 --- a/src/SmartComponents/ReportDetails/ReportDetails.js +++ b/src/SmartComponents/ReportDetails/ReportDetails.js @@ -161,6 +161,7 @@ export const ReportDetails = ({ route }) => { showLink: true, showOsInfo: true, }), + Columns.inventoryColumn('groups'), Columns.inventoryColumn('tags'), Columns.SsgVersion, Columns.FailedRules, diff --git a/src/SmartComponents/ReportDetails/ReportDetailsWithNotReportedSystems.js b/src/SmartComponents/ReportDetails/ReportDetailsWithNotReportedSystems.js index bb729ffe8..96935df3c 100644 --- a/src/SmartComponents/ReportDetails/ReportDetailsWithNotReportedSystems.js +++ b/src/SmartComponents/ReportDetails/ReportDetailsWithNotReportedSystems.js @@ -169,6 +169,7 @@ export const ReportDetails = ({ route }) => { showLink: true, showOsInfo: true, }), + Columns.inventoryColumn('groups'), Columns.inventoryColumn('tags'), Columns.SsgVersion, Columns.FailedRules, diff --git a/src/SmartComponents/SystemsTable/SystemsTable.js b/src/SmartComponents/SystemsTable/SystemsTable.js index 9c0732afd..55f899864 100644 --- a/src/SmartComponents/SystemsTable/SystemsTable.js +++ b/src/SmartComponents/SystemsTable/SystemsTable.js @@ -214,7 +214,7 @@ export const SystemsTable = ({ noSystemsTable={noSystemsTable} ref={inventory} getEntities={getEntities} - hideFilters={{ all: true, tags: false }} + hideFilters={{ all: true, tags: false, hostGroupFilter: false }} showTags onLoad={defaultOnLoad(columns)} tableProps={{