From 0e3b0831c3acc473a8247833be2f5cee0dd59155 Mon Sep 17 00:00:00 2001 From: Jeroen Dirks Date: Wed, 18 Dec 2019 09:50:46 +0000 Subject: [PATCH] Merged PR 47390: Added ChangeID to release check Added ChangeID to release check Related work items: #1079164 --- .vscode/launch.json | 15 +++++++++++ .vscode/settings.json | 3 +++ src/Releases.tsx | 11 ++++---- src/services/AzDoService.spec.tsx | 2 +- src/services/DummyData.tsx | 6 ++--- src/services/IAzDoService.tsx | 2 +- tsconfig.json | 45 ++++++++++++++++++------------- 7 files changed, 55 insertions(+), 29 deletions(-) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..d28ec26 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,15 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "chrome", + "request": "launch", + "name": "Launch Chrome", + "url": "http://localhost:3000", + "webRoot": "${workspaceFolder}" + } + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json index a25e888..f9c5e49 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -12,5 +12,8 @@ "editor.formatOnSave": true, "[typescriptreact]": { "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "editor.codeActionsOnSave": { + "source.fixAll.eslint": true } } diff --git a/src/Releases.tsx b/src/Releases.tsx index e59ee2e..d280879 100755 --- a/src/Releases.tsx +++ b/src/Releases.tsx @@ -38,7 +38,7 @@ interface ITableItem extends ISimpleTableCell { hasBranchFilterForAllArtifacts: IStatusProps; usesManagedAgentsOnly: IStatusProps; allArtifactsAreFromBuild: IStatusProps; - relatedToSm9Change: IStatusProps; + sM9ChangeId: string; } interface IReleaseProps {} @@ -84,7 +84,7 @@ class Releases extends React.Component< allArtifactsAreFromBuild: getDevopsUiStatus( x.allArtifactsAreFromBuild ), - relatedToSm9Change: getDevopsUiStatus(x.relatedToSm9Change) + sM9ChangeId: x.sM9ChangeId || "-" })) ); @@ -199,11 +199,10 @@ class Releases extends React.Component< } }, { - id: "relatedToSm9Change", - name: "Related to SM9", + id: "sM9ChangeId", + name: "SM9 Change", onSize: onSize, - renderCell: renderCheckmark, - className: "center", + renderCell: renderSimpleCell, width: new ObservableValue(130), sortProps: { ariaLabelAscending: "Sorted A to Z", diff --git a/src/services/AzDoService.spec.tsx b/src/services/AzDoService.spec.tsx index cf0af9a..efb8e94 100644 --- a/src/services/AzDoService.spec.tsx +++ b/src/services/AzDoService.spec.tsx @@ -18,7 +18,7 @@ describe("AzDoService", () => { }; let castedObject = objectWithoutProperty as IReleaseRule; - expect(castedObject.relatedToSm9Change).toBe(undefined); + expect(castedObject.sM9ChangeId).toBe(undefined); }); it("should return true if token expired", () => { diff --git a/src/services/DummyData.tsx b/src/services/DummyData.tsx index aff6ded..83bbb77 100644 --- a/src/services/DummyData.tsx +++ b/src/services/DummyData.tsx @@ -120,7 +120,7 @@ export const DummyReleaseReport: IReleaseReport = { hasBranchFilterForAllArtifacts: true, usesManagedAgentsOnly: false, allArtifactsAreFromBuild: false, - relatedToSm9Change: null + sM9ChangeId: null }, { release: "Release-199", @@ -133,7 +133,7 @@ export const DummyReleaseReport: IReleaseReport = { hasBranchFilterForAllArtifacts: false, usesManagedAgentsOnly: true, allArtifactsAreFromBuild: true, - relatedToSm9Change: false + sM9ChangeId: null }, { release: "Release-198", @@ -146,7 +146,7 @@ export const DummyReleaseReport: IReleaseReport = { hasBranchFilterForAllArtifacts: false, usesManagedAgentsOnly: null, allArtifactsAreFromBuild: null, - relatedToSm9Change: true + sM9ChangeId: "C000691701" } ] }; diff --git a/src/services/IAzDoService.tsx b/src/services/IAzDoService.tsx index 3963e98..5d9b21b 100644 --- a/src/services/IAzDoService.tsx +++ b/src/services/IAzDoService.tsx @@ -44,7 +44,7 @@ export interface IReleaseRule { hasBranchFilterForAllArtifacts: boolean | null | undefined; usesManagedAgentsOnly: boolean | null | undefined; allArtifactsAreFromBuild: boolean | null | undefined; - relatedToSm9Change: boolean | null | undefined; + sM9ChangeId: string | null | undefined; } export interface IExtensionDocument { diff --git a/tsconfig.json b/tsconfig.json index 5dea26b..b626192 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,20 +1,29 @@ { - "compilerOptions": { - "target": "es5", - "lib": ["dom", "dom.iterable", "esnext"], - "allowJs": true, - "skipLibCheck": true, - "esModuleInterop": true, - "allowSyntheticDefaultImports": true, - "strict": true, - "forceConsistentCasingInFileNames": true, - "module": "esnext", - "moduleResolution": "node", - "resolveJsonModule": true, - "isolatedModules": false, - "noEmit": true, - "jsx": "preserve", - "types": ["jest", "node"] - }, - "include": ["src"] + "compilerOptions": { + "target": "es5", + "lib": [ + "dom", + "dom.iterable", + "esnext" + ], + "allowJs": true, + "skipLibCheck": true, + "esModuleInterop": true, + "allowSyntheticDefaultImports": true, + "strict": true, + "forceConsistentCasingInFileNames": true, + "module": "esnext", + "moduleResolution": "node", + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true, + "jsx": "preserve", + "types": [ + "jest", + "node" + ] + }, + "include": [ + "src" + ] }