From 9b0a980a393e7b75c3c8561b092562f642f547d3 Mon Sep 17 00:00:00 2001 From: Jason Sylvestre Date: Thu, 23 Oct 2025 07:40:27 -0700 Subject: [PATCH 1/6] Enhances Team Admin member role view. Improves the Team Admin member role view by adding styling and pagination. The table displaying members and their roles is enhanced with data table functionality, including pagination, sorting, and responsive styling, to improve usability. Adds styles and scripts report partials. --- Keas.Mvc/Views/TeamAdmin/RoledMembers.cshtml | 118 ++++++++++++------- 1 file changed, 74 insertions(+), 44 deletions(-) diff --git a/Keas.Mvc/Views/TeamAdmin/RoledMembers.cshtml b/Keas.Mvc/Views/TeamAdmin/RoledMembers.cshtml index 182839f93..678233ef1 100644 --- a/Keas.Mvc/Views/TeamAdmin/RoledMembers.cshtml +++ b/Keas.Mvc/Views/TeamAdmin/RoledMembers.cshtml @@ -1,50 +1,80 @@ @model Keas.Mvc.Models.TeamAdminMembersListModel @{ - ViewData["Title"] = "Role Assigned Members "; - } -
-
-
-

Members with roles in @Model.Team.Name

- Add new Admin Role. -
+ ViewData["Title"] = "Role Assigned Members "; +} +
+
+
+

Members with roles in @Model.Team.Name

+ Add new Admin Role.
-
- - - - - - - + } + +
- Name - - Email - - Roles - + +
+ + + + + + + - - - - @foreach (var item in Model.UserRoles) { - - - - - + + + + + @foreach (var item in Model.UserRoles) + { + + + + + - - } - -
+ Name + + Email + + Roles + -
- @item.User.LastName, @item.User.FirstName - @Html.DisplayFor(a => item.User.Email) - @item.RolesList - - @Html.ActionLink("Remove Role(s)", "RemoveRoles", new { userId = item.User.Id}) -
+ @item.User.LastName, @item.User.FirstName + @Html.DisplayFor(a => item.User.Email) + @item.RolesList + + @Html.ActionLink("Remove Role(s)", "RemoveRoles", new { userId = item.User.Id }) +
-
- +
+
+
+ + +@section Styles +{ + @{ + await Html.RenderPartialAsync("_ReportStylePartial"); + } +} + +@section Scripts +{ + @{ + await Html.RenderPartialAsync("_ReportScriptsPartial"); + } + +} From a6c414d437c16531db4091c66672fe5613cdc849 Mon Sep 17 00:00:00 2001 From: Jason Sylvestre Date: Thu, 23 Oct 2025 08:06:24 -0700 Subject: [PATCH 2/6] rebuild --- Keas.Mvc/Views/TeamAdmin/RoledMembers.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Keas.Mvc/Views/TeamAdmin/RoledMembers.cshtml b/Keas.Mvc/Views/TeamAdmin/RoledMembers.cshtml index 678233ef1..f8abfcf2b 100644 --- a/Keas.Mvc/Views/TeamAdmin/RoledMembers.cshtml +++ b/Keas.Mvc/Views/TeamAdmin/RoledMembers.cshtml @@ -56,7 +56,7 @@ @{ await Html.RenderPartialAsync("_ReportStylePartial"); } -} +} @section Scripts { From cf194dd92780307ae2c005587226e16eee23a59a Mon Sep 17 00:00:00 2001 From: Jason Sylvestre Date: Thu, 23 Oct 2025 08:15:15 -0700 Subject: [PATCH 3/6] Updates the Azure Pipelines VM image Updates the Azure Pipelines VM image from 'windows-2019' to 'windows-latest'. This ensures the pipeline uses the most up-to-date Windows environment, providing access to the latest features, security patches, and tooling. --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9959595ac..e98ee2cb6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,7 +9,7 @@ trigger: name: 1.1.$(Date:yyMM).$(build.buildId) pool: - vmImage: 'windows-2019' + vmImage: 'windows-latest' variables: solution: '**/*.sln' From cd07f597d1876bf6deb5d5409923668b75120c36 Mon Sep 17 00:00:00 2001 From: Jason Sylvestre Date: Thu, 23 Oct 2025 08:35:45 -0700 Subject: [PATCH 4/6] Updates CI pipeline and Node version Updates the CI pipeline configuration to use Node 20.x. This change ensures compatibility with the latest dependencies and improves the build process. The pipeline now includes steps to build, test, and publish the application, including Keas.Mvc and related job projects. --- Keas.Mvc/ClientApp/package.json | 2 +- azure-pipelines.yml | 182 ++++++++++++++++---------------- 2 files changed, 92 insertions(+), 92 deletions(-) diff --git a/Keas.Mvc/ClientApp/package.json b/Keas.Mvc/ClientApp/package.json index b450bf24b..4f98612e0 100644 --- a/Keas.Mvc/ClientApp/package.json +++ b/Keas.Mvc/ClientApp/package.json @@ -95,6 +95,6 @@ }, "engines": { "npm": ">=9.5.1", - "node": ">=18.16.0" + "node": ">=20.0.0" } } diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e98ee2cb6..a663f430c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,111 +4,111 @@ # https://docs.microsoft.com/azure/devops/pipelines/languages/dotnet-core trigger: -- master + - master name: 1.1.$(Date:yyMM).$(build.buildId) pool: - vmImage: 'windows-latest' + vmImage: "windows-latest" variables: - solution: '**/*.sln' - buildPlatform: 'Any CPU' - buildConfiguration: 'Release' + solution: "**/*.sln" + buildPlatform: "Any CPU" + buildConfiguration: "Release" stages: -- stage: Build - jobs: - - job: - steps: - - task: NodeTool@0 - inputs: - versionSpec: '18.16.x' - - task: UseDotNet@2 - displayName: 'Use .NET Core 6.0.407 sdk' - inputs: - packageType: sdk - version: 6.0.407 - installationPath: $(Agent.ToolsDirectory)/dotnet - - - task: DotNetCoreCLI@2 - inputs: - command: 'restore' + - stage: Build + jobs: + - job: + steps: + - task: NodeTool@0 + inputs: + versionSpec: "20.x" + - task: UseDotNet@2 + displayName: "Use .NET Core 6.0.407 sdk" + inputs: + packageType: sdk + version: 6.0.407 + installationPath: $(Agent.ToolsDirectory)/dotnet - - task: DotNetCoreCLI@2 - displayName: 'Build Keas.Mvc' - inputs: - command: 'build' - projects: './Keas.Mvc/Keas.Mvc.csproj' - arguments: '--configuration $(BuildConfiguration) /property:Version=$(build.buildNumber)' + - task: DotNetCoreCLI@2 + inputs: + command: "restore" - - task: Npm@1 - inputs: - command: 'install' - workingDir: './Keas.Mvc' + - task: DotNetCoreCLI@2 + displayName: "Build Keas.Mvc" + inputs: + command: "build" + projects: "./Keas.Mvc/Keas.Mvc.csproj" + arguments: "--configuration $(BuildConfiguration) /property:Version=$(build.buildNumber)" - - task: DotNetCoreCLI@2 - displayName: 'Run Server Tests' - inputs: - command: 'test' + - task: Npm@1 + inputs: + command: "install" + workingDir: "./Keas.Mvc" - - task: Npm@1 - displayName: 'Run Client Tests' - inputs: - command: 'custom' - workingDir: './Keas.Mvc/ClientApp' - customCommand: 'run citest' + - task: DotNetCoreCLI@2 + displayName: "Run Server Tests" + inputs: + command: "test" - - task: PublishTestResults@2 - displayName: 'Publish Client Tests' - inputs: - testResultsFormat: 'VSTest' - testResultsFiles: '**/test-results.trx' - testRunTitle: 'Client Tests' + - task: Npm@1 + displayName: "Run Client Tests" + inputs: + command: "custom" + workingDir: "./Keas.Mvc/ClientApp" + customCommand: "run citest" -- stage: Publish - condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') - jobs: - - job: - steps: - - task: NodeTool@0 - inputs: - versionSpec: '18.16.x' - - task: UseDotNet@2 - displayName: 'Use .NET Core 6.0.407 sdk' - inputs: - packageType: sdk - version: 6.0.407 - installationPath: $(Agent.ToolsDirectory)/dotnet - - task: DotNetCoreCLI@2 - displayName: 'Publish Keas.Mvc' - inputs: - command: 'publish' - publishWebProjects: true - zipAfterPublish: false - modifyOutputPath: false - projects: './Keas.Mvc/Keas.Mvc.csproj' - arguments: '--configuration $(BuildConfiguration) --output $(build.artifactstagingdirectory)/' + - task: PublishTestResults@2 + displayName: "Publish Client Tests" + inputs: + testResultsFormat: "VSTest" + testResultsFiles: "**/test-results.trx" + testRunTitle: "Client Tests" - - task: DotNetCoreCLI@2 - displayName: 'Publish Keas.Jobs.SendMail' - inputs: - command: 'publish' - publishWebProjects: false - zipAfterPublish: false - projects: './Keas.Jobs.SendMail/Keas.Jobs.SendMail.csproj' - arguments: '--configuration $(BuildConfiguration) --output $(build.artifactstagingdirectory)/app_data/jobs/triggered' + - stage: Publish + condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') + jobs: + - job: + steps: + - task: NodeTool@0 + inputs: + versionSpec: "20.x" + - task: UseDotNet@2 + displayName: "Use .NET Core 6.0.407 sdk" + inputs: + packageType: sdk + version: 6.0.407 + installationPath: $(Agent.ToolsDirectory)/dotnet + - task: DotNetCoreCLI@2 + displayName: "Publish Keas.Mvc" + inputs: + command: "publish" + publishWebProjects: true + zipAfterPublish: false + modifyOutputPath: false + projects: "./Keas.Mvc/Keas.Mvc.csproj" + arguments: "--configuration $(BuildConfiguration) --output $(build.artifactstagingdirectory)/" - - task: DotNetCoreCLI@2 - displayName: 'Publish Keas.Jobs.LivedName' - inputs: - command: 'publish' - publishWebProjects: false - zipAfterPublish: false - projects: './Keas.Jobs.LivedName/Keas.Jobs.LivedName.csproj' - arguments: '--configuration $(BuildConfiguration) --output $(build.artifactstagingdirectory)/app_data/jobs/triggered' + - task: DotNetCoreCLI@2 + displayName: "Publish Keas.Jobs.SendMail" + inputs: + command: "publish" + publishWebProjects: false + zipAfterPublish: false + projects: "./Keas.Jobs.SendMail/Keas.Jobs.SendMail.csproj" + arguments: "--configuration $(BuildConfiguration) --output $(build.artifactstagingdirectory)/app_data/jobs/triggered" - - task: PublishBuildArtifacts@1 - displayName: 'Publish Artifact' - inputs: - PathtoPublish: '$(build.artifactstagingdirectory)' + - task: DotNetCoreCLI@2 + displayName: "Publish Keas.Jobs.LivedName" + inputs: + command: "publish" + publishWebProjects: false + zipAfterPublish: false + projects: "./Keas.Jobs.LivedName/Keas.Jobs.LivedName.csproj" + arguments: "--configuration $(BuildConfiguration) --output $(build.artifactstagingdirectory)/app_data/jobs/triggered" + + - task: PublishBuildArtifacts@1 + displayName: "Publish Artifact" + inputs: + PathtoPublish: "$(build.artifactstagingdirectory)" From 14f00f8585b6ec0cc768497148bba2c7267baf48 Mon Sep 17 00:00:00 2001 From: Jason Sylvestre Date: Thu, 23 Oct 2025 08:50:02 -0700 Subject: [PATCH 5/6] update readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index f8af5d699..2605d0580 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,8 @@ Get the app settings from Box and put them in your secrets location //This is the current version of node we are using +`>=20.0.0` +Old one: `nvm use 18.16.0` // when you are ready to debug locally From 5194d05412cd27818c81aa0d7c637c0104c117ec Mon Sep 17 00:00:00 2001 From: Jason Sylvestre Date: Thu, 23 Oct 2025 12:51:21 -0700 Subject: [PATCH 6/6] Updates npm engine version Updates the minimum required npm version to 10.0.0. This ensures compatibility with newer dependencies and build tools, as well as aligns with the project's ongoing upgrades. --- Keas.Mvc/ClientApp/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Keas.Mvc/ClientApp/package.json b/Keas.Mvc/ClientApp/package.json index 4f98612e0..25d6b95b1 100644 --- a/Keas.Mvc/ClientApp/package.json +++ b/Keas.Mvc/ClientApp/package.json @@ -94,7 +94,7 @@ } }, "engines": { - "npm": ">=9.5.1", + "npm": ">=10.0.0", "node": ">=20.0.0" } }