Release

Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <GemstoneVersion>1.0.181</GemstoneVersion>
+    <GemstoneVersion>1.0.182</GemstoneVersion>
   </PropertyGroup>
 </Project>

Jenkinsfile

@@ -122,7 +122,9 @@ pipeline {
                     env.GIT_COMMIT = bat(script: '@git rev-parse HEAD', returnStdout: true).trim()
                 }
                 powershell "powershell.exe -File .\\Scripts\\Versioning.ps1 -VersionFile './Scripts/PQBrowser.version' -Commit false"
+                powershell "powershell.exe -File .\\Scripts\\PackageVersioning.ps1 -VersionFile './PQBrowser/package.json'"
                 bat(script: "@git add Scripts/PQBrowser.version")
+                bat(script: "@git add PQBrowser/package.json")
                 bat(script: "git diff --cached --quiet || git commit -m \"Updated Version Number\"")
             }
         }
@@ -180,10 +182,10 @@ pipeline {
             }
         }
 
-        stage('Install UI Dependencies') {
+        stage('Build Production UI') {
             steps {
                 dir('PQBrowser') {
-                    bat(script: 'npm ci')
+                    bat(script: 'npm run build')
                 }
             }
         }
@@ -206,14 +208,6 @@ pipeline {
             }
         }
 
-        stage('Build Production UI') {
-            steps {
-                dir('PQBrowser') {
-                    bat(script: 'npm run build')
-                }
-            }
-        }
-
         stage('Build Docker Images') {
             when {
                 anyOf {
@@ -227,17 +221,19 @@ pipeline {
             }
             steps {
                 script {
-                    env.pqBrowserDockerTag = env.CHANGE_BRANCH == "${env.devBranch}" ? "${env.pqBrowserVersion}a" : env.pqBrowserVersion
-                    println("Building PQBrowser Docker image tag: pqbrowser:${env.pqBrowserDockerTag}")
+                    //env.pqBrowserDockerTag = env.CHANGE_BRANCH == "${env.devBranch}" ? "${env.pqBrowserVersion}a" : env.pqBrowserVersion
+                    //println("Building PQBrowser Docker image tag: pqbrowser:${env.pqBrowserDockerTag}")
+                    println("Skipping docker stage intentionally")
                 }
 
-                powershell """
+                /*powershell """
                     dotnet publish '.\\PQBrowser\\PQBrowser.csproj' `
                         --configuration Release `
                         '-p:PublishProfile=Docker Release Profile PQBrowser'
                 """
 
                 powershell "docker build --build-arg CONFIGURATION=Release -f .\\PQBrowser.dockerfile -t pqbrowser:${env.pqBrowserDockerTag} ."
+                */
             }
         }
 

PQBrowser/PQBrowser.csproj

@@ -84,11 +84,7 @@
     <Content Update="wwwroot\Scripts\PQBrowser.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Update="package.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-  </ItemGroup>
+  </ItemGroup>
 
   <ItemGroup>
     <Compile Remove="DynamicAssemblies\**" />

PQBrowser/Scripts/TSX/Components/EventSearch/EventSearch.tsx

@@ -108,11 +108,11 @@ const EventSearch = () => {
     }, [referenceDataReady]);
 
     const getEventData = React.useCallback((query: IDynamicEventSearchQuery) =>
-        GetDynamicEventSearchData({ ...eventRequest, sortKey: query?.SortField, ascending: query?.Ascending ?? true }, `${homePath}api/OpenXDA/GetEventSearchData`)
+        GetDynamicEventSearchData({ ...eventRequest, sortKey: query?.SortField, ascending: query?.Ascending ?? true }, `${homePath}api/OpenXDA/${(showMagDur ? 'GetMagDurChartData' : 'GetEventSearchData')}`)
             .done((data) => {
                 localStorage.setItem('SEbrowser.EventSearch.EventIDs', data.map(d => d.EventID).join(','));
             }),
-        [eventRequest]);
+        [eventRequest, showMagDur]);
 
     // Effect to load the selected event's record directly by ID (e.g. deep-linked from the URL) so selection does not depend on the current filter results
     React.useEffect(() => {
@@ -149,7 +149,7 @@ const EventSearch = () => {
 
     const magDurWidgetView = React.useMemo<EventWidget.IWidgetView>(() => ({
         ID: 0,
-        Name: DynamicMagDurChart.Name,
+        Name: 'Magnitude Duration Chart',
         Type: DynamicMagDurChart.Name,
         Setting: JSON.stringify({
             ...DynamicMagDurChart.DefaultSettings,
@@ -160,7 +160,7 @@ const EventSearch = () => {
 
     const eventSearchWidgetView = React.useMemo<EventWidget.IWidgetView>(() => ({
         ID: 1,
-        Name: DynamicEventSearch.Name,
+        Name: 'Eventsearch Results Table',
         Type: DynamicEventSearch.Name,
         Setting: JSON.stringify({
             ...DynamicEventSearch.DefaultSettings,

PQBrowser/Scripts/TSX/Components/EventSearch/EventSearchData.ts

@@ -67,13 +67,10 @@ export function BuildDynamicEventSearchRequest(
         },
         transientMin: characteristics.transientMin ?? 0,
         transientMax: characteristics.transientMax ?? 0,
-        transientType: characteristics.transientType,
         sagMin: characteristics.sagMin ?? 0,
         sagMax: characteristics.sagMax ?? 0,
-        sagType: characteristics.sagType,
         swellMin: characteristics.swellMin ?? 0,
         swellMax: characteristics.swellMax ?? 0,
-        swellType: characteristics.swellType,
         curveID: characteristics.curveID,
         curveInside: characteristics.curveInside,
         curveOutside: characteristics.curveOutside,

PQBrowser/Scripts/TSX/Components/EventSearch/Navbar/EventCharacteristics.tsx

@@ -232,20 +232,6 @@ const EventSearchNavbar = () => {
                                     </div>
                                 </div>
                             </div>
-                            <div className="row justify-content-md-center">
-                                <RadioButtons<PQBrowser.IEventCharacteristicFilters>
-                                    Record={newEventCharacteristicFilter}
-                                    Label=''
-                                    Field='sagType'
-                                    Setter={handleSetEventCharacteristicFilter}
-                                    Options={[
-                                        { Label: 'LL', Value: 'LL' },
-                                        { Label: 'LN', Value: 'LN' },
-                                        { Label: 'Both', Value: 'both' }
-                                    ]}
-                                    Style={{ marginBottom: 0 }}
-                                />
-                            </div>
                         </div>
                     </form>
                 </div>
@@ -308,20 +294,6 @@ const EventSearchNavbar = () => {
                                     </div>
                                 </div>
                             </div>
-                            <div className="row justify-content-md-center">
-                                <RadioButtons<PQBrowser.IEventCharacteristicFilters>
-                                    Record={newEventCharacteristicFilter}
-                                    Label=''
-                                    Field='transientType'
-                                    Setter={handleSetEventCharacteristicFilter}
-                                    Options={[
-                                        { Label: 'LL', Value: 'LL' },
-                                        { Label: 'LN', Value: 'LN' },
-                                        { Label: 'Both', Value: 'both' }
-                                    ]}
-                                    Style={{ marginBottom: 0 }}
-                                />
-                            </div>
                         </div>
                     </form>
                 </div>
@@ -362,20 +334,6 @@ const EventSearchNavbar = () => {
                                     </div>
                                 </div>
                             </div>
-                            <div className="row justify-content-md-center">
-                                <RadioButtons<PQBrowser.IEventCharacteristicFilters>
-                                    Record={newEventCharacteristicFilter}
-                                    Label=''
-                                    Field='swellType'
-                                    Setter={handleSetEventCharacteristicFilter}
-                                    Options={[
-                                        { Label: 'LL', Value: 'LL' },
-                                        { Label: 'LN', Value: 'LN' },
-                                        { Label: 'Both', Value: 'both' }
-                                    ]}
-                                    Style={{ marginBottom: 0 }}
-                                />
-                            </div>
                         </div>
                     </form>
                 </div>

PQBrowser/Scripts/TSX/Store/EventSearchSlice.ts

@@ -80,9 +80,6 @@ const initialState: Redux.EventSearchState = {
         sagMax: null,
         swellMin: null,
         swellMax: null,
-        sagType: 'both',
-        swellType: 'both',
-        transientType: 'both',
         curveID: 1,
         curveInside: true,
         curveOutside: true
@@ -138,10 +135,6 @@ export const EventSearchsSlice = createSlice({
             state.EventCharacteristic.swellMax = parseOptionalNumber(action.payload.query['swellMax']);
             state.EventCharacteristic.swellMin = parseOptionalNumber(action.payload.query['swellMin']);
 
-            state.EventCharacteristic.sagType = (action.payload.query['sagType'] ?? 'both') as ('both' | 'LL' | 'LN');
-            state.EventCharacteristic.swellType = (action.payload.query['swellType'] ?? 'both') as ('both' | 'LL' | 'LN');
-            state.EventCharacteristic.transientType = (action.payload.query['transientType'] ?? 'both') as ('both' | 'LL' | 'LN');
-
             state.EventCharacteristic.curveID = parseInt(action.payload.query['curveID']?.toString() ?? '1');
             state.EventCharacteristic.curveInside = (action.payload.query['curveInside'] ?? 'true') == 'true';
             state.EventCharacteristic.curveOutside = (action.payload.query['curveOutside'] ?? 'true') == 'true';
@@ -183,7 +176,7 @@ export const EventSearchsSlice = createSlice({
             state.EventCharacteristic = {
                 durationMax: null, durationMin: null,
                 phases: { AN: true, BN: true, CN: true, AB: true, BC: true, CA: true, ABG: true, BCG: true, ABC: true, ABCG: true },
-                transientMin: null, transientMax: null, sagMin: null, sagMax: null, swellMin: null, swellMax: null, sagType: 'both', swellType: 'both', transientType: 'both',
+                transientMin: null, transientMax: null, sagMin: null, sagMax: null, swellMin: null, swellMax: null,
                 curveID: 1, curveInside: true, curveOutside: true
             };
 
@@ -329,13 +322,6 @@ export function GenerateQueryParams(
         if (event.swellMin != 0)
             result['swellMin'] = event.swellMin
 
-        if (event.sagType != 'both')
-            result['sagType'] = event.sagType
-        if (event.swellType != 'both')
-            result['swellType'] = event.swellType
-        if (event.transientType != 'both')
-            result['transientType'] = event.transientType
-
         if (event.curveID != 1)
             result['curveID'] = event.curveID
         if (!event.curveInside)

PQBrowser/Scripts/TSX/global.d.ts

@@ -126,13 +126,10 @@ export namespace PQBrowser {
         phases: IPhaseFilters,
         transientMin: number | null, 
         transientMax: number | null, 
-        transientType: ('LL'|'LN'|'both'),
         sagMin: number | null, 
         sagMax: number | null, 
-        sagType: ('LL' | 'LN' | 'both'),
         swellMin: number | null, 
         swellMax: number | null, 
-        swellType: ('LL' | 'LN' | 'both'),
         curveID: number, 
         curveInside: boolean, 
         curveOutside: boolean

PQBrowser/Startup.cs

@@ -42,7 +42,6 @@
 using PQBrowser.Security;
 using System;
 using System.IO;
-using System.Text.Json;
 namespace PQBrowser;
 
 public class Startup
@@ -52,9 +51,6 @@ public Startup(IConfiguration configuration, IWebHostEnvironment env)
         SetupTempPath();
         Configuration = configuration;
         Env = env;
-
-        using JsonDocument package = JsonDocument.Parse(File.ReadAllText(Path.Combine(env.ContentRootPath, "package.json")));
-        UIVersion = package.RootElement.GetProperty("version").GetString()!;
     }
 
     public static class Policies
@@ -65,7 +61,6 @@ public static class Policies
 
     public IWebHostEnvironment Env { get; set; }
     public IConfiguration Configuration { get; }
-    public static string UIVersion { get; private set; } = "";
 
     public void ConfigureServices(IServiceCollection services)
     {

PQBrowser/Views/Home/Index.cshtml

@@ -22,6 +22,7 @@
 //*******************************************************************************************************@
 @using Gemstone.Data
 @using Gemstone.Configuration;
+@using Gemstone.Reflection
 @using Microsoft.AspNetCore.Antiforgery
 @using Microsoft.AspNetCore.Authentication.Cookies
 @using Microsoft.Extensions.Options
@@ -40,6 +41,9 @@
 @{
     Layout = "";
 
+    Version assemblyVersionInfo = AssemblyInfo.EntryAssembly.Version;
+    string applicationVersion = assemblyVersionInfo.Major + "." + assemblyVersionInfo.Minor + "." + assemblyVersionInfo.Build;
+
     try {
         using (AdoDataConnection connection = new AdoDataConnection(Settings.Default))
         {
@@ -123,6 +127,6 @@
 
     <script src="@Url.Content("~/js/jquery-3.6.0.min.js")"></script>
     <script src="@Url.Content("~/js/moment.min.js")"></script>
-    <script src="@Url.Content($"~/Scripts/PQBrowser.js?v={PQBrowser.Startup.UIVersion}")"></script>
+    <script src="@Url.Content($"~/Scripts/PQBrowser.js?v={applicationVersion}")"></script>
 </body>
 </html>

PQBrowser/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.1.0",
+  "version": "3.1.2",
   "name": "pqbrowser",
   "private": true,
   "devDependencies": {

Scripts/PQBrowser.version

@@ -1 +1 @@
-3.1.1
+3.1.2