Merge pull request #511 from atlas-bi/alpha

chore(sync) Syncing changes from alpha to master

Author: Sean-Pickering

.github/workflows/lighthouse.yml

@@ -11,11 +11,11 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: setup dotnet
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
       - name: setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '16.x'
       - name: install node deps

.github/workflows/sonar.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17

.github/workflows/test.yaml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '18.x'
 
@@ -35,11 +35,11 @@ jobs:
         uses: actions/checkout@v4
 
       - name: setup dotnet
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
       - name: setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '18.x'
       - name: install node deps
@@ -72,15 +72,15 @@ jobs:
         uses: actions/checkout@v4
 
       - name: setup dotnet
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
       - name: setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '18.x'
       - name: setup java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'microsoft'
           java-version: '17'
@@ -190,15 +190,15 @@ jobs:
         uses: actions/checkout@v4
 
       - name: setup dotnet
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
       - name: setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '18.x'
       - name: setup java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'microsoft'
           java-version: '17'

.gitlab-ci.yml

@@ -13,7 +13,7 @@ stages:
   - publish
 
 precommit:
-  image: mcr.microsoft.com/dotnet/sdk:7.0-alpine
+  image: mcr.microsoft.com/dotnet/sdk:8.0-alpine
   stage: test
   except:
     - public
@@ -40,7 +40,7 @@ precommit:
     - pre-commit run stylelint --all-files
 
 build_web:
-  image: mcr.microsoft.com/dotnet/sdk:7.0-alpine
+  image: mcr.microsoft.com/dotnet/sdk:8.0-alpine
   stage: build
   except:
     - public
@@ -73,7 +73,7 @@ deploy_test:
 
 public:
   stage: publish
-  image: python:3.11
+  image: python:3.12
   needs:
     - job: build_web
       artifacts: false
@@ -116,7 +116,7 @@ github:
   only:
     - public # public branch
   stage: publish
-  image: python:3.11
+  image: python:3.12
   before_script:
     - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
     - eval $(ssh-agent -s)

Dockerfile

@@ -10,7 +10,7 @@
 # to access webapp
 # http://localhost:1234
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
 ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
 
 WORKDIR /app
@@ -43,7 +43,7 @@ RUN  export PATH="$PATH:/root/.dotnet/tools" && dotnet ef database update --proj
 
 RUN dotnet publish -c Release -o out web.csproj
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine
+FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine
 ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
 WORKDIR /app
 COPY --from=build ["/app/web/out", "./"]

package.json

@@ -15,12 +15,12 @@
     "@rollup/plugin-node-resolve": "^15.1.0",
     "@rollup/plugin-terser": "^0.4.3",
     "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/commit-analyzer": "10.0.4",
+    "@semantic-release/commit-analyzer": "11.1.0",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@semantic-release/github": "^9.0.0",
-    "@semantic-release/npm": "^10.0.4",
-    "@semantic-release/release-notes-generator": "11.0.7",
+    "@semantic-release/npm": "^11.0.0",
+    "@semantic-release/release-notes-generator": "12.1.0",
     "@toycode/markdown-it-class": "1.2.4",
     "bulma": "0.9.4",
     "bulma-checkradio": "2.1.3",
@@ -29,7 +29,7 @@
     "chart.js": "2.9.4",
     "commitizen": "^4.3.0",
     "cz-conventional-changelog": "3.3.0",
-    "date-fns": "2.30.0",
+    "date-fns": "^3.0.0",
     "dompurify": "3.0.0",
     "es6-symbol": "3.1.3",
     "eslint": "^8.43.0",
@@ -47,20 +47,20 @@
     "gulp-sass": "5.1.0",
     "gulp-uglify": "3.0.2",
     "jsnlog": "2.30.0",
-    "lint-staged": "^14.0.0",
-    "markdown-it": "13.0.1",
+    "lint-staged": "^15.0.0",
+    "markdown-it": "14.0.0",
     "npm-run-all": "^4.1.5",
     "open": "8.4.2",
     "postcss": "^8.4.24",
     "prettier": "^3.0.0",
     "proxy-polyfill": "0.3.2",
     "regenerator-runtime": "^0.14.0",
-    "rollup": "^3.25.3",
-    "semantic-release": "^21.0.5",
-    "stylelint": "^15.8.0",
+    "rollup": "^4.0.0",
+    "semantic-release": "^22.0.0",
+    "stylelint": "^16.0.2",
     "stylelint-config-prettier-scss": "1.0.0",
-    "stylelint-config-standard-scss": "^11.0.0",
-    "stylelint-scss": "^5.0.0",
+    "stylelint-config-standard-scss": "^12.0.0",
+    "stylelint-scss": "^6.0.0",
     "xo": "^0.56.0"
   },
   "homepage": "https://demo.atlas.bi",
@@ -86,9 +86,9 @@
     "db:update": "dotnet ef database update --project web/web.csproj -v",
     "dotnet:publish": "npm run build && dotnet publish web/web.csproj -r win-x86 --self-contained false -c Release -o out",
     "test:report_html": "reportgenerator -reports:coverage.cobertura.xml -targetdir:coverage/ -reporttypes:html",
-    "test:integrationTests": "coverlet web.Tests/bin/Debug/net7.0/web.Tests.dll --target \"dotnet\" --targetargs \"test --filter IntegrationTests --no-build -e Demo=True\" --format cobertura --exclude-by-file \"**/Migrations/*\"",
-    "test:browserTests": "coverlet web.Tests/bin/Debug/net7.0/web.Tests.dll --target \"dotnet\" --targetargs \"test --filter=BrowserTests --no-build -e Demo=True\" --format cobertura --exclude-by-file \"**/Migrations/*\"",
-    "test:functionTests": "coverlet web.Tests/bin/Debug/net7.0/web.Tests.dll --target \"dotnet\" --targetargs \"test --filter=FunctionTests --no-build -e Demo=True\" --format cobertura --exclude-by-file \"**/Migrations/*\"",
+    "test:integrationTests": "coverlet web.Tests/bin/Debug/net8.0/web.Tests.dll --target \"dotnet\" --targetargs \"test --filter IntegrationTests --no-build -e Demo=True\" --format cobertura --exclude-by-file \"**/Migrations/*\"",
+    "test:browserTests": "coverlet web.Tests/bin/Debug/net8.0/web.Tests.dll --target \"dotnet\" --targetargs \"test --filter=BrowserTests --no-build -e Demo=True\" --format cobertura --exclude-by-file \"**/Migrations/*\"",
+    "test:functionTests": "coverlet web.Tests/bin/Debug/net8.0/web.Tests.dll --target \"dotnet\" --targetargs \"test --filter=FunctionTests --no-build -e Demo=True\" --format cobertura --exclude-by-file \"**/Migrations/*\"",
     "lint:js": "xo web/wwwroot/js",
     "lint:scss": "stylelint \"web/wwwroot/css/**/*.scss\"",
     "lint": "npm run lint:js & npm run lint:scss",
@@ -159,10 +159,12 @@
       "no-multi-assign": "warn",
       "unicorn/prefer-keyboard-event-key": "off",
       "no-new": "warn",
-      "unicorn/no-typeof-undefined": "off"
+      "unicorn/no-typeof-undefined": "off",
+      "unicorn/prefer-string-replace-all": "warn",
+      "unicorn/prefer-at": "warn"
     }
   },
-  "version": "3.14.0",
+  "version": "3.15.0-alpha.1",
   "dependencies": {
     "sass": "^1.63.6"
   }

readme.md

@@ -40,7 +40,7 @@ Atlas business intelligence library plugs in to your existing reporting platform
 
 ## 🏃 Getting Started
 
-> Atlas BI Library is built with [.Net 7.0](https://dotnet.microsoft.com/download/dotnet/7.0) and [Node](https://nodejs.org/en/download/). \
+> Atlas BI Library is built with [.Net 8.0](https://dotnet.microsoft.com/download/dotnet/8.0) and [Node](https://nodejs.org/en/download/). \
 > Aside from those installs you will need to install ef core tools `dotnet tool install -g dotnet-ef`. \
 > These guide can be run with [Visual Studio Code](https://code.visualstudio.com/download) and the built in terminal.
 

renovate.json

@@ -9,7 +9,7 @@
     ":npm",
     "npm:unpublishSafe"
   ],
-  "ignoreDeps": ["chart.js", "open", "dompurify"],
+  "ignoreDeps": ["chart.js", "open", "dompurify", "gulp-autoprefixer"],
   "baseBranches": ["dev"],
   "bumpVersion": "patch",
   "commitMessagePrefix": "chore(deps)",

solr.Dockerfile

@@ -10,7 +10,7 @@
 # to access webapp
 # http://localhost:8983
 
-FROM python:3.11-alpine as search
+FROM python:3.12-alpine as search
 WORKDIR /app
 ARG USER
 ARG PASSWORD

web.Tests/BrowserTests/Utilities/BrowserFactory.cs

@@ -13,8 +13,7 @@
 
 namespace web.Tests.BrowserTests
 {
-    public class BrowserFactory<TEntryPoint> : IDisposable
-        where TEntryPoint : Program
+    public class BrowserFactory<TEntryPoint> : IDisposable where TEntryPoint : Program
     {
         private readonly IHost _host;
 
@@ -23,73 +22,77 @@ public class BrowserFactory<TEntryPoint> : IDisposable
         public BrowserFactory()
         {
             IHostBuilder builder = Host.CreateDefaultBuilder()
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<TEntryPoint>();
-
-                    // needs to be relative to actual project root
-                    // so static resources are picked up.
-                    // basically we are changing from /web.Tests to /web.
-                    webBuilder.UseSolutionRelativeContentRoot("web");
-                    webBuilder.UseUrls("http://127.0.0.1:0");
-                })
-                .ConfigureServices(services =>
-                {
-                    var descriptor = services.SingleOrDefault(
-                        d => d.ServiceType == typeof(DbContextOptions<Atlas_WebContext>)
-                    );
-
-                    if (descriptor != null)
+                .ConfigureWebHostDefaults(
+                    webBuilder =>
                     {
-                        services.Remove(descriptor);
-                    }
+                        webBuilder.UseStartup<TEntryPoint>();
 
-                    services.AddDbContext<Atlas_WebContext>(options =>
+                        // needs to be relative to actual project root
+                        // so static resources are picked up.
+                        // basically we are changing from /web.Tests to /web.
+                        webBuilder.UseSolutionRelativeContentRoot("web");
+                        webBuilder.UseUrls("http://127.0.0.1:0");
+                    }
+                )
+                .ConfigureServices(
+                    services =>
                     {
-                        options.UseInMemoryDatabase("LiveServerTests");
-                    });
+                        var descriptor = services.SingleOrDefault(
+                            d => d.ServiceType == typeof(DbContextOptions<Atlas_WebContext>)
+                        );
 
-                    var sp = services.BuildServiceProvider();
+                        if (descriptor != null)
+                        {
+                            services.Remove(descriptor);
+                        }
 
-                    using (var scope = sp.CreateScope())
-                    {
-                        var scopedServices = scope.ServiceProvider;
-                        var db = scopedServices.GetRequiredService<Atlas_WebContext>();
-                        var logger = scopedServices.GetRequiredService<
-                            ILogger<BrowserFactory<TEntryPoint>>
-                        >();
+                        services.AddDbContext<Atlas_WebContext>(
+                            options =>
+                            {
+                                options.UseInMemoryDatabase("LiveServerTests");
+                            }
+                        );
 
-                        db.Database.EnsureDeleted();
-                        db.Database.EnsureCreated();
+                        var sp = services.BuildServiceProvider();
 
-                        try
-                        {
-                            // test data is loaded here.
-                            Utilities.InitializeDbForTests(db);
-                            logger.LogWarning("Test database initialized");
-                        }
-                        catch (Exception ex)
+                        using (var scope = sp.CreateScope())
                         {
-                            logger.LogError(
-                                ex,
-                                "An error occurred seeding the "
-                                    + "database with test messages. Error: {Message}",
-                                ex.Message
-                            );
+                            var scopedServices = scope.ServiceProvider;
+                            var db = scopedServices.GetRequiredService<Atlas_WebContext>();
+                            var logger = scopedServices.GetRequiredService<
+                                ILogger<BrowserFactory<TEntryPoint>>
+                            >();
+
+                            db.Database.EnsureDeleted();
+                            db.Database.EnsureCreated();
+
+                            try
+                            {
+                                // test data is loaded here.
+                                Utilities.InitializeDbForTests(db);
+                                logger.LogWarning("Test database initialized");
+                            }
+                            catch (Exception ex)
+                            {
+                                logger.LogError(
+                                    ex,
+                                    "An error occurred seeding the "
+                                        + "database with test messages. Error: {Message}",
+                                    ex.Message
+                                );
+                            }
                         }
                     }
-                });
+                );
 
             // Start the host in the background.
             // Shut it down in the Dispose method below.
             _host = builder.Build();
             _host.Start();
 
             // Store base address so that tests can pass it to the browser.
-            var address = _host
-                ?.Services?.GetRequiredService<IServer>()
-                ?.Features.Get<IServerAddressesFeature>()
-                ?.Addresses.First();
+            var address =
+                _host?.Services?.GetRequiredService<IServer>()?.Features.Get<IServerAddressesFeature>()?.Addresses.First();
 
             if (address != null)
             {