Develop -> Main

.github/workflows/backend-publish-azure.yml

@@ -67,4 +67,3 @@ jobs:
           app-name: ${{ env.AZURE_WEBAPP_NAME }}
           publish-profile: ${{ secrets.AZURE_PROFILEDESIGNER_BACK_PUBLISHSETTINGS }}
           package: ${{ env.PROJECT_DIRECTORY }}${{ env.PUBLISH_FOLDER }}
-

.github/workflows/backend-publish-stage-azure.yml

@@ -70,4 +70,3 @@ jobs:
           app-name: ${{ env.AZURE_WEBAPP_NAME }}
           publish-profile: ${{ secrets.AZURE_PROFILEDESIGNER_BACK_STAGE_PUBLISHSETTINGS }}
           package: ${{ env.PROJECT_DIRECTORY }}${{ env.PUBLISH_FOLDER }}
-

.github/workflows/smoke-tests.yml

@@ -0,0 +1,25 @@
+# This workflow will build and test a .NET 6 web API.
+# The tests will be a subset of tests which run quickly while still getting good code coverage.
+name: Smoke Test|API|Profile Designer
+on:
+  #manually trigger deploy
+  workflow_dispatch:
+  # Trigger the workflow on push
+  push:
+    branches:
+      - feature/smoke-tests
+      - develop
+      - main
+  pull_request:
+    branches:
+      - develop
+      - main
+
+
+jobs:
+  #call a common workflow which checks out, builds, publishes, zips, deploys to AWS Elastic beanstalk
+  call-workflow-publish-common-aws:
+    uses: ./.github/workflows/tests-shared.yml
+    with:
+      TEST_FILTER: 'SmokeTest="true"'
+      BUILD_TARGET: 'Staging'

.github/workflows/tests-in-browser.yml

@@ -0,0 +1,17 @@
+# Add to main branch to allow to be seen in other branches.
+# CESMII Profile Designer - Setup and test Profile Designer Web Page using Selenium Tests
+#
+# For more samples to get started with GitHub Action workflows to deploy to Azure, refer to https://github.com/Azure/actions-workflow-samples
+name: Test|In Browser|Profile Designer
+on:
+  #manually trigger deploy
+  workflow_dispatch:
+  # Trigger the workflow on push
+  #push:
+  #  branches:
+  #    - develop
+  #    - main
+  #pull_request:
+  #  branches:
+  #    - develop
+  #    - main

.github/workflows/tests-shared.yml

@@ -0,0 +1,87 @@
+# This workflow will build and test a .NET 6 web API.
+# The tests will be a subset of tests which run quickly while still getting good code coverage.
+name: Shared | Tests | Common Test Workflow
+on:
+  workflow_call:
+    inputs:
+      #ie Staging, Release
+      BUILD_TARGET:
+        required: true
+        type: string
+      #optional test filter (ie. filter on smoke test trait)
+      TEST_FILTER: 
+        required: true
+        type: string
+      #'--filter SmokeTest="true"'
+
+env:
+  # set this to the path to your solution file, defaults to the repository root (this is the folder in the git repo)
+  SOLUTION_DIRECTORY: './'      
+  # set this to the path to your web app project, defaults to the repository root (this is the folder in the git repo)
+  PROJECT_DIRECTORY: './api/CESMII.ProfileDesigner.Api'      
+  # Solution file to use
+  SOLUTION_FILE: 'CESMII.ProfileDesigner.sln'      
+  # Project file to use
+  PROJECT_NAME: 'CESMII.ProfileDesigner.Api'      
+  # set this to the .NET core version to use
+  NETCORE_VERSION: "6.0.x"
+
+jobs:
+  build:
+    name: Build and Test .NET6 Web API 
+    runs-on: ubuntu-latest
+    steps:
+      #dynamically set up env variables based on inputs
+      - name: Dynamically set test filter based on input filter
+        run: |
+          if [ ${{inputs.TEST_FILTER}} != "" ]; then
+            echo "Test uses filter..."
+            echo "TEST_LABEL=Filter=${{inputs.TEST_FILTER}}" >> $GITHUB_ENV
+            echo "TEST_FILTER=--filter ${{inputs.TEST_FILTER}}" >> $GITHUB_ENV
+          else
+            echo "Test does not use filter..."
+            echo "TEST_LABEL=" >> $GITHUB_ENV
+            echo "TEST_FILTER=" >> $GITHUB_ENV
+          fi        
+
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Set up dotnet Core ${{ env.NETCORE_VERSION }}
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: ${{ env.NETCORE_VERSION }}
+
+      - name: Start PostgreSQL on Ubuntu for use by integration tests
+        run: |
+          sudo systemctl start postgresql.service
+          pg_isready
+      - name: Create additional user
+        run: |
+          sudo -u postgres psql --command="CREATE USER profiledesigner SUPERUSER PASSWORD 'cesmii'" --command="\du"
+      - name: List existing databases
+        run: |
+          sudo -u postgres psql -l
+      - name: Create database
+        run: |
+          sudo -u postgres psql --command="CREATE DATABASE profile_designer_local_test WITH OWNER = profiledesigner TABLESPACE = pg_default CONNECTION LIMIT = -1;"
+      - name: Create schema
+        run: |
+          ls -l ./sql
+          head -5 ./sql/CESMII.ProfileDesigner.DB.sql
+          sudo -u postgres psql -d profile_designer_local_test < ./sql/CESMII.ProfileDesigner.DB.sql
+          #sudo -u postgres psql -d profile_designer_local_test --file ./sql/CESMII.ProfileDesigner.DB.sql
+      - name: List existing databases
+        run: |
+          sudo -u postgres psql -l
+
+      - name: Restore dependencies (${{env.SOLUTION_FILE}})
+        run: dotnet restore ${{env.SOLUTION_FILE}}
+        working-directory: ${{env.SOLUTION_DIRECTORY}}
+      - name: Build (${{env.SOLUTION_FILE}})
+        run: dotnet build ${{env.SOLUTION_FILE}} --configuration ${{inputs.BUILD_TARGET}} --no-restore
+        working-directory: ${{env.SOLUTION_DIRECTORY}}
+
+      - name: Test (${{env.SOLUTION_FILE}}) ${{env.TEST_LABEL}}
+        run: dotnet test ${{env.SOLUTION_FILE}} ${{env.TEST_FILTER}} --configuration ${{ inputs.BUILD_TARGET }} --no-build --verbosity normal -l:"console;verbosity=normal"
+        working-directory: ${{env.SOLUTION_DIRECTORY}}

README.md

@@ -82,3 +82,59 @@ Install npm (version > 8.5.4) - https://www.npmjs.com/ (npm install -g npm)
 	</p>
 </li>
 </ol>
+<p>
+## Directories
+- \api - This contains a .NET web API back end for profile designer. Within this solution, the OPC translations will occur, database connections will occur, etc. 
+- \frontend - This contains the REACT front end for profile designer.
+- \SampleNodeSets - This contains nodesets that we use to import into system. Any OPC UA compliant nodeset is permitted. These are stored just for convenience while developing within the system.
+- \sql - This contains the SQL script used to generate the DB structure and insert required lookup data as well as some sample users.  
+
+## How to Build
+- Clone the repo from GIT.
+
+If you have an older clone that is missing the common submodule:
+```ps
+cd c:\sources\cesmii\profiledesigner
+git submodule add https://github.com/cesmii/cesmii-common
+```
+
+- **Build/Run the front end:**
+  ```powershell
+  cd \frontend
+  npm install
+  npm run start 
+  ```
+  - Verify the site is running in a browser: http://localhost:3000
+
+> **Note**
+>
+> The ENV files in the root React folder point to the base URL for the web API.  
+> Login: The login process was intentionally simple. Use cesmii/cesmii to login.  
+
+
+- **Build/Run the back end API (.NET 6 Solution):**
+  - Standard .NET build and run. 
+
+- **PostgreSql DB**  
+	See above for initial install instructions.
+	- Run pgAdmin
+	- Create local DB (see AppSettings.json for database name.)
+	- Open the Query Tool (Tools menu)
+	- Open the CESMII-Profile-Designer\sql\CESMII.ProfileDesigner.DB.sql file
+	- Create the cesmii role/login and the database (comment out everything except the create role and create database sections and run the script)
+	- Open a query tool on the newly created database and run the rest of the script
+	- Change the password on the cesmii login to match the one in the appsettings.development.json file.
+
+## Run Profile Designer, Market Place and Cloud Library locally
+
+### Profile Designer: Front End port 3002, API port 5004
+
+1. Add a frontend/.env.development file with the following entries/content:
+```
+REACT_APP_BASE_API_URL=https://localhost:5004/api
+PORT=3002
+```
+
+2. Change
+
+</p>

api/CESMII.OpcUa.CloudLibraryResolver.DependencyInjection/CESMII.OpcUa.CloudLibraryResolver.DependencyInjection.csproj

@@ -25,7 +25,7 @@
 		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
-		<PackageReference Include="CESMII.OpcUa.NodeSetImporter" Version="1.0.13" />
+		<PackageReference Include="CESMII.OpcUa.NodeSetImporter" Version="1.0.16" />
 	</ItemGroup>
 
 	<ItemGroup>

api/CESMII.OpcUa.CloudLibraryResolver.DependencyInjection/UANodeSetCloudLibraryResolverExtensions.cs

@@ -17,15 +17,15 @@ public static class UANodeSetCloudLibraryResolverExtensions
         public static IServiceCollection AddCloudLibraryResolver(this IServiceCollection services)
         {
             services
-                .AddScoped<IUANodeSetResolverWithProgress, UANodeSetCloudLibraryResolver>(sp => new UANodeSetCloudLibraryResolver(sp.GetRequiredService<IOptions<UACloudLibClient.Options>>().Value))
+                .AddScoped<IUANodeSetResolverWithPending, UANodeSetCloudLibraryResolver>(sp => new UANodeSetCloudLibraryResolver(sp.GetRequiredService<IOptions<UACloudLibClient.Options>>().Value))
                 ;
             return services;
         }
         public static IServiceCollection AddCloudLibraryResolver(this IServiceCollection services, IConfiguration configurationSection)
         {
             services
                 .Configure<UACloudLibClient.Options>(configurationSection)
-                .AddScoped<IUANodeSetResolverWithProgress, UANodeSetCloudLibraryResolver>(sp => new UANodeSetCloudLibraryResolver(sp.GetRequiredService<IOptions<UACloudLibClient.Options>>().Value))
+                .AddScoped<IUANodeSetResolverWithPending, UANodeSetCloudLibraryResolver>(sp => new UANodeSetCloudLibraryResolver(sp.GetRequiredService<IOptions<UACloudLibClient.Options>>().Value))
                 ;
             return services;
         }

api/CESMII.OpcUa.CloudLibraryResolver/CESMII.OpcUa.CloudLibraryResolver.csproj

@@ -26,7 +26,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="CESMII.OpcUa.NodeSetImporter" Version="1.0.13" />
+	  <PackageReference Include="CESMII.OpcUa.NodeSetImporter" Version="1.0.16" />
 	  <ProjectReference Include="..\..\common\Opc.Ua.Cloud.Library.Client\Opc.Ua.Cloud.Library.Client.csproj" />
 	</ItemGroup>
 

api/CESMII.OpcUa.CloudLibraryResolver/CloudLibraryResolver.cs

@@ -14,13 +14,15 @@
 
 namespace CESMII.OpcUa.NodeSetImporter
 {
-    public class UANodeSetCloudLibraryResolver : IUANodeSetResolverWithProgress
+    public class UANodeSetCloudLibraryResolver : IUANodeSetResolverWithPending
     {
         public OnResolveNodeSets OnResolveNodeSets { get; set; }
         public OnNodeSet OnDownloadNodeSet { get; set; }
         public OnNodeSet OnNodeSetFound { get; set; }
         public OnNodeSet OnNodeSetNotFound { get; set; }
 
+        public Func<Nodeset, bool> FilterPendingNodeSet { get; set; }
+
         public UANodeSetCloudLibraryResolver(string strUserName, string strPassword)
         {
             _client = new UACloudLibClient(strUserName, strPassword);
@@ -62,9 +64,29 @@
                     {
                         nodesetWithURIAndDate.Add((nodeSet.NamespaceUri.OriginalString, nodeSet.PublicationDate, nodeSet.Identifier.ToString(CultureInfo.InvariantCulture), nodeSet.NodesetXml));
                     }
+                    try
+                    {
+                        if (FilterPendingNodeSet != null)
+                        {
+                            var pendingNodeSets = await _client.GetNodeSetsPendingApprovalAsync(namespaceUri: missingModel.ModelUri).ConfigureAwait(false);
+                            var filteredPending = pendingNodeSets.Nodes.Where(FilterPendingNodeSet).ToList();
+                            foreach(var pending in filteredPending)
+                            {
+                                var pendingNodeSetDownload = await _client.GetNodeSetDependencies(identifier: pending.Identifier.ToString(CultureInfo.InvariantCulture)).ConfigureAwait(false);
+                                foreach (var nodeSet in pendingNodeSetDownload)
+                                {
+                                    nodesetWithURIAndDate.Add((nodeSet.NamespaceUri.OriginalString, nodeSet.PublicationDate, nodeSet.Identifier.ToString(CultureInfo.InvariantCulture), nodeSet.NodesetXml));
+                                }
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+
+                    }
                 }
             }
-            catch (Exception) // TODO more specific exception to detect if cloudlib doesn't support GetNodeSetDependencies
+            catch (GraphQlNotSupportedException)
             {
                 // Fall back to retrieving and downloading all matching namespaces
                 var namespacesAndIds = await _client.GetNamespaceIdsAsync().ConfigureAwait(false);

api/CESMII.OpcUa.CloudLibraryResolver/IUANodeSetResolverWithProgress.cs

@@ -5,6 +5,7 @@
  * Some contributions thanks to CESMII – the Smart Manufacturing Institute, 2022
  */
 
+using Opc.Ua.Cloud.Library.Client;
 using System;
 
 namespace CESMII.OpcUa.NodeSetImporter
@@ -15,8 +16,13 @@ public interface IUANodeSetResolverWithProgress : IUANodeSetResolver
         public OnNodeSet OnDownloadNodeSet { get; set; }
         public OnNodeSet OnNodeSetFound { get; set; }
         public OnNodeSet OnNodeSetNotFound { get; set; }
+
     }
     public delegate void OnResolveNodeSets();
     public delegate void OnNodeSet(string namespaceUri, DateTime? publicationDate);
 
+    public interface IUANodeSetResolverWithPending : IUANodeSetResolverWithProgress
+    {
+        public Func<Nodeset, bool> FilterPendingNodeSet { get; set; }
+    }
 }

api/CESMII.OpcUa.CloudLibraryResolver/readme.md

@@ -0,0 +1,80 @@
+# Usage
+
+## Basic
+
+Pass resolver to UANodeSetCacheManager constructor:
+```c#
+    var cacheManager = new UANodeSetCacheManager(myNodeSetCache, _cloudLibResolver);
+```
+## With progress
+```c#
+    try
+    {
+        _cloudLibResolver.OnDownloadNodeSet += callback;
+        var cacheManager = new UANodeSetCacheManager(myNodeSetCache, _cloudLibResolver);
+        resultSet = cacheManager.ImportNodeSets(nodeSetXmlStringList, false, userToken);
+    }
+    finally
+    {
+        _cloudLibResolver.OnDownloadNodeSet -= callback;
+    }
+```
+
+## With nodesets pending approval
+
+```c#
+    try
+    {
+        _cloudLibResolver.OnDownloadNodeSet += callback;
+        _cloudLibResolver.FilterPendingNodeSet = (n => true); // All pending nodesets
+        var cacheManager = new UANodeSetCacheManager(myNodeSetCache, _cloudLibResolver);
+        resultSet = cacheManager.ImportNodeSets(nodeSetXmlStringList, false, userToken);
+    }
+    finally
+    {
+        _cloudLibResolver.OnDownloadNodeSet -= callback;
+    }
+```
+
+### Filter by user id
+```c#
+        _cloudLibResolver.FilterPendingNodeSet = (n =>
+            {
+                return n.Metadata.UserId == userId;
+            }
+        );
+```
+
+### Filter by user id for the CESMII cloud library when used via CESMII Profile Designer
+```c#
+        _cloudLibResolver.FilterPendingNodeSet = (n =>
+            {
+                return n.Metadata.UserId == userId 
+                || (n.Metadata?.AdditionalProperties?
+                     .Any(p => p.Name == ICloudLibDal<CloudLibProfileModel>.strCESMIIUserInfo 
+                               && p.Value.StartsWith($"{userId,}")) ?? false);
+            }
+        );
+```
+
+
+## Dependency Injection
+Add service in startup.cs / program.cs:
+```c#
+    services.AddCloudLibraryResolver();
+```
+
+Provide configuration:
+```json
+  "CloudLibrary": {
+    "UserName": "something",
+    "Password": "secure",
+    "EndPoint": "https://localhost:5007"
+  }
+```
+
+Request as IUANodeSetResolverWithPending:
+```c#
+services.GetService<IUANodeSetResolverWithPending>();
+```
+

api/CESMII.ProfileDesigner.Api.Shared/CESMII.ProfileDesigner.Api.Shared.csproj

@@ -7,8 +7,8 @@
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.11.1" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.11.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.35.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.35.0" />
   </ItemGroup>
 
   <ItemGroup>