Skip to content

Develop #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Carl Sixsmith (carlsixsmith-moj) merged 7 commits into from
Nov 4, 2025
Merged

Develop #9

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f6aa9cc
Publish build artifacts
samgibsonmoj Nov 4, 2025
4880713
Deploy on push to main
samgibsonmoj Nov 4, 2025
fcd9564
sqlproj required field
samgibsonmoj Nov 4, 2025
f3896b4
Finalise save network
samgibsonmoj Nov 4, 2025
dbce946
Remove Orchestrator from Aspire orchestration (unneeded)
samgibsonmoj Nov 4, 2025
21b5be1
Include status message for post-deployment ClusterDb script
samgibsonmoj Nov 4, 2025
8bea018
Prefer raiserror over print for status messages
samgibsonmoj Nov 4, 2025
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
33 changes: 33 additions & 0 deletions .github/workflows/build-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Build Artifacts

on:
push:
branches:
- develop
- main

jobs:
deploy:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v5

- name: Setup .NET
uses: actions/setup-dotnet@v5
with:
dotnet-version: 10.0.x

- name: Restore
run: dotnet restore

- name: Publish
run: dotnet publish -c Release --artifacts-path ./output

- name: Upload build artifacts
uses: actions/upload-artifact@v4
with:
name: build-outputs
path: ./output/publish
if-no-files-found: error
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Comment thread
samgibsonmoj marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Deploy
on:
push:
branches:
- develop
# - develop
- main

permissions:
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire/Aspire.AppHost/Extensions/AppExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static IDistributedApplicationBuilder AddDmsServices(
//builder.AddDmsService<Meow>("Meow", rabbit, databases);
builder.AddDmsService<Offloc_Cleaner>("Offloc-Cleaner", rabbit, databases);
builder.AddDmsService<Offloc_Parser>("Offloc-Parser", rabbit, databases);
builder.AddDmsService<Orchestrator>("Orchestrator", rabbit, databases);
//builder.AddDmsService<Orchestrator>("Orchestrator", rabbit, databases);
Comment thread
samgibsonmoj marked this conversation as resolved.

// Entry point - start the app to 'kick off' DMS
builder.AddDmsService<Kickoff>("Kickoff", rabbit, databases)
Expand Down
12 changes: 6 additions & 6 deletions src/AuditDb/AuditDb.sqlproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<Project DefaultTargets="Build">
<Sdk Name="Microsoft.Build.Sql" Version="2.0.0" />
<PropertyGroup>
<Name>AuditDb</Name>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
<ModelCollation>1033, CI</ModelCollation>
<RootNamespace>AuditDb</RootNamespace>
<AssemblyName>AuditDb</AssemblyName>
<Name>AuditDb</Name>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
<ModelCollation>1033, CI</ModelCollation>
<RootNamespace>AuditDb</RootNamespace>
<AssemblyName>AuditDb</AssemblyName>
<ProjectGuid>{00000000-0000-0000-0000-000000000000}</ProjectGuid>
</PropertyGroup>

</Project>
13 changes: 7 additions & 6 deletions src/ClusterDb/ClusterDb.sqlproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build">
<Sdk Name="Microsoft.Build.Sql" Version="2.0.0" />
<PropertyGroup>
<Name>ClusterDb</Name>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
<ModelCollation>1033, CI</ModelCollation>
<RootNamespace>ClusterDb</RootNamespace>
<AssemblyName>ClusterDb</AssemblyName>
<Name>ClusterDb</Name>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
<ModelCollation>1033, CI</ModelCollation>
<RootNamespace>ClusterDb</RootNamespace>
<AssemblyName>ClusterDb</AssemblyName>
<ProjectGuid>{00000000-0000-0000-0000-000000000000}</ProjectGuid>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\MatchingDb\MatchingDb.sqlproj">
Expand Down
1 change: 1 addition & 0 deletions src/ClusterDb/scripts/populate-reference-tables.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
IF '$(PopulateReferenceTables)' = 'True'
BEGIN
PRINT('Executing post deployment script. This may take a while...')
Comment thread
samgibsonmoj marked this conversation as resolved.
Outdated
EXEC processing.PopulateReferenceTables;
END
12 changes: 6 additions & 6 deletions src/DeliusRunningPictureDb/DeliusRunningPictureDb.sqlproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<Project DefaultTargets="Build">
<Sdk Name="Microsoft.Build.Sql" Version="2.0.0" />
<PropertyGroup>
<Name>DeliusRunningPictureDb</Name>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
<ModelCollation>1033, CI</ModelCollation>
<RootNamespace>DeliusRunningPictureDb</RootNamespace>
<AssemblyName>DeliusRunningPictureDb</AssemblyName>
<Name>DeliusRunningPictureDb</Name>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
<ModelCollation>1033, CI</ModelCollation>
<RootNamespace>DeliusRunningPictureDb</RootNamespace>
<AssemblyName>DeliusRunningPictureDb</AssemblyName>
<ProjectGuid>{00000000-0000-0000-0000-000000000000}</ProjectGuid>
</PropertyGroup>

</Project>
17 changes: 9 additions & 8 deletions src/DeliusStagingDb/DeliusStagingDb.sqlproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@
<Project DefaultTargets="Build">
<Sdk Name="Microsoft.Build.Sql" Version="2.0.0" />
<PropertyGroup>
<Name>StagingDb</Name>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
<ModelCollation>1033, CI</ModelCollation>
<RootNamespace>StagingDb</RootNamespace>
<AssemblyName>StagingDb</AssemblyName>
<Name>StagingDb</Name>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
<ModelCollation>1033, CI</ModelCollation>
<RootNamespace>StagingDb</RootNamespace>
<AssemblyName>StagingDb</AssemblyName>
<ProjectGuid>{00000000-0000-0000-0000-000000000000}</ProjectGuid>
</PropertyGroup>
<ItemGroup>
<None Include="Scripts\Cleanup.sql">
<CopyToOutputDirectory>DoNotCopy</CopyToOutputDirectory>
</None>
<None Include="Scripts\Cleanup.sql">
<CopyToOutputDirectory>DoNotCopy</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
11 changes: 6 additions & 5 deletions src/MatchingDb/MatchingDb.sqlproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
<Project DefaultTargets="Build">
<Sdk Name="Microsoft.Build.Sql" Version="2.0.0" />
<PropertyGroup>
<Name>MatchingDb</Name>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
<ModelCollation>1033, CI</ModelCollation>
<RootNamespace>MatchingDb</RootNamespace>
<AssemblyName>MatchingDb</AssemblyName>
<Name>MatchingDb</Name>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
<ModelCollation>1033, CI</ModelCollation>
<RootNamespace>MatchingDb</RootNamespace>
<AssemblyName>MatchingDb</AssemblyName>
<ProjectGuid>{00000000-0000-0000-0000-000000000000}</ProjectGuid>
</PropertyGroup>
<ItemGroup>
<SqlCmdVariable Include="DeliusRunningPictureDb">
Expand Down
12 changes: 6 additions & 6 deletions src/OfflocRunningPictureDb/OfflocRunningPictureDb.sqlproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<Project DefaultTargets="Build">
<Sdk Name="Microsoft.Build.Sql" Version="2.0.0" />
<PropertyGroup>
<Name>OfflocRunningPictureDb</Name>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
<ModelCollation>1033, CI</ModelCollation>
<RootNamespace>OfflocRunningPictureDb</RootNamespace>
<AssemblyName>OfflocRunningPictureDb</AssemblyName>
<Name>OfflocRunningPictureDb</Name>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
<ModelCollation>1033, CI</ModelCollation>
<RootNamespace>OfflocRunningPictureDb</RootNamespace>
<AssemblyName>OfflocRunningPictureDb</AssemblyName>
<ProjectGuid>{00000000-0000-0000-0000-000000000000}</ProjectGuid>
</PropertyGroup>

</Project>
12 changes: 6 additions & 6 deletions src/OfflocStagingDb/OfflocStagingDb.sqlproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<Project DefaultTargets="Build">
<Sdk Name="Microsoft.Build.Sql" Version="2.0.0" />
<PropertyGroup>
<Name>OfflocStagingDb</Name>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
<ModelCollation>1033, CI</ModelCollation>
<RootNamespace>OfflocStagingDb</RootNamespace>
<AssemblyName>OfflocStagingDb</AssemblyName>
<Name>OfflocStagingDb</Name>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
<ModelCollation>1033, CI</ModelCollation>
<RootNamespace>OfflocStagingDb</RootNamespace>
<AssemblyName>OfflocStagingDb</AssemblyName>
<ProjectGuid>{00000000-0000-0000-0000-000000000000}</ProjectGuid>
</PropertyGroup>

</Project>
24 changes: 20 additions & 4 deletions src/Visualiser/Pages/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" id="cancelClusterButton">Cancel</button>
<button type="submit" class="btn btn-primary" id="findClusterButton" asp-page-handler="Details" hidden>Find</button>
<button type="submit" class="btn btn-primary" id="randomClusterButton" asp-page-handler="Random">Random</button>
</div>
Expand All @@ -94,17 +94,33 @@
</div>
<form id="saveNetwork" asp-page-handler="Network" method="post">
<div class="modal-body">
<p>Hello</p>
Are you sure you wish to save your changes?

<div class="alert alert-warning mt-4" role="alert">
Changes cannot be undone!
</div>

</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
<button type="submit" class="btn btn-primary">Save</button>
<button id="saveNetworkCancelBtn" type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
<button id="saveNetworkBtn" type="submit" class="btn btn-primary">Save</button>
</div>
</form>
</div>
</div>
</div>

<div class="position-fixed bottom-0 start-0 p-3" style="z-index: 11">
<div id="success-toast" class="toast hide align-items-center text-white bg-success bg-opacity-75 border-0" role="alert" aria-live="assertive" aria-atomic="true">
<div class="d-flex">
<div class="toast-body">
Saved successfully
</div>
<button type="button" class="btn-close btn-close-white me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
</div>
</div>
</div>

<div id="network"></div>

<button id="saveNetworkButton" class="btn btn-success position-fixed bottom-0 end-0 m-4 shadow">
Expand Down
26 changes: 24 additions & 2 deletions src/Visualiser/wwwroot/js/network.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ var editNodeModal = new bootstrap.Modal('#editNodeModal');
var findClusterModal = new bootstrap.Modal('#findClusterModal');
var saveNetworkModal = new bootstrap.Modal('#saveNetworkModal');

const toastEl = document.getElementById('success-toast');

const toast = new bootstrap.Toast(toastEl, {
autohide: true,
delay: 3000
});

function getAntiForgeryToken() {
const el = document.querySelector('input[name="__RequestVerificationToken"]');
return el ? el.value : '';
Expand Down Expand Up @@ -104,6 +111,10 @@ document.getElementById("findClusterForm").addEventListener("submit", async even
return;
}

$('#randomClusterButton').prop('disabled', true);
$('#findClusterButton').prop('disabled', true);
$('#cancelClusterButton').prop('disabled', true);

fetch(action + '?upci=' + group, { method: "GET" })
.then(async response => {

Expand Down Expand Up @@ -131,6 +142,11 @@ document.getElementById("findClusterForm").addEventListener("submit", async even
.catch(error => {
console.error(error);
alert(`Something went wrong. Error: ${error}`)
})
.finally(() => {
$('#randomClusterButton').prop('disabled', false);
$('#findClusterButton').prop('disabled', false);
$('#cancelClusterButton').prop('disabled', false);
});
});

Expand Down Expand Up @@ -158,6 +174,9 @@ document.getElementById("saveNetwork").addEventListener("submit", async event =>
clusters: getNetwork()
};

$('#saveNetworkBtn').prop('disabled', true);
$('#saveNetworkCancelBtn').prop('disabled', true);

fetch(action, {
method: "POST",
headers: {
Expand All @@ -179,13 +198,16 @@ document.getElementById("saveNetwork").addEventListener("submit", async event =>
return;
}

// Saved successfully

saveNetworkModal.hide();
toast.show();
})
.catch(error => {
console.error(error);
alert(`Something went wrong. Error: ${error}`)
})
.finally(() => {
$('#saveNetworkBtn').prop('disabled', false);
$('#saveNetworkCancelBtn').prop('disabled', false);
});
});

Expand Down
Loading