Merge pull request #127 from cesmii/CO5/Develop

scoxen1 · web-flow · commit 9fa1b06d9e9f · 2024-09-04T10:53:00.000-04:00
Co5/develop --&gt; Develop
diff --git a/.github/workflows/frontend-publish-azure.yml b/.github/workflows/frontend-publish-azure.yml
@@ -31,16 +31,16 @@ env:
   BUILD_OUTPUT_DIRECTORY: './frontend/build'      
   WORKING_DIRECTORY: 'frontend'   
   # set this to the node version to use
-  NODE_VERSION: '14.17.3'                
+  NODE_VERSION: '16.x'                
 
 jobs:
   Build-and-Deploy-FrontEnd:
     name: 'Job: Build and Deploy React frontend'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ env.NODE_VERSION }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ env.NODE_VERSION }}
     - name: 'Build React Code - npm install, build'
diff --git a/.github/workflows/frontend-publish-stage-azure.yml b/.github/workflows/frontend-publish-stage-azure.yml
@@ -24,6 +24,8 @@ on:
   push:
     branches:
       - develop
+      - CO5/Develop
+      - PLY/Develop
 
 env:
   # set this to your application's name
@@ -32,16 +34,16 @@ env:
   BUILD_OUTPUT_DIRECTORY: './frontend/build'      
   WORKING_DIRECTORY: 'frontend'   
   # set this to the node version to use
-  NODE_VERSION: '14.17.3'                
+  NODE_VERSION: '16.x'                
 
 jobs:
   Build-and-Deploy-FrontEnd:
     name: 'Job: Build and Deploy React frontend'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ env.NODE_VERSION }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ env.NODE_VERSION }}
     - name: 'Build React Code - npm install, build'
diff --git a/.github/workflows/sonar-cloud-scan-stage.yml b/.github/workflows/sonar-cloud-scan-stage.yml
@@ -10,6 +10,8 @@ on:
   push:
     branches:
       - develop
+      - CO5/Develop
+      - PLY/Develop
   
 env:
   # set this to the organization name, project key in Sonar
@@ -44,20 +46,20 @@ jobs:
     steps:
       #Set up Java which is needed for SonarScan post processing step
       - name: Setup Java JDK
-        uses: actions/setup-java@v3.4.0
+        uses: actions/setup-java@v4.2.1
         with:
           distribution: 'microsoft' # See 'Supported distributions' for available options
-          java-version: '11'
+          java-version: '17'
     
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           # Shallow clones should be disabled for a better relevancy of analysis
           fetch-depth: 0
           submodules: true
        
       # Speed-up analysis by caching the scanner workspace
       - name: SonarScan - Cache SonarCloud workspace
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~\.sonar\cache
           key: ${{ runner.os }}-sonar-cache
@@ -66,7 +68,7 @@ jobs:
       # Speed-up analysis by caching the scanner installation
       - name: SonarScan - Cache SonarCloud scanner
         id: cache-sonar-scanner
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{env.SONAR_TOOL_PATH}}
           key: ${{ runner.os }}-sonar-scanner
diff --git a/.github/workflows/sonar-cloud-scan.yml b/.github/workflows/sonar-cloud-scan.yml
@@ -44,20 +44,20 @@ jobs:
     steps:
       #Set up Java which is needed for SonarScan post processing step
       - name: Setup Java JDK
-        uses: actions/setup-java@v3.4.0
+        uses: actions/setup-java@v4.2.1
         with:
           distribution: 'microsoft' # See 'Supported distributions' for available options
-          java-version: '11'
+          java-version: '17'
     
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
         #  # Shallow clones should be disabled for a better relevancy of analysis
         #  fetch-depth: 0
           submodules: true
        
       # Speed-up analysis by caching the scanner workspace
       - name: SonarScan - Cache SonarCloud workspace
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~\.sonar\cache
           key: ${{ runner.os }}-sonar-cache
@@ -66,7 +66,7 @@ jobs:
       # Speed-up analysis by caching the scanner installation
       - name: SonarScan - Cache SonarCloud scanner
         id: cache-sonar-scanner
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{env.SONAR_TOOL_PATH}}
           key: ${{ runner.os }}-sonar-scanner
@@ -85,4 +85,4 @@ jobs:
       - name: Build (${{env.SOLUTION_FILE}})
         run: dotnet build ${{env.SOLUTION_DIRECTORY}}/${{env.SOLUTION_FILE}} --configuration ${{ env.BUILD_CONFIGURATION }} --no-restore
       - name: SonarScan - End (${{env.SONAR_PROJECT_KEY}})
-        run: ${{env.SONAR_TOOL_PATH}}\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_ACCESS_TOKEN }}"
+        run: ${{env.SONAR_TOOL_PATH}}\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_ACCESS_TOKEN }}"
diff --git a/README.md b/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>
diff --git a/api/CESMII.ProfileDesigner.Api/Controllers/AuthController.cs b/api/CESMII.ProfileDesigner.Api/Controllers/AuthController.cs
@@ -239,4 +239,4 @@ public IActionResult QueryCurrentOrganization()
         }
 
     }
-}
+}
diff --git a/api/CESMII.ProfileDesigner.DAL/LookupDataTypeDAL.cs b/api/CESMII.ProfileDesigner.DAL/LookupDataTypeDAL.cs
@@ -53,20 +53,25 @@ ProfileTypeDefinitionDAL _profileTypeDefinitionDAL
         }
         public override LookupDataType CheckForExisting(LookupDataTypeModel model, UserToken userToken, bool cacheOnly = false)
         {
-            var entityResult = base.FindByCondition(userToken, dt =>
-                (
-                  (model.ID != 0 && model.ID != null && dt.ID == model.ID)
+            //2024-08-12
+            //Issue - FIX - must also consider owner id match unless match comes from a core nodeset (/ua or /ua/di).
+            // We were having scenario if user 1 imports a nodeset A and then user 2 imports the same nodeset A, some of the attribute
+            // custom type of user 1's nodeset are getting assigned to user B. 
+            var matches = base.FindByCondition(userToken, dt =>
+                ((model.ID != 0 && model.ID != null && dt.ID == model.ID)
                   || ( dt.Name == model.Name && dt.Code == model.Code 
                        && (( (model.CustomTypeId ?? 0) != 0&& (dt.CustomTypeId ?? 0) != 0 && dt.CustomTypeId == model.CustomTypeId)
                             || (model.CustomType != null &&
                                dt.CustomType.Profile.Namespace == model.CustomType.Profile.Namespace
                                && dt.CustomType.Profile.PublishDate == model.CustomType.Profile.PublishDate
                                && dt.CustomType.Profile.Version == model.CustomType.Profile.Version
                                && dt.CustomType.OpcNodeId == model.CustomType.OpcNodeId
-                ))))
+                  )))) &&
+                     (dt.CustomType == null || !dt.CustomType.OwnerId.HasValue || dt.CustomType.OwnerId.Value == userToken.UserId)
                 , cacheOnly);
-            var entity = entityResult?.FirstOrDefault();
-            return entity;
+
+            var result = matches?.FirstOrDefault();
+            return result;
         }
 
         public override async Task<int?> UpdateAsync(LookupDataTypeModel model, UserToken userToken)
diff --git a/api/CESMII.ProfileDesigner.DAL/ProfileTypeDefinitionDAL.cs b/api/CESMII.ProfileDesigner.DAL/ProfileTypeDefinitionDAL.cs
@@ -1302,6 +1302,7 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,
 
                 // Parent
                 var profileTypes = _repo.GetAll().Where(pt => pt.Profile.Namespace != existingProfile.Namespace && pt.Parent.Profile == existingProfile).ToList();
+                _logger.Info($"Upgrade Info || Parent || profileTypes count: {profileTypes.Count()}");
                 foreach (var profileType in profileTypes)
                 {
                     var newParent = _repo.GetAll().FirstOrDefault(pt => pt.Profile == profile && pt.OpcNodeId == profileType.Parent.OpcNodeId);
@@ -1315,6 +1316,7 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,
 
                 // InstanceParent
                 profileTypes = _repo.GetAll().Where(pt => pt.Profile.Namespace != existingProfile.Namespace && pt.InstanceParent.Profile == existingProfile).ToList();
+                _logger.Info($"Upgrade Info || Instance Parent || profileTypes count: {profileTypes.Count()}");
                 foreach (var profileType in profileTypes)
                 {
                     var newInstanceParent = _repo.GetAll().FirstOrDefault(pt => pt.Profile == profile && pt.OpcNodeId == profileType.InstanceParent.OpcNodeId);
@@ -1328,6 +1330,7 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,
 
                 // VariableDataTypeId
                 profileTypes = _repo.GetAll().Where(pt => pt.Profile.Namespace != existingProfile.Namespace && pt.VariableDataType.Profile == existingProfile).ToList();
+                _logger.Info($"Upgrade Info || Variable Data Type || profileTypes count: {profileTypes.Count()}");
                 foreach (var profileType in profileTypes)
                 {
                     var newVariableType = _repo.GetAll().FirstOrDefault(pt => pt.Profile == profile && pt.OpcNodeId == profileType.VariableDataType.OpcNodeId);
@@ -1344,6 +1347,7 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,
                 // data type id
                 var attributes = _repo.GetAll().Where(pt => pt.Profile.Namespace != existingProfile.Namespace)
                     .SelectMany(pt => pt.Attributes).Where(a => a.DataType.CustomType.Profile == existingProfile).ToList();
+                _logger.Info($"Upgrade Info || Profile Attributes || count: {attributes.Count()}");
                 foreach (var attribute in attributes)
                 {
                     var newCustomDataType = _repo.GetAll().FirstOrDefault(pt => pt.Profile == profile && pt.OpcNodeId == attribute.DataType.CustomType.OpcNodeId);
@@ -1359,6 +1363,7 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,
                 // variable type definition id
                 attributes = _repo.GetAll().Where(pt => pt.Profile.Namespace != existingProfile.Namespace)
                     .SelectMany(pt => pt.Attributes).Where(a => a.VariableTypeDefinition.Profile == existingProfile).ToList();
+                _logger.Info($"Upgrade Info || Variable Type Definition Attributes || count: {attributes.Count()}");
                 foreach (var attribute in attributes)
                 {
                     var newVariableType = _repo.GetAll().FirstOrDefault(pt => pt.Profile == profile && pt.OpcNodeId == attribute.VariableTypeDefinition.OpcNodeId);
@@ -1374,6 +1379,7 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,
                 // composition
                 var compositions = _repo.GetAll().Where(pt => pt.Profile.Namespace != existingProfile.Namespace)
                     .SelectMany(pt => pt.Compositions).Where(c => c.Composition.Profile == existingProfile).ToList();
+                _logger.Info($"Upgrade Info || Compositions || count: {compositions.Count()}");
                 foreach (var composition in compositions)
                 {
                     var newComposition = _repo.GetAll().FirstOrDefault(pt => pt.Profile == profile && pt.OpcNodeId == composition.Composition.OpcNodeId);
@@ -1390,6 +1396,7 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,
                 // interface_id
                 var interfaces = _repo.GetAll().Where(pt => pt.Profile.Namespace != existingProfile.Namespace)
                     .SelectMany(pt => pt.Interfaces).Where(itf => itf.Interface.Profile == existingProfile).ToList();
+                _logger.Info($"Upgrade Info || Interfaces || count: {interfaces.Count()}");
                 foreach (var itf in interfaces)
                 {
                     var newInterface = _repo.GetAll().FirstOrDefault(pt => pt.Profile == profile && pt.OpcNodeId == itf.Interface.OpcNodeId);
@@ -1404,6 +1411,7 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,
                 // Move over user analytics
                 {
                     var ptAnalyticsRecords = ptAnalyticsRepo.GetAll().Where(pta => pta.ProfileTypeDefinition.Profile == existingProfile).ToList();
+                    _logger.Info($"Upgrade Info || Analytics || count: {ptAnalyticsRecords.Count()}");
                     foreach (var ptAnalyticsRecord in ptAnalyticsRecords)
                     {
                         var ptaNew = ptAnalyticsRepo.GetAll().Where(pta => pta.ProfileTypeDefinition.Profile == profile && pta.ProfileTypeDefinition.OpcNodeId == ptAnalyticsRecord.ProfileTypeDefinition.OpcNodeId).FirstOrDefault();
@@ -1423,17 +1431,22 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,
                 // Move over user favorites
                 {
                     var ptFavoritesRecords = ptFavoritesRepo.GetAll().Where(pta => pta.ProfileTypeDefinition.Profile == existingProfile).ToList();
+                    _logger.Info($"Upgrade Info || Favorites || count: {ptFavoritesRecords.Count()}");
                     foreach (var ptFavoritesRecord in ptFavoritesRecords)
                     {
                         var ptfNew = ptFavoritesRepo.GetAll().Where(pta => pta.ProfileTypeDefinition.Profile == profile && pta.ProfileTypeDefinition.OpcNodeId == ptFavoritesRecord.ProfileTypeDefinition.OpcNodeId).FirstOrDefault();
-                        ptfNew.IsFavorite = ptFavoritesRecord.IsFavorite;
-                        ptFavoritesRepo.Update(ptfNew);
+                        if (ptfNew != null)
+                        {
+                            ptfNew.IsFavorite = ptFavoritesRecord.IsFavorite;
+                            ptFavoritesRepo.Update(ptfNew);
+                        }
                     }
                 }
                 // Move over data type rank
                 // TODO actually migrate this: it is currently just a read-only view at the Repo/EF level so the Add/Update calls are commented out
                 {
                     var allDataTypeRanks = dtRankRepo.GetAll().ToList();
+                    _logger.Info($"Upgrade Info || Data Type Rank || count: {allDataTypeRanks.Count()}");
                     foreach (var dtRank in allDataTypeRanks)
                     {
                         if (dtRank.CustomTypeId == null)
@@ -1481,8 +1494,11 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,
                     }
                 }
 
+                _logger.Info($"Upgrade Info || SaveChangesAsync...start");
                 await _repo.SaveChangesAsync();
+                _logger.Info($"Upgrade Info || SaveChangesAsync...complete");
                 await _repo.CommitTransactionAsync();
+                _logger.Info($"Upgrade Info || CommitTransactionAsync...complete");
             }
             if (deleteUpgradedProfiles)
             {
diff --git a/api/CESMII.ProfileDesigner.OpcUa/OpcUaImporter.cs b/api/CESMII.ProfileDesigner.OpcUa/OpcUaImporter.cs
@@ -643,7 +643,7 @@ public async System.Threading.Tasks.Task<Dictionary<string, ProfileTypeDefinitio
             string exportedNodeSetXml;
             using (MemoryStream ms = new())
             {
-                using (StreamWriter writer = new(ms, Encoding.UTF8))
+                using (StreamWriter writer = new(ms, new UTF8Encoding(false)))
                 {
                     try
                     {
diff --git a/frontend/src/components/OnLoginHandler.js b/frontend/src/components/OnLoginHandler.js
@@ -117,6 +117,7 @@ export const onAADLogin = (setLoadingProps) => {
                 //get current search criteria data
                 setLoadingProps({
                     loginStatusCode: 200,
+                    refreshLookupData: true,
                     refreshSearchCriteria: true,
                     refreshProfileSearchCriteria: true,
                     refreshCloudLibImporterSearchCriteria: true,
diff --git a/sql/FIX-InconsistentDatabaseUsage-DataCorrections.sql b/sql/FIX-InconsistentDatabaseUsage-DataCorrections.sql

Original file line number	Diff line number	Diff line change
`@@ -239,4 +239,4 @@ public IActionResult QueryCurrentOrganization()`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`}`
`242`		`-}`
	`242`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1302,6 +1302,7 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,`
`1302`	`1302`
`1303`	`1303`	`// Parent`
`1304`	`1304`	`var profileTypes = _repo.GetAll().Where(pt => pt.Profile.Namespace != existingProfile.Namespace && pt.Parent.Profile == existingProfile).ToList();`
	`1305`	`+ _logger.Info($"Upgrade Info \|\| Parent \|\| profileTypes count: {profileTypes.Count()}");`
`1305`	`1306`	`foreach (var profileType in profileTypes)`
`1306`	`1307`	`{`
`1307`	`1308`	`var newParent = _repo.GetAll().FirstOrDefault(pt => pt.Profile == profile && pt.OpcNodeId == profileType.Parent.OpcNodeId);`
`@@ -1315,6 +1316,7 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,`
`1315`	`1316`
`1316`	`1317`	`// InstanceParent`
`1317`	`1318`	`profileTypes = _repo.GetAll().Where(pt => pt.Profile.Namespace != existingProfile.Namespace && pt.InstanceParent.Profile == existingProfile).ToList();`
	`1319`	`+ _logger.Info($"Upgrade Info \|\| Instance Parent \|\| profileTypes count: {profileTypes.Count()}");`
`1318`	`1320`	`foreach (var profileType in profileTypes)`
`1319`	`1321`	`{`
`1320`	`1322`	`var newInstanceParent = _repo.GetAll().FirstOrDefault(pt => pt.Profile == profile && pt.OpcNodeId == profileType.InstanceParent.OpcNodeId);`
`@@ -1328,6 +1330,7 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,`
`1328`	`1330`
`1329`	`1331`	`// VariableDataTypeId`
`1330`	`1332`	`profileTypes = _repo.GetAll().Where(pt => pt.Profile.Namespace != existingProfile.Namespace && pt.VariableDataType.Profile == existingProfile).ToList();`
	`1333`	`+ _logger.Info($"Upgrade Info \|\| Variable Data Type \|\| profileTypes count: {profileTypes.Count()}");`
`1331`	`1334`	`foreach (var profileType in profileTypes)`
`1332`	`1335`	`{`
`1333`	`1336`	`var newVariableType = _repo.GetAll().FirstOrDefault(pt => pt.Profile == profile && pt.OpcNodeId == profileType.VariableDataType.OpcNodeId);`
`@@ -1344,6 +1347,7 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,`
`1344`	`1347`	`// data type id`
`1345`	`1348`	`var attributes = _repo.GetAll().Where(pt => pt.Profile.Namespace != existingProfile.Namespace)`
`1346`	`1349`	`.SelectMany(pt => pt.Attributes).Where(a => a.DataType.CustomType.Profile == existingProfile).ToList();`
	`1350`	`+ _logger.Info($"Upgrade Info \|\| Profile Attributes \|\| count: {attributes.Count()}");`
`1347`	`1351`	`foreach (var attribute in attributes)`
`1348`	`1352`	`{`
`1349`	`1353`	`var newCustomDataType = _repo.GetAll().FirstOrDefault(pt => pt.Profile == profile && pt.OpcNodeId == attribute.DataType.CustomType.OpcNodeId);`
`@@ -1359,6 +1363,7 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,`
`1359`	`1363`	`// variable type definition id`
`1360`	`1364`	`attributes = _repo.GetAll().Where(pt => pt.Profile.Namespace != existingProfile.Namespace)`
`1361`	`1365`	`.SelectMany(pt => pt.Attributes).Where(a => a.VariableTypeDefinition.Profile == existingProfile).ToList();`
	`1366`	`+ _logger.Info($"Upgrade Info \|\| Variable Type Definition Attributes \|\| count: {attributes.Count()}");`
`1362`	`1367`	`foreach (var attribute in attributes)`
`1363`	`1368`	`{`
`1364`	`1369`	`var newVariableType = _repo.GetAll().FirstOrDefault(pt => pt.Profile == profile && pt.OpcNodeId == attribute.VariableTypeDefinition.OpcNodeId);`
`@@ -1374,6 +1379,7 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,`
`1374`	`1379`	`// composition`
`1375`	`1380`	`var compositions = _repo.GetAll().Where(pt => pt.Profile.Namespace != existingProfile.Namespace)`
`1376`	`1381`	`.SelectMany(pt => pt.Compositions).Where(c => c.Composition.Profile == existingProfile).ToList();`
	`1382`	`+ _logger.Info($"Upgrade Info \|\| Compositions \|\| count: {compositions.Count()}");`
`1377`	`1383`	`foreach (var composition in compositions)`
`1378`	`1384`	`{`
`1379`	`1385`	`var newComposition = _repo.GetAll().FirstOrDefault(pt => pt.Profile == profile && pt.OpcNodeId == composition.Composition.OpcNodeId);`
`@@ -1390,6 +1396,7 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,`
`1390`	`1396`	`// interface_id`
`1391`	`1397`	`var interfaces = _repo.GetAll().Where(pt => pt.Profile.Namespace != existingProfile.Namespace)`
`1392`	`1398`	`.SelectMany(pt => pt.Interfaces).Where(itf => itf.Interface.Profile == existingProfile).ToList();`
	`1399`	`+ _logger.Info($"Upgrade Info \|\| Interfaces \|\| count: {interfaces.Count()}");`
`1393`	`1400`	`foreach (var itf in interfaces)`
`1394`	`1401`	`{`
`1395`	`1402`	`var newInterface = _repo.GetAll().FirstOrDefault(pt => pt.Profile == profile && pt.OpcNodeId == itf.Interface.OpcNodeId);`
`@@ -1404,6 +1411,7 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,`
`1404`	`1411`	`// Move over user analytics`
`1405`	`1412`	`{`
`1406`	`1413`	`var ptAnalyticsRecords = ptAnalyticsRepo.GetAll().Where(pta => pta.ProfileTypeDefinition.Profile == existingProfile).ToList();`
	`1414`	`+ _logger.Info($"Upgrade Info \|\| Analytics \|\| count: {ptAnalyticsRecords.Count()}");`
`1407`	`1415`	`foreach (var ptAnalyticsRecord in ptAnalyticsRecords)`
`1408`	`1416`	`{`
`1409`	`1417`	`var ptaNew = ptAnalyticsRepo.GetAll().Where(pta => pta.ProfileTypeDefinition.Profile == profile && pta.ProfileTypeDefinition.OpcNodeId == ptAnalyticsRecord.ProfileTypeDefinition.OpcNodeId).FirstOrDefault();`
`@@ -1423,17 +1431,22 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,`
`1423`	`1431`	`// Move over user favorites`
`1424`	`1432`	`{`
`1425`	`1433`	`var ptFavoritesRecords = ptFavoritesRepo.GetAll().Where(pta => pta.ProfileTypeDefinition.Profile == existingProfile).ToList();`
	`1434`	`+ _logger.Info($"Upgrade Info \|\| Favorites \|\| count: {ptFavoritesRecords.Count()}");`
`1426`	`1435`	`foreach (var ptFavoritesRecord in ptFavoritesRecords)`
`1427`	`1436`	`{`
`1428`	`1437`	`var ptfNew = ptFavoritesRepo.GetAll().Where(pta => pta.ProfileTypeDefinition.Profile == profile && pta.ProfileTypeDefinition.OpcNodeId == ptFavoritesRecord.ProfileTypeDefinition.OpcNodeId).FirstOrDefault();`
`1429`		`- ptfNew.IsFavorite = ptFavoritesRecord.IsFavorite;`
`1430`		`- ptFavoritesRepo.Update(ptfNew);`
	`1438`	`+ if (ptfNew != null)`
	`1439`	`+ {`
	`1440`	`+ ptfNew.IsFavorite = ptFavoritesRecord.IsFavorite;`
	`1441`	`+ ptFavoritesRepo.Update(ptfNew);`
	`1442`	`+ }`
`1431`	`1443`	`}`
`1432`	`1444`	`}`
`1433`	`1445`	`// Move over data type rank`
`1434`	`1446`	`// TODO actually migrate this: it is currently just a read-only view at the Repo/EF level so the Add/Update calls are commented out`
`1435`	`1447`	`{`
`1436`	`1448`	`var allDataTypeRanks = dtRankRepo.GetAll().ToList();`
	`1449`	`+ _logger.Info($"Upgrade Info \|\| Data Type Rank \|\| count: {allDataTypeRanks.Count()}");`
`1437`	`1450`	`foreach (var dtRank in allDataTypeRanks)`
`1438`	`1451`	`{`
`1439`	`1452`	`if (dtRank.CustomTypeId == null)`
`@@ -1481,8 +1494,11 @@ public async Task UpgradeToProfileAsync(ProfileModel profileModel,`
`1481`	`1494`	`}`
`1482`	`1495`	`}`
`1483`	`1496`
	`1497`	`+ _logger.Info($"Upgrade Info \|\| SaveChangesAsync...start");`
`1484`	`1498`	`await _repo.SaveChangesAsync();`
	`1499`	`+ _logger.Info($"Upgrade Info \|\| SaveChangesAsync...complete");`
`1485`	`1500`	`await _repo.CommitTransactionAsync();`
	`1501`	`+ _logger.Info($"Upgrade Info \|\| CommitTransactionAsync...complete");`
`1486`	`1502`	`}`
`1487`	`1503`	`if (deleteUpgradedProfiles)`
`1488`	`1504`	`{`
Original file line number	Diff line number	Diff line change
`@@ -643,7 +643,7 @@ public async System.Threading.Tasks.Task<Dictionary<string, ProfileTypeDefinitio`
`643`	`643`	`string exportedNodeSetXml;`
`644`	`644`	`using (MemoryStream ms = new())`
`645`	`645`	`{`
`646`		`- using (StreamWriter writer = new(ms, Encoding.UTF8))`
	`646`	`+ using (StreamWriter writer = new(ms, new UTF8Encoding(false)))`
`647`	`647`	`{`
`648`	`648`	`try`
`649`	`649`	`{`