diff --git a/Keas.Mvc/ClientApp/package.json b/Keas.Mvc/ClientApp/package.json index b450bf24b..25d6b95b1 100644 --- a/Keas.Mvc/ClientApp/package.json +++ b/Keas.Mvc/ClientApp/package.json @@ -94,7 +94,7 @@ } }, "engines": { - "npm": ">=9.5.1", - "node": ">=18.16.0" + "npm": ">=10.0.0", + "node": ">=20.0.0" } } diff --git a/Keas.Mvc/Views/TeamAdmin/RoledMembers.cshtml b/Keas.Mvc/Views/TeamAdmin/RoledMembers.cshtml index 182839f93..f8abfcf2b 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"); + } + +} 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 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9959595ac..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-2019' + 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)"