diff --git a/compiled-lang/en.json b/compiled-lang/en.json index 6f094bf0..217807d7 100644 --- a/compiled-lang/en.json +++ b/compiled-lang/en.json @@ -49,7 +49,7 @@ "medium": "Medium", "moderate": "Moderate", "modified": "Modified", - "nA": "N/A", + "nA": "Not available", "name": "Name", "noAffectedClustersBody": "This recommendation does not affect any cluster.", "noAffectedClustersTitle": "No clusters", diff --git a/package-lock.json b/package-lock.json index 4f538d87..ef7968bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5176,8 +5176,6 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", "dev": true, - "optional": true, - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", @@ -5193,9 +5191,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true, - "optional": true, - "peer": true + "dev": true }, "node_modules/ajv-keywords": { "version": "3.5.2", @@ -31796,14 +31792,15 @@ "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", "dev": true, - "requires": {}, + "requires": { + "ajv": "^8.0.0" + }, "dependencies": { "ajv": { - "version": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", "dev": true, - "optional": true, - "peer": true, "requires": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", @@ -31815,9 +31812,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true, - "optional": true, - "peer": true + "dev": true } } }, diff --git a/src/Components/AffectedClustersTable/AffectedClustersTable.js b/src/Components/AffectedClustersTable/AffectedClustersTable.js index dcf7a478..cbf0ec29 100644 --- a/src/Components/AffectedClustersTable/AffectedClustersTable.js +++ b/src/Components/AffectedClustersTable/AffectedClustersTable.js @@ -205,7 +205,7 @@ const AffectedClustersTable = ({ query, rule, afterDisableFn }) => { , {r.cells[AFFECTED_CLUSTERS_VERSION_CELL] || - intl.formatMessage(messages.notAvailable)} + intl.formatMessage(messages.nA)} , {r.cells[AFFECTED_CLUSTERS_LAST_SEEN_CELL] ? ( diff --git a/src/Components/AffectedClustersTable/AffectedClustersTable.spec.ct.js b/src/Components/AffectedClustersTable/AffectedClustersTable.spec.ct.js index a030307f..e537ae45 100644 --- a/src/Components/AffectedClustersTable/AffectedClustersTable.spec.ct.js +++ b/src/Components/AffectedClustersTable/AffectedClustersTable.spec.ct.js @@ -634,14 +634,14 @@ describe('non-empty successful affected clusters table', () => { }); }); - it('missing impacted date shown as N/A', () => { + it('missing impacted date shown as Not available', () => { filterApply({ name: values.filter((v) => !Object.hasOwn(v, 'impacted'))[0].name, }); - cy.get('[data-label="Impacted"]').should('contain', 'N/A'); + cy.get('[data-label="Impacted"]').should('contain', 'Not available'); removeAllChips(); filterApply({ name: values.filter((v) => v['impacted'] === '')[0].name }); - cy.get('[data-label="Impacted"]').should('contain', 'N/A'); + cy.get('[data-label="Impacted"]').should('contain', 'Not available'); }); }); diff --git a/src/Components/ClustersListTable/ClustersListTable.js b/src/Components/ClustersListTable/ClustersListTable.js index db1b811a..1c0991ea 100644 --- a/src/Components/ClustersListTable/ClustersListTable.js +++ b/src/Components/ClustersListTable/ClustersListTable.js @@ -146,7 +146,7 @@ const ClustersListTable = ({ {it.cluster_name || it.cluster_id} , - ver === '0.0.0' ? intl.formatMessage(messages.notAvailable) : ver, + ver === '0.0.0' ? intl.formatMessage(messages.nA) : ver, it.total_hit_count, it.hits_by_total_risk?.[4] || 0, it.hits_by_total_risk?.[3] || 0, diff --git a/src/Messages.js b/src/Messages.js index 6fce2ec4..04d33337 100644 --- a/src/Messages.js +++ b/src/Messages.js @@ -364,8 +364,8 @@ export default defineMessages({ }, nA: { id: 'nA', - description: 'Abreviated as N/A, text equivelent, not applicable', - defaultMessage: 'N/A', + description: 'Abreviated as not available, text equivelent, not applicable', + defaultMessage: 'Not available', }, permsTitle: { id: 'permsTitle', @@ -605,10 +605,6 @@ export default defineMessages({ id: 'filterByVersion', defaultMessage: 'Filter by version', }, - notAvailable: { - id: 'notAvailable', - defaultMessage: 'Not available', - }, impacted: { id: 'impacted', defaultMessage: 'Impacted',