From 1b05ee1706d70ce67903894eb241eb4a8b83c3dc Mon Sep 17 00:00:00 2001 From: JonahHatfield <6912620160@GSA.GOV> Date: Tue, 31 Oct 2023 15:36:22 -0400 Subject: [PATCH 01/10] Patching GitHub Dependabot vulnerabilities --- package-lock.json | 177 ++++++++++++++++++++++++++-------------------- 1 file changed, 102 insertions(+), 75 deletions(-) diff --git a/package-lock.json b/package-lock.json index f3792448..b18223b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -515,6 +515,34 @@ } } }, + "node_modules/@angular-devkit/build-angular/node_modules/vite/node_modules/postcss": { + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "nanoid": "^3.3.6", + "picocolors": "^1.0.0", + "source-map-js": "^1.0.2" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, "node_modules/@angular-devkit/build-angular/node_modules/webpack-dev-middleware": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.1.tgz", @@ -4319,9 +4347,9 @@ } }, "node_modules/@npmcli/fs/node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -7753,9 +7781,9 @@ } }, "node_modules/crypto-js": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz", - "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", + "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==" }, "node_modules/css-line-break": { "version": "2.1.0", @@ -8967,7 +8995,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", "integrity": "sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==", - "dev": true, "dependencies": { "es6-promise": "^4.0.3" } @@ -9906,14 +9933,49 @@ "node": ">=12" } }, - "node_modules/google-auth-library/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "bin": { - "semver": "bin/semver" + "node_modules/google-auth-library/node_modules/arrify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", + "engines": { + "node": ">=8" } }, + "node_modules/google-auth-library/node_modules/jwa": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", + "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/google-auth-library/node_modules/jws": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", + "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", + "dependencies": { + "jwa": "^2.0.0", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/google-auth-library/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/google-auth-library/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, "node_modules/google-p12-pem": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-4.0.1.tgz", @@ -9928,14 +9990,6 @@ "node": ">=12.0.0" } }, - "node_modules/google-p12-pem/node_modules/pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "engines": { - "node": ">=6" - } - }, "node_modules/googleapis": { "version": "114.0.0", "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-114.0.0.tgz", @@ -9972,14 +10026,6 @@ "uuid": "dist/bin/uuid" } }, - "node_modules/googleapis-common/node_modules/pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "engines": { - "node": ">=6" - } - }, "node_modules/gopd": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", @@ -10028,25 +10074,6 @@ "safe-buffer": "^5.0.1" } }, - "node_modules/gtoken/node_modules/mime": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", - "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/gtoken/node_modules/pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "engines": { - "node": ">=6" - } - }, "node_modules/guess-parser": { "version": "0.4.22", "resolved": "https://registry.npmjs.org/guess-parser/-/guess-parser-0.4.22.tgz", @@ -11383,9 +11410,9 @@ } }, "node_modules/istanbul-lib-source-maps/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "bin": { "semver": "bin/semver" @@ -11882,9 +11909,9 @@ } }, "node_modules/jsonwebtoken/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -12396,9 +12423,9 @@ } }, "node_modules/less/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "optional": true, "bin": { @@ -13718,9 +13745,9 @@ } }, "node_modules/normalize-package-data/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -17313,9 +17340,9 @@ } }, "node_modules/passport-jwt/node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -19193,9 +19220,9 @@ } }, "node_modules/semver-dsl/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "bin": { "semver": "bin/semver" @@ -19788,9 +19815,9 @@ } }, "node_modules/socket.io-parser": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz", - "integrity": "sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz", + "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==", "dev": true, "dependencies": { "@socket.io/component-emitter": "~3.1.0", @@ -20624,9 +20651,9 @@ } }, "node_modules/tslint/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "bin": { "semver": "bin/semver" @@ -21489,9 +21516,9 @@ } }, "node_modules/webdriver-manager/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "bin": { "semver": "bin/semver" From dc69c5b71468616cc6c360f20f85bbf8c9bc4e59 Mon Sep 17 00:00:00 2001 From: JonahHatfield <6912620160@GSA.GOV> Date: Thu, 30 Nov 2023 16:02:14 -0500 Subject: [PATCH 02/10] Replacing legacy technology labels with previously-known-as. Also, hid several columns of the websites report view so that users don't have to scroll horizontally (satisfies issue #119) --- .../it-standard-manager.component.html | 2 +- .../it-standards-modal.component.html | 2 +- .../views/systems/websites/websites.component.ts | 15 ++++++++++----- .../it-standards/it-standards.component.ts | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.html b/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.html index 55119276..061f7cd9 100644 --- a/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.html +++ b/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.html @@ -184,7 +184,7 @@
- +
diff --git a/src/app/components/modals/it-standards-modal/it-standards-modal.component.html b/src/app/components/modals/it-standards-modal/it-standards-modal.component.html index 21d27d4a..1c161d9e 100644 --- a/src/app/components/modals/it-standards-modal/it-standards-modal.component.html +++ b/src/app/components/modals/it-standards-modal/it-standards-modal.component.html @@ -84,7 +84,7 @@
Value
- Old IT Standard Name + Previously Known As {{ itStandard.OldName }} diff --git a/src/app/views/systems/websites/websites.component.ts b/src/app/views/systems/websites/websites.component.ts index ab82e8ae..1a0c2fbc 100644 --- a/src/app/views/systems/websites/websites.component.ts +++ b/src/app/views/systems/websites/websites.component.ts @@ -68,6 +68,7 @@ export class WebsitesComponent implements OnInit { field: 'contact_email', title: 'Contact Email', sortable: true, + visible: false, }, { field: 'production_status', @@ -78,17 +79,24 @@ export class WebsitesComponent implements OnInit { field: 'redirects_to', title: 'Redirect URL', sortable: true, + visible: false, }, { field: 'required_by_law_or_policy', title: 'Required?', sortable: true, + visible: false, }, { field: 'has_dap', title: 'Uses DAP?', sortable: true, }, + { + field: 'https', + title: 'HTTPS?', + sortable: true, + }, { field: 'mobile_friendly', title: 'Mobile Friendly?', @@ -103,6 +111,7 @@ export class WebsitesComponent implements OnInit { field: 'repository_url', title: 'Repository URL', sortable: true, + visible: false, }, { field: 'hosting_platform', @@ -113,11 +122,7 @@ export class WebsitesComponent implements OnInit { field: 'cms_platform', title: 'Content Management Platform', sortable: true, - }, - { - field: 'https', - title: 'HTTPS?', - sortable: true, + visible: false, }, { field: 'sub_office', diff --git a/src/app/views/technologies/it-standards/it-standards.component.ts b/src/app/views/technologies/it-standards/it-standards.component.ts index 24f7ff2b..ffc9ac68 100644 --- a/src/app/views/technologies/it-standards/it-standards.component.ts +++ b/src/app/views/technologies/it-standards/it-standards.component.ts @@ -110,7 +110,7 @@ export class ItStandardsComponent implements OnInit { formatter: this.sharedService.dateFormatter }, { field: 'OldName', - title: 'Old IT Standard Name', + title: 'Previously Known As', sortable: true, visible: false }, { From 5ca9d98d97402293ebf9f78a96d84d3528324e35 Mon Sep 17 00:00:00 2001 From: Jonah Hatfield Date: Tue, 12 Dec 2023 11:45:52 -0500 Subject: [PATCH 03/10] Updating aria-label to be consistent with the text on the page for the top-navbar More Links component, in relation to issue #171. --- src/app/components/top-navbar/top-navbar.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/top-navbar/top-navbar.component.html b/src/app/components/top-navbar/top-navbar.component.html index 16db6746..d14f4314 100644 --- a/src/app/components/top-navbar/top-navbar.component.html +++ b/src/app/components/top-navbar/top-navbar.component.html @@ -48,7 +48,7 @@ data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" - aria-label="Toggle Top Navigation" + aria-label="More Links" > More Links From d006f05b3b9c153069f7f43a0f6725bc87a4f7b4 Mon Sep 17 00:00:00 2001 From: King Wang <152906017+kinggsagov@users.noreply.github.com> Date: Tue, 26 Dec 2023 10:10:09 -0600 Subject: [PATCH 04/10] Replace link with pdf view --- .../framework/framework.component.html | 24 +++++++++++-------- .../strategy/framework/framework.component.ts | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/app/views/strategy/framework/framework.component.html b/src/app/views/strategy/framework/framework.component.html index 69215800..9793949f 100644 --- a/src/app/views/strategy/framework/framework.component.html +++ b/src/app/views/strategy/framework/framework.component.html @@ -1,11 +1,15 @@ - Download Full GSA IT Strategic Plan - - - - +
+
+

+ + + GSA strategic plan View + +

+
+
+ +
+
diff --git a/src/app/views/strategy/framework/framework.component.ts b/src/app/views/strategy/framework/framework.component.ts index d6806939..cb0fdfcd 100644 --- a/src/app/views/strategy/framework/framework.component.ts +++ b/src/app/views/strategy/framework/framework.component.ts @@ -7,7 +7,7 @@ import { Component, OnInit } from '@angular/core'; }) export class FrameworkComponent implements OnInit { - frameworkSrc = "/assets/img/GSA IT Strategic Framework.pdf" + pdfHeight = 1000; constructor() { } From 700b69b0c9112bc72b2fdc43a8a946b9edb76579 Mon Sep 17 00:00:00 2001 From: King Wang <152906017+kinggsagov@users.noreply.github.com> Date: Tue, 26 Dec 2023 10:47:39 -0600 Subject: [PATCH 05/10] Add fields for M-22-18 --- api/models/it-standards.model.ts | 6 +++++- api/queries/GET/get_it-standards.sql | 11 ++++++---- .../it-standards-modal.component.html | 20 +++++++++++++++++-- .../systems-modal/systems-modal.component.ts | 18 ++++++++++++++++- .../it-standards/it-standards.component.ts | 20 +++++++++++++++++++ 5 files changed, 67 insertions(+), 8 deletions(-) diff --git a/api/models/it-standards.model.ts b/api/models/it-standards.model.ts index adb6c49e..3f91986f 100644 --- a/api/models/it-standards.model.ts +++ b/api/models/it-standards.model.ts @@ -26,4 +26,8 @@ export class ITStandards { public Category: string = null; public OldName: string = null; public EndOfLifeDate: Date = null; -} \ No newline at end of file + public AttestationRequired: string = null; + public AttestationLink: string = null; + public Fedramp: string = null; + public OpenSource: string = null; +} diff --git a/api/queries/GET/get_it-standards.sql b/api/queries/GET/get_it-standards.sql index ff55bf3d..4cf955f1 100644 --- a/api/queries/GET/get_it-standards.sql +++ b/api/queries/GET/get_it-standards.sql @@ -1,4 +1,4 @@ -SELECT +SELECT tech.Id AS ID, -- tech.Keyname AS Name, IFNULL(tech.softwareReleaseName, tech.Keyname) AS Name, @@ -31,17 +31,20 @@ SELECT GROUP_CONCAT(DISTINCT obj_standard_category.Keyname SEPARATOR ', ') AS Category, tech.Keyname AS OldName, DATE(tech.endOfLifeDate) AS EndOfLifeDate - + tech.Attestation_Required AS AttestationRequired + tech.Attestation_Link AS AttestationLink + tech.Fedramp AS Fedramp + tech.Open_Source AS OpenSource FROM obj_technology AS tech LEFT JOIN obj_technology_status ON tech.obj_technology_status_Id = obj_technology_status.Id LEFT JOIN obj_deployment_type ON tech.obj_deployment_type_Id = obj_deployment_type.Id LEFT JOIN obj_standard_type ON tech.obj_standard_type_Id = obj_standard_type.Id LEFT JOIN obj_508_compliance_status ON tech.obj_508_compliance_status_Id = obj_508_compliance_status.Id - + LEFT JOIN zk_technology_poc ON tech.Id = zk_technology_poc.obj_technology_Id LEFT JOIN obj_ldap_poc AS poc ON zk_technology_poc.obj_ldap_SamAccountName = poc.SamAccountName LEFT JOIN obj_organization AS org ON poc.OrgCode = org.Org_Symbol LEFT JOIN zk_technology_standard_category ON tech.Id = zk_technology_standard_category.obj_technology_Id -LEFT JOIN obj_standard_category ON zk_technology_standard_category.obj_standard_category_Id = obj_standard_category.Id \ No newline at end of file +LEFT JOIN obj_standard_category ON zk_technology_standard_category.obj_standard_category_Id = obj_standard_category.Id diff --git a/src/app/components/modals/it-standards-modal/it-standards-modal.component.html b/src/app/components/modals/it-standards-modal/it-standards-modal.component.html index 1c161d9e..95ebee63 100644 --- a/src/app/components/modals/it-standards-modal/it-standards-modal.component.html +++ b/src/app/components/modals/it-standards-modal/it-standards-modal.component.html @@ -94,7 +94,7 @@
Value
{{ itStandard.ComplianceStatus }} - + Approval Expiration Date @@ -131,6 +131,22 @@
Value
Status {{ itStandard.Status }} + + Attestation Required + {{ itStandard.AttestationRequired }} + + + Attestation Link + {{ itStandard.AttestationLink }} + + + Fedramp + {{ itStandard.Fedramp }} + + + Open Source + {{ itStandard.OpenSource }} + Vendor Standard Organization @@ -169,4 +185,4 @@
Value
- \ No newline at end of file + diff --git a/src/app/components/modals/systems-modal/systems-modal.component.ts b/src/app/components/modals/systems-modal/systems-modal.component.ts index a81e5ceb..e58c8760 100644 --- a/src/app/components/modals/systems-modal/systems-modal.component.ts +++ b/src/app/components/modals/systems-modal/systems-modal.component.ts @@ -256,6 +256,22 @@ export class SystemsModalComponent implements OnInit { field: 'Category', title: 'Software Category', sortable: true, + }, { + field: 'AttestationRequired', + title: 'Attestation Required', + sortable: true, + }, { + field: 'AttestationLink', + title: 'Attestation Link', + sortable: true, + }, { + field: 'Fedramp', + title: 'Fedramp', + sortable: true, + }, { + field: 'OpenSource', + title: 'Open Source', + sortable: true, }, { field: 'ApprovalExpirationDate', title: 'Approved Status Expiration Date', @@ -575,4 +591,4 @@ sysWebsitesColumnDefs: any[] = [ $('#systemManager').modal('show'); } -} \ No newline at end of file +} diff --git a/src/app/views/technologies/it-standards/it-standards.component.ts b/src/app/views/technologies/it-standards/it-standards.component.ts index ffc9ac68..c51896b4 100644 --- a/src/app/views/technologies/it-standards/it-standards.component.ts +++ b/src/app/views/technologies/it-standards/it-standards.component.ts @@ -154,6 +154,26 @@ export class ItStandardsComponent implements OnInit { title: 'Comments', sortable: true, visible: false + }, { + field: 'AttestationRequired', + title: 'Attestation Required', + sortable: true, + visible: false + }, { + field: 'AttestationLink', + title: 'Attestation Link', + sortable: true, + visible: false + }, { + field: 'Fedramp', + title: 'Fedramp', + sortable: true, + visible: false + }, { + field: 'OpenSource', + title: 'Open Source', + sortable: true, + visible: false }, { field: 'ApprovalExpirationDate', title: 'Approval Expiration Date', From be218634e90d28b26fb6a980a321207a8f737245 Mon Sep 17 00:00:00 2001 From: King Wang <152906017+kinggsagov@users.noreply.github.com> Date: Tue, 26 Dec 2023 10:59:56 -0600 Subject: [PATCH 06/10] Fix query --- api/queries/GET/get_it-standards.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/queries/GET/get_it-standards.sql b/api/queries/GET/get_it-standards.sql index 4cf955f1..f49bb3f1 100644 --- a/api/queries/GET/get_it-standards.sql +++ b/api/queries/GET/get_it-standards.sql @@ -30,10 +30,10 @@ SELECT GROUP_CONCAT(DISTINCT CONCAT_WS(', ', CONCAT(poc.FirstName, ' ', poc.LastName), poc.Email, org.Display_Name) SEPARATOR '; ') AS POC, GROUP_CONCAT(DISTINCT obj_standard_category.Keyname SEPARATOR ', ') AS Category, tech.Keyname AS OldName, - DATE(tech.endOfLifeDate) AS EndOfLifeDate - tech.Attestation_Required AS AttestationRequired - tech.Attestation_Link AS AttestationLink - tech.Fedramp AS Fedramp + DATE(tech.endOfLifeDate) AS EndOfLifeDate, + tech.Attestation_Required AS AttestationRequired, + tech.Attestation_Link AS AttestationLink, + tech.Fedramp AS Fedramp, tech.Open_Source AS OpenSource FROM obj_technology AS tech From 85734dcd9963ed791a5da56810b0d75c60f704ad Mon Sep 17 00:00:00 2001 From: King Wang <152906017+kinggsagov@users.noreply.github.com> Date: Wed, 3 Jan 2024 14:29:19 -0600 Subject: [PATCH 07/10] Add form elements for the fields --- .../it-standard-manager.component.html | 35 ++++++++++++-- .../it-standard-manager.component.ts | 48 +++++++++++++------ 2 files changed, 65 insertions(+), 18 deletions(-) diff --git a/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.html b/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.html index 061f7cd9..46a91bf9 100644 --- a/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.html +++ b/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.html @@ -30,7 +30,7 @@
- +
- +
+
+
+ +
+ + +
+
+ +
+ +
+ + +
+
+ +
+ +
+ + +
+
+
+
@@ -373,4 +402,4 @@
- \ No newline at end of file + diff --git a/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.ts b/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.ts index e01fdf88..42964ebb 100644 --- a/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.ts +++ b/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.ts @@ -33,6 +33,10 @@ export class ItStandardManagerComponent implements OnInit { itStandCategory: new FormControl(null, [Validators.required]), itStand508: new FormControl(), itStandMyView: new FormControl(), + itStandReqAtte: new FormControl(), + itStandAtteLink: new FormControl(), + itStandFedramp: new FormControl(), + itStandOpenSource: new FormControl(), itStandVendorOrg: new FormControl(), itStandDeployment: new FormControl(null, [Validators.required]), itStandGoldImg: new FormControl(), @@ -90,7 +94,7 @@ export class ItStandardManagerComponent implements OnInit { ngOnInit(): void { //console.log("it-standard-manager.component.ts ngOnInit()"); //DEBUG - + // Emit setFormDefaults for when edit button is pressed if (this.sharedService.itStandardsFormSub == undefined) { this.sharedService.itStandardsFormSub = this.sharedService.itStandardsFormEmitter.subscribe(() => { this.setFormDefaults(); }); @@ -173,7 +177,7 @@ export class ItStandardManagerComponent implements OnInit { // Only set status default for creating new record const twoYearsLater = new Date(); twoYearsLater.setFullYear(twoYearsLater.getFullYear() + 2); - + if (this.createBool) { this.itStandardsForm.reset(); // Clear any erroneous values if any // Set Approval Expiration Date on Date Picker to +2 years from current date @@ -231,7 +235,7 @@ export class ItStandardManagerComponent implements OnInit { } // Adjust MyView for rendering - could turn this into one line: - var myView = this.itStandard.Available_through_Myview === 'T' + var myView = this.itStandard.Available_through_Myview === 'T' // Adjust Gold Image for rendering var goldImg = this.itStandard.Gold_Image === 'T' @@ -259,6 +263,10 @@ export class ItStandardManagerComponent implements OnInit { itStandCategory: categoryIDs, itStand508: this.sharedService.findInArray(this.compliance, 'Name', this.itStandard.ComplianceStatus), itStandMyView: myView, + itStandReqAtte: this.itStandard.AttestationRequired, + itStandAtteLink: this.itStandard.AttestationLink, + itStandFedramp: this.itStandard.Fedramp, + itStandOpenSource: this.itStandard.OpenSource, itStandVendorOrg: this.itStandard.Vendor_Standard_Organization, itStandDeployment: this.sharedService.findInArray(this.deploymentTypes, 'Name', this.itStandard.DeploymentType), itStandGoldImg: goldImg, @@ -271,9 +279,9 @@ export class ItStandardManagerComponent implements OnInit { }; submitForm() { - + //console.log("Submitting form"); //DEBUG - + //console.log("Form: ", this.itStandardsForm); // Debug if (this.itStandardsForm.valid) { @@ -284,6 +292,15 @@ export class ItStandardManagerComponent implements OnInit { if (this.itStandardsForm.value.itStandGoldImg) this.itStandardsForm.value.itStandGoldImg = 'T'; else this.itStandardsForm.value.itStandGoldImg = 'F'; + if (this.itStandardsForm.value.itStandReqAtte) this.itStandardsForm.value.itStandReqAtte = 'T'; + else this.itStandardsForm.value.itStandReqAtte = 'F'; + + if (this.itStandardsForm.value.itStandFedramp) this.itStandardsForm.value.itStandFedramp = 'T'; + else this.itStandardsForm.value.itStandFedramp = 'F'; + + if (this.itStandardsForm.value.itStandOpenSource) this.itStandardsForm.value.itStandOpenSource = 'T'; + else this.itStandardsForm.value.itStandOpenSource = 'F'; + // Set Date from Date Picker if ($('#itStandAprvExp').data('datepicker')) { this.itStandardsForm.value.itStandAprvExp = $('#itStandAprvExp').data('datepicker').getFormattedDate('yyyy-mm-dd'); @@ -294,6 +311,7 @@ export class ItStandardManagerComponent implements OnInit { if (!this.itStandardsForm.value.itStandGoldComment) this.itStandardsForm.value.itStandGoldComment = 'N/A'; if (!this.itStandardsForm.value.itStandComments) this.itStandardsForm.value.itStandComments = 'N/A'; if (!this.itStandardsForm.value.itStand508) this.itStandardsForm.value.itStand508 = '3'; + if (!this.itStandardsForm.value.itStandAtteLink) this.itStandardsForm.value.itStandAtteLink = 'N/A'; // replace ' from all text fields if (String(this.itStandardsForm.value.itStandDesc).includes("'")) { @@ -427,11 +445,11 @@ export class ItStandardManagerComponent implements OnInit { setTimeout(() => { try { //console.log("setting approval expiration date to: ", data.endOfLifeDate); //DEBUG - + if (data.endOfLifeDate !== '' && data.endOfLifeDate !== null && data.endOfLifeDate !== undefined && data.endOfLifeDate !== 'null' && data.endOfLifeDate !== 'undefined') { let date = new Date(data.endOfLifeDate); - + // set the endOfLifeDate to the value from the database this.endOfLifeDate = date; @@ -463,7 +481,7 @@ export class ItStandardManagerComponent implements OnInit { // handles the formatting of the endOfLifeDate formatEndOfLifeDate(data: any) { - //console.log("Formatting endOfLifeDate:", data); //DEBUG + //console.log("Formatting endOfLifeDate:", data); //DEBUG // return the data as a string in the format Month dd, yyyy if (data === null || data === undefined || data === 'null' || data === 'undefined' || data === '') { return null; @@ -509,10 +527,10 @@ export class ItStandardManagerComponent implements OnInit { // if the endOfLifeDate is not null if (data !== null) { //console.log("hasEndOfLifeDatePassed data.endOfLifeDate: ", data.endOfLifeDate); //DEBUG - + // get the endOfLifeDate as a Date object let date = new Date(data); - + // get today's date let today = new Date(); @@ -531,7 +549,7 @@ export class ItStandardManagerComponent implements OnInit { } manufacturerChange(manufacturer: any) { - + //console.log("Manufacturer changed to: ", manufacturer); //DEBUG this.softwareProductsLoading = true; @@ -579,7 +597,7 @@ export class ItStandardManagerComponent implements OnInit { } softwareProductChange(softwareProduct: any) { - + //console.log("Software Product changed to: ", softwareProduct); //DEBUG this.softwareVersionsLoading = true; @@ -620,7 +638,7 @@ export class ItStandardManagerComponent implements OnInit { } softwareVersionChange(softwareVersion: any) { - + //console.log("Software Version changed to: ", softwareVersion); //DEBUG this.softwareReleasesLoading = true; @@ -672,7 +690,7 @@ export class ItStandardManagerComponent implements OnInit { } disableSoftwareVersion(): void { - //console.log("Disabling Version"); + //console.log("Disabling Version"); $("#divVersion").addClass("disabledDivVersion"); } @@ -697,4 +715,4 @@ export class ItStandardManagerComponent implements OnInit { $("#divEndOfLifeDate").addClass("disabledDivEndOfLifeDate"); } -} \ No newline at end of file +} From def553ca3a84c37bcb0dfff3c36b6640a6bd8140 Mon Sep 17 00:00:00 2001 From: King Wang <152906017+kinggsagov@users.noreply.github.com> Date: Wed, 3 Jan 2024 15:27:39 -0600 Subject: [PATCH 08/10] Add form elements for the fields more --- api/controllers/it-standards.controller.js | 18 +++++++++++++++--- api/models/it-standards.model.ts | 8 ++++---- api/queries/GET/get_it-standards.sql | 10 +++++----- .../it-standard-manager.component.html | 17 ++++++++++++++--- .../it-standard-manager.component.ts | 4 ++++ 5 files changed, 42 insertions(+), 15 deletions(-) diff --git a/api/controllers/it-standards.controller.js b/api/controllers/it-standards.controller.js index 4f75d345..7d38ab34 100644 --- a/api/controllers/it-standards.controller.js +++ b/api/controllers/it-standards.controller.js @@ -34,7 +34,7 @@ exports.findSystems = (req, res) => { var query = fs.readFileSync(path.join(__dirname, queryPath, 'GET/get_systems.sql')).toString() + ` LEFT JOIN zk_systems_subsystems_technology AS mappings ON systems.\`ex:GEAR_ID\` = mappings.obj_systems_subsystems_Id LEFT JOIN obj_technology AS tech ON mappings.obj_technology_Id = tech.Id - + WHERE tech.Id = ${req.params.id} GROUP BY systems.\`ex:GEAR_ID\`;`; //removed LEFT JOIN cowboy_ods.obj_technology reference res = ctrl.sendQuery(query, 'systems using IT Standard', res); @@ -104,7 +104,11 @@ exports.update = (req, res) => { Vendor_Standard_Organization = '${data.itStandVendorOrg}', obj_deployment_type_Id = ${data.itStandDeployment}, Gold_Image = '${data.itStandGoldImg}', + Attestation_Required = '${data.itStandReqAtte}', + Fedramp = '${data.itStandFedramp}', + Open_Source = '${data.itStandOpenSource}', Gold_Image_Comment = '${data.itStandGoldComment}', + Attestation_Link = '${data.itStandAtteLink}', Approved_Status_Expiration_Date = ${data.itStandAprvExp}, Comments = '${data.itStandComments}', Reference_documents = ${data.itStandRefDocs}, @@ -129,7 +133,7 @@ exports.update = (req, res) => { res = ctrl.sendQuery(query + ' ' + logStatement, 'update IT Standard', res); //removed sendQuery_cowboy reference } else { //console.log('*** API Security Testing - API Auth Validation: FAILED'); //DEBUGGING - + //console.log('it-standard update no valid token!!!!'); res.status(502).json({ message: "No authorization token present. Not allowed to update IT-Standards" @@ -171,7 +175,11 @@ exports.create = (req, res) => { Vendor_Standard_Organization, Available_through_Myview, Gold_Image, + Attestation_Required, + Fedramp, + Open_Source, Gold_Image_Comment, + Attestation_Link, Comments, obj_technology_status_Id, obj_deployment_type_Id, @@ -195,7 +203,11 @@ exports.create = (req, res) => { '${data.itStandVendorOrg}', '${data.itStandMyView}', '${data.itStandGoldImg}', + '${data.itStandReqAtte}', + '${data.itStandFedramp}', + '${data.itStandOpenSource}', '${data.itStandGoldComment}', + '${data.itStandAtteLink}', '${data.itStandComments}', ${data.itStandStatus}, ${data.itStandDeployment}, @@ -255,4 +267,4 @@ exports.findTypes = (req, res) => { var query = fs.readFileSync(path.join(__dirname, queryPath, 'GET/get_it-standard_types.sql')).toString(); res = ctrl.sendQuery(query, 'IT Standard Types', res); //removed sendQuery_cowboy reference -}; \ No newline at end of file +}; diff --git a/api/models/it-standards.model.ts b/api/models/it-standards.model.ts index 3f91986f..4efe1605 100644 --- a/api/models/it-standards.model.ts +++ b/api/models/it-standards.model.ts @@ -6,7 +6,11 @@ export class ITStandards { public Vendor_Standard_Organization: string = null; public Available_through_Myview: string = null; public Gold_Image: string = null; + public AttestationRequired: string = null; + public Fedramp: string = null; + public OpenSource: string = null; public Gold_Image_Comment: string = null; + public AttestationLink: string = null; public Comments: string = null; public old_Id: string = null; public POCorg: string = null; @@ -26,8 +30,4 @@ export class ITStandards { public Category: string = null; public OldName: string = null; public EndOfLifeDate: Date = null; - public AttestationRequired: string = null; - public AttestationLink: string = null; - public Fedramp: string = null; - public OpenSource: string = null; } diff --git a/api/queries/GET/get_it-standards.sql b/api/queries/GET/get_it-standards.sql index f49bb3f1..e61f995a 100644 --- a/api/queries/GET/get_it-standards.sql +++ b/api/queries/GET/get_it-standards.sql @@ -7,7 +7,11 @@ SELECT tech.Vendor_Standard_Organization, tech.Available_through_Myview, tech.Gold_Image, + tech.Attestation_Required AS AttestationRequired, + tech.Fedramp AS Fedramp, + tech.Open_Source AS OpenSource, tech.Gold_Image_Comment, + tech.Attestation_Link AS AttestationLink, tech.Comments, tech.old_Id, tech.Reference_Documents AS ReferenceDocument, @@ -30,11 +34,7 @@ SELECT GROUP_CONCAT(DISTINCT CONCAT_WS(', ', CONCAT(poc.FirstName, ' ', poc.LastName), poc.Email, org.Display_Name) SEPARATOR '; ') AS POC, GROUP_CONCAT(DISTINCT obj_standard_category.Keyname SEPARATOR ', ') AS Category, tech.Keyname AS OldName, - DATE(tech.endOfLifeDate) AS EndOfLifeDate, - tech.Attestation_Required AS AttestationRequired, - tech.Attestation_Link AS AttestationLink, - tech.Fedramp AS Fedramp, - tech.Open_Source AS OpenSource + DATE(tech.endOfLifeDate) AS EndOfLifeDate FROM obj_technology AS tech LEFT JOIN obj_technology_status ON tech.obj_technology_status_Id = obj_technology_status.Id diff --git a/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.html b/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.html index 46a91bf9..d511f749 100644 --- a/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.html +++ b/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.html @@ -320,16 +320,25 @@
-
+
+ + +
+
+ +
+
-
-
+
+ +
diff --git a/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.ts b/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.ts index 42964ebb..66502a91 100644 --- a/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.ts +++ b/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.ts @@ -240,6 +240,10 @@ export class ItStandardManagerComponent implements OnInit { // Adjust Gold Image for rendering var goldImg = this.itStandard.Gold_Image === 'T' + var goldImg = this.itStandard.Attestation_Required === 'T' + var goldImg = this.itStandard.Fedramp === 'T' + var goldImg = this.itStandard.Open_Source === 'T' + // Parse and find IDs for list of Categories var categoryIDs = []; if (this.itStandard.Category) { From 6719c0caa797123bbb7dcda6418f8e6d60bbe0df Mon Sep 17 00:00:00 2001 From: King Wang <152906017+kinggsagov@users.noreply.github.com> Date: Thu, 4 Jan 2024 13:53:07 -0600 Subject: [PATCH 09/10] Update field refs --- api/controllers/it-standards.controller.js | 16 ++++++++-------- api/models/it-standards.model.ts | 8 ++++---- api/queries/GET/get_it-standards.sql | 8 ++++---- .../it-standard-manager.component.html | 8 ++++---- .../it-standard-manager.component.ts | 16 +++++++++------- 5 files changed, 29 insertions(+), 27 deletions(-) diff --git a/api/controllers/it-standards.controller.js b/api/controllers/it-standards.controller.js index 7d38ab34..d6668db3 100644 --- a/api/controllers/it-standards.controller.js +++ b/api/controllers/it-standards.controller.js @@ -104,11 +104,11 @@ exports.update = (req, res) => { Vendor_Standard_Organization = '${data.itStandVendorOrg}', obj_deployment_type_Id = ${data.itStandDeployment}, Gold_Image = '${data.itStandGoldImg}', - Attestation_Required = '${data.itStandReqAtte}', - Fedramp = '${data.itStandFedramp}', - Open_Source = '${data.itStandOpenSource}', + attestation_required = '${data.itStandReqAtte}', + fedramp = '${data.itStandFedramp}', + open_source = '${data.itStandOpenSource}', Gold_Image_Comment = '${data.itStandGoldComment}', - Attestation_Link = '${data.itStandAtteLink}', + attestation_link = '${data.itStandAtteLink}', Approved_Status_Expiration_Date = ${data.itStandAprvExp}, Comments = '${data.itStandComments}', Reference_documents = ${data.itStandRefDocs}, @@ -175,11 +175,11 @@ exports.create = (req, res) => { Vendor_Standard_Organization, Available_through_Myview, Gold_Image, - Attestation_Required, - Fedramp, - Open_Source, + attestation_required, + fedramp, + open_source, Gold_Image_Comment, - Attestation_Link, + attestation_link, Comments, obj_technology_status_Id, obj_deployment_type_Id, diff --git a/api/models/it-standards.model.ts b/api/models/it-standards.model.ts index 4efe1605..0ec17307 100644 --- a/api/models/it-standards.model.ts +++ b/api/models/it-standards.model.ts @@ -6,11 +6,11 @@ export class ITStandards { public Vendor_Standard_Organization: string = null; public Available_through_Myview: string = null; public Gold_Image: string = null; - public AttestationRequired: string = null; - public Fedramp: string = null; - public OpenSource: string = null; + public attestation_required: string = null; + public fedramp: string = null; + public open_source: string = null; public Gold_Image_Comment: string = null; - public AttestationLink: string = null; + public attestation_link: string = null; public Comments: string = null; public old_Id: string = null; public POCorg: string = null; diff --git a/api/queries/GET/get_it-standards.sql b/api/queries/GET/get_it-standards.sql index e61f995a..41e7d24b 100644 --- a/api/queries/GET/get_it-standards.sql +++ b/api/queries/GET/get_it-standards.sql @@ -7,11 +7,11 @@ SELECT tech.Vendor_Standard_Organization, tech.Available_through_Myview, tech.Gold_Image, - tech.Attestation_Required AS AttestationRequired, - tech.Fedramp AS Fedramp, - tech.Open_Source AS OpenSource, + tech.attestation_required AS AttestationRequired, + tech.fedramp AS Fedramp, + tech.open_source AS OpenSource, tech.Gold_Image_Comment, - tech.Attestation_Link AS AttestationLink, + tech.attestation_link, tech.Comments, tech.old_Id, tech.Reference_Documents AS ReferenceDocument, diff --git a/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.html b/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.html index d511f749..d3976ea0 100644 --- a/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.html +++ b/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.html @@ -315,7 +315,7 @@
+ formControlName="itStandReqAtte" [checked]="itStandard.attestation_required === 'T'">
@@ -324,7 +324,7 @@
+ [value]="itStandard.attestation_link">
@@ -333,7 +333,7 @@
+ formControlName="itStandFedramp" [checked]="itStandard.fedramp === 'T'">
@@ -342,7 +342,7 @@
+ formControlName="itStandOpenSource" [checked]="itStandard.open_source === 'T'">
diff --git a/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.ts b/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.ts index 66502a91..1ef0c2d1 100644 --- a/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.ts +++ b/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.ts @@ -240,9 +240,11 @@ export class ItStandardManagerComponent implements OnInit { // Adjust Gold Image for rendering var goldImg = this.itStandard.Gold_Image === 'T' - var goldImg = this.itStandard.Attestation_Required === 'T' - var goldImg = this.itStandard.Fedramp === 'T' - var goldImg = this.itStandard.Open_Source === 'T' + var attestationRequired = this.itStandard.attestation_required === 'T' + var fedramp = this.itStandard.fedramp === 'T' + var openSource = this.itStandard.open_source === 'T' + +console.log("attestationRequired", attestationRequired, fedramp, openSource, this.itStandard.attestation_link); // Parse and find IDs for list of Categories var categoryIDs = []; @@ -267,10 +269,10 @@ export class ItStandardManagerComponent implements OnInit { itStandCategory: categoryIDs, itStand508: this.sharedService.findInArray(this.compliance, 'Name', this.itStandard.ComplianceStatus), itStandMyView: myView, - itStandReqAtte: this.itStandard.AttestationRequired, - itStandAtteLink: this.itStandard.AttestationLink, - itStandFedramp: this.itStandard.Fedramp, - itStandOpenSource: this.itStandard.OpenSource, + itStandReqAtte: attestationRequired, + itStandAtteLink: this.itStandard.attestation_link, + itStandFedramp: fedramp, + itStandOpenSource: openSource, itStandVendorOrg: this.itStandard.Vendor_Standard_Organization, itStandDeployment: this.sharedService.findInArray(this.deploymentTypes, 'Name', this.itStandard.DeploymentType), itStandGoldImg: goldImg, From 13db36022687139907029763e80d9634b7146cf5 Mon Sep 17 00:00:00 2001 From: King Wang <152906017+kinggsagov@users.noreply.github.com> Date: Thu, 4 Jan 2024 15:42:29 -0600 Subject: [PATCH 10/10] Fix field names --- api/queries/GET/get_it-standards.sql | 6 +++--- .../it-standard-manager/it-standard-manager.component.ts | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/api/queries/GET/get_it-standards.sql b/api/queries/GET/get_it-standards.sql index 41e7d24b..573ae373 100644 --- a/api/queries/GET/get_it-standards.sql +++ b/api/queries/GET/get_it-standards.sql @@ -7,9 +7,9 @@ SELECT tech.Vendor_Standard_Organization, tech.Available_through_Myview, tech.Gold_Image, - tech.attestation_required AS AttestationRequired, - tech.fedramp AS Fedramp, - tech.open_source AS OpenSource, + tech.attestation_required, + tech.fedramp, + tech.open_source, tech.Gold_Image_Comment, tech.attestation_link, tech.Comments, diff --git a/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.ts b/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.ts index 1ef0c2d1..6482eb30 100644 --- a/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.ts +++ b/src/app/components/manager-modals/it-standard-manager/it-standard-manager.component.ts @@ -244,8 +244,6 @@ export class ItStandardManagerComponent implements OnInit { var fedramp = this.itStandard.fedramp === 'T' var openSource = this.itStandard.open_source === 'T' -console.log("attestationRequired", attestationRequired, fedramp, openSource, this.itStandard.attestation_link); - // Parse and find IDs for list of Categories var categoryIDs = []; if (this.itStandard.Category) {