Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Keas.Mvc/ClientApp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
}
},
"engines": {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes in npm and node usually go together. Should probably update the npm version here to whatever comes with node 20.0.0.

"npm": ">=9.5.1",
"node": ">=18.16.0"
"npm": ">=10.0.0",
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the one AI and google appear to say is the correct one.

"node": ">=20.0.0"
}
}
118 changes: 74 additions & 44 deletions Keas.Mvc/Views/TeamAdmin/RoledMembers.cshtml
Original file line number Diff line number Diff line change
@@ -1,50 +1,80 @@
@model Keas.Mvc.Models.TeamAdminMembersListModel

@{
ViewData["Title"] = "Role Assigned Members ";
}
<div class="card">
<div class="card-header-primary">
<div class="card-head row justify-content-between">
<h2>Members with roles in @Model.Team.Name</h2>
<a class="btn btn-link" asp-action="AddMemberRole"><i class="fas fa-plus fa-xs"/></i> Add new Admin Role.</a>
</div>
ViewData["Title"] = "Role Assigned Members ";
}
<div class="card">
<div class="card-header-primary">
<div class="card-head row justify-content-between">
<h2>Members with roles in @Model.Team.Name</h2>
<a class="btn btn-link" asp-action="AddMemberRole"><i class="fas fa-plus fa-xs" /></i> Add new Admin Role.</a>
</div>
<div class="card-content">
<table class="table">
<thead>
<tr>
<th>
Name
</th>
<th>
Email
</th>
<th>
Roles
</th>
<th>
</div>
<div class="card-content">
<table class="table">
<thead>
<tr>
<th>
Name
</th>
<th>
Email
</th>
<th>
Roles
</th>
<th>

</th>
</tr>
</thead>
<tbody>
@foreach (var item in Model.UserRoles) {
<tr>
<td>
@item.User.LastName, @item.User.FirstName
</td>
<td>@Html.DisplayFor(a => item.User.Email)</td>
<td>
@item.RolesList
</td>
<td>
@Html.ActionLink("Remove Role(s)", "RemoveRoles", new { userId = item.User.Id})
</td>
</th>
</tr>
</thead>
<tbody>
@foreach (var item in Model.UserRoles)
{
<tr>
<td>
@item.User.LastName, @item.User.FirstName
</td>
<td>@Html.DisplayFor(a => item.User.Email)</td>
<td>
@item.RolesList
</td>
<td>
@Html.ActionLink("Remove Role(s)", "RemoveRoles", new { userId = item.User.Id })
</td>

</tr>
}
</tbody>
</table>
</div>
</div>
</tr>
}
</tbody>
</table>
</div>
</div>


@section Styles
{
@{
await Html.RenderPartialAsync("_ReportStylePartial");
}
}

@section Scripts
{
@{
await Html.RenderPartialAsync("_ReportScriptsPartial");
}
<script type="text/javascript">
$(function () {
$(".table").dataTable({
"columnDefs": [
{
targets: -1,
className: 'dt-body-right',
sortable: false,
},

]
});
});
</script>
}
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
182 changes: 91 additions & 91 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)"