Merge pull request #556 from IgniteUI/vnext

merging vnext to master
IgniteUI · Dec 14, 2023 · 05d8858 · 05d8858
2 parents 233a99a + 4f40c7a
commit 05d8858
Show file tree

Hide file tree

Showing 1,362 changed files with 102,025 additions and 9,335 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -0,0 +1,7 @@
+# code owners must approve PRs
+* @HUSSAR-mtrela
+
+# *.md @HUSSAR-mtrela
+# *.js @HUSSAR-mtrela
+# *.ts @HUSSAR-mtrela
+# *.json @HUSSAR-mtrela
diff --git a/azure-pipelines/build-pipeline-client.yml b/azure-pipelines/build-pipeline-client.yml
@@ -8,10 +8,8 @@ trigger:
     exclude:
     - browser/IgBlazorSamples.Server/
 
-pr:
-  branches:
-    exclude:
-    - '*'  # must quote since "*" is a YAML reserved character; we want a string
+# This pipeline is meant to build specific branches for deployment. It's not meant to be a part of PR validation.
+pr: none
 
 parameters:
 - name: isVerbose
@@ -25,7 +23,8 @@ stages:
 - stage: Build
   pool:
     name: BuildAgentOnPrem
-    demands: npm
+    demands:
+    - Agent.ComputerName -equals IGBGSOFBUILD90
   jobs:
   - job: BuildSamples
     steps:
@@ -35,7 +34,7 @@ stages:
 
       - template: templates/build-steps-template.yml
         parameters:
-          igVersion: '23.1.37'
+          igVersion: '23.2.96'
           igNuGetFeedUrl: $(IG_Nuget_Feed_URL)
           projectToBuild: Client
           isVerbose: ${{ parameters.isVerbose }}
diff --git a/azure-pipelines/build-pipeline-server.yml b/azure-pipelines/build-pipeline-server.yml
@@ -7,10 +7,9 @@ trigger:
   paths:
     exclude:
     - browser/IgBlazorSamples.Client/
-pr:
-  branches:
-    exclude:
-    - '*'  # must quote since "*" is a YAML reserved character; we want a string
+
+# This pipeline is meant to build specific branches for deployment. It's not meant to be a part of PR validation.
+pr: none
 
 parameters:
 - name: isVerbose
@@ -34,7 +33,7 @@ stages:
 
       - template: templates/build-steps-template.yml
         parameters:
-          igVersion: '23.1.37'
+          igVersion: '23.2.96'
           igNuGetFeedUrl: $(IG_Nuget_Feed_URL)
           projectToBuild: Server
           isVerbose: ${{ parameters.isVerbose }}
diff --git a/azure-pipelines/templates/build-steps-template.yml b/azure-pipelines/templates/build-steps-template.yml
@@ -32,7 +32,7 @@ steps:
     displayName: 'Install dotnet if not already present'
     inputs:
       packageType: 'sdk'
-      version: '6.x'
+      version: '6.0.415' #'6.x'
       performMultiLevelLookup: true
 
   - task: PowerShell@2
@@ -41,11 +41,9 @@ steps:
       targetType: 'inline'
       script: |
         dotnet new nugetconfig --force
-        Write-Host AAAAAAAAAAAAAAAAAAAAAAAAAAAA ${{ parameters.igNuGetFeedUrl }}
         dotnet nuget add source ${{ parameters.igNuGetFeedUrl }} --name "IG ProGet NuGet" 
-        Write-Host BBBBBBBBBBBBBBBBBBBB
 
-        $xml = [XML](gc '.\IgBlazorSamples.${{ parameters.projectToBuild }}.csproj');
+        $xml = [XML](Get-Content '.\IgBlazorSamples.${{ parameters.projectToBuild }}.csproj');
 
         $nodes = $xml.SelectNodes("//PackageReference[starts-with(@Include,'IgniteUI')]") | 
           ForEach-Object { 
@@ -72,6 +70,7 @@ steps:
       feedsToUse: 'config'
       nugetConfigPath: '$(Build.SourcesDirectory)\browser\IgBlazorSamples.${{ parameters.projectToBuild }}\NuGet.Config'
       verbosityRestore: 'Diagnostic'
+      arguments: "--ignore-failed-sources"
 
   - task: DotNetCoreCLI@2
     displayName: 'dotnet build'

diff --git a/browser/IgBlazorSamples.Client/IgBlazorSamples.Client.csproj b/browser/IgBlazorSamples.Client/IgBlazorSamples.Client.csproj
@@ -38,12 +38,12 @@
     <!-- End NPM Updates -->
 
   <ItemGroup>
-    <PackageReference Include="IgniteUI.Blazor.Documents.Core.Trial" Version="23.1.37" />
-    <PackageReference Include="IgniteUI.Blazor.Documents.Excel.Trial" Version="23.1.37" />
-    <PackageReference Include="IgniteUI.Blazor.Trial" Version="23.1.37" />
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" />
+    <PackageReference Include="IgniteUI.Blazor.Documents.Core" Version="23.2.97" />
+    <PackageReference Include="IgniteUI.Blazor.Documents.Excel" Version="23.2.97" />
+    <PackageReference Include="IgniteUI.Blazor" Version="23.2.97" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" />
     <PackageReference Include="Microsoft.AspNetCore.Cors" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

diff --git a/browser/IgBlazorSamples.Client/wwwroot/index.html b/browser/IgBlazorSamples.Client/wwwroot/index.html
@@ -1,15 +1,12 @@
 <!DOCTYPE html>
 <html>
-
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-
     <title>Samples Browser | IgniteUI for Blazor | Infragistics</title>
     <meta name="description" content="Explore samples of IgniteUI for Blazor controls running on client-side.">
     <meta name="keywords" content="Examples, Blazor, Client-Side, WebAssembly, IgniteUI for Blazor, Controls, Infragistics">
     <meta name="author" content="Infragistics">
-
     <!-- NOTE <base> reference path is updated in gulp-samples.js -->
     <base href="/" />
     <script>
@@ -25,25 +22,35 @@
         //     window.location.replace(window.location.origin + window.location.pathname + '/' + window.location.search);
         // }
     </script>
+    <script>
+        window.preventScrollHandler = (event) => {
+            if (event.target.outerHTML.toLowerCase().includes('igx')) {
+                event.preventDefault();
+            }
+        };
+        window.attachPreventScroll = () => {
+            const container = document.getElementsByClassName('sb-container')[0];
+            container.addEventListener('wheel', preventScrollHandler, { passive: false });
+        }
+        window.removePreventScroll = () => {
+            const container = document.getElementsByClassName('sb-container')[0];
+            container.removeEventListener('wheel', preventScrollHandler);
+        }
+    </script>
     <link href="_content/Infragistics.Samples.Core/css/bootstrap/bootstrap.min.css" rel="stylesheet" />
     <link href="_content/Infragistics.Samples.Core/css/browser.css" rel="stylesheet" />
     <!-- <link href="_content/Infragistics.Samples.Core/css/index.css" rel="stylesheet" /> -->
     <link href="_content/Infragistics.Samples.Shared/css/switch.css" rel="stylesheet" />
     <link href="_content/Infragistics.Samples.Shared/css/toggle.css" rel="stylesheet" />
-
     <link href="https://static.infragistics.com/xplatform/css/samples/custom-legend.css" rel="stylesheet" type="text/css" />
     <link href="https://static.infragistics.com/xplatform/css/samples/shared.v6.css" rel="stylesheet" />
     <link href="https://static.infragistics.com/xplatform/css/samples/blazor.css" rel="stylesheet" />
     <link href="https://static.infragistics.com/xplatform/images/browsers/blazor.ico" rel="icon" type="image/x-icon">
     <link href="_content/IgniteUI.Blazor/themes/light/bootstrap.css" rel="stylesheet" />
-
     <link href="_content/IgniteUI.Blazor/themes/grid/light/bootstrap.css" rel="stylesheet" />
-
 </head>
-
 <body>
     <app class="sb-app"><img class="sb-loading" src="https://static.infragistics.com/xplatform/images/browsers/loading.gif" /></app>
-
     <div class="sb-error-ui">
         An unhandled error has occurred.
         <a href="" class="reload">Reload</a>
@@ -55,7 +62,6 @@
     <script src="_content/IgniteUI.Blazor.Documents.excel/excel.js"></script>
     <!-- importing blazor scripts for webassembly: -->
     <script src="_framework/blazor.webassembly.js"></script>
-
     <!-- <script src="test/browser.js"></script> -->
     <!--AutoInsertJavaScriptsForSamples Start-->
 <script src="sb/category-chart-high-volume.js"></script>
@@ -91,6 +97,7 @@
 <script src="sb/grid-binding-crud-data.js"></script>
 <script src="sb/grid-binding-nested-data-1.js"></script>
 <script src="sb/grid-cascading-combo.js"></script>
+<script src="sb/grid-cell-editing-sample.js"></script>
 <script src="sb/grid-clipboard-operations.js"></script>
 <script src="sb/grid-column-moving-options.js"></script>
 <script src="sb/grid-column-pinning-options.js"></script>
@@ -100,8 +107,9 @@
 <script src="sb/grid-conditional-row-selectors.js"></script>
 <script src="sb/grid-data-batch-editing-actions.js"></script>
 <script src="sb/grid-data-paste-options.js"></script>
+<script src="sb/grid-data-performance-virtualization.js"></script>
+<script src="sb/grid-data-summary-formatter.js"></script>
 <script src="sb/grid-data-summary-options.js"></script>
-<script src="sb/grid-data-summary-template.js"></script>
 <script src="sb/grid-data-validator-service.js"></script>
 <script src="sb/grid-data-validator-service-extended.js"></script>
 <script src="sb/grid-editing-events.js"></script>
@@ -114,35 +122,51 @@
 <script src="sb/grid-finjs.js"></script>
 <script src="sb/grid-groupby-expressions.js"></script>
 <script src="sb/grid-groupby-paging.js"></script>
+<script src="sb/grid-groupby-styling.js"></script>
 <script src="sb/grid-keyboard-mrl-navigation.js"></script>
 <script src="sb/grid-master-detail.js"></script>
 <script src="sb/grid-multi-cell-selection-mode.js"></script>
-<script src="sb/grid-multi-column-header-template.js"></script>
 <script src="sb/grid-multi-column-headers-export.js"></script>
+<script src="sb/grid-multi-column-headers-template.js"></script>
 <script src="sb/grid-multi-row-dragging.js"></script>
+<script src="sb/grid-overview.js"></script>
 <script src="sb/grid-row-drag-base.js"></script>
 <script src="sb/grid-row-drag-to-grid.js"></script>
 <script src="sb/grid-row-paging-basic.js"></script>
+<script src="sb/grid-row-pinning-extra-column.js"></script>
+<script src="sb/grid-row-pinning-style.js"></script>
+<script src="sb/grid-row-reorder.js"></script>
 <script src="sb/grid-row-selection-mode.js"></script>
+<script src="sb/grid-row-selection-template-excel.js"></script>
 <script src="sb/grid-row-selection-template-numbers.js"></script>
 <script src="sb/grid-row-styles.js"></script>
+<script src="sb/grid-toolbar-sample-3.js"></script>
 <script src="sb/pivot-grid-aggregate-max-sales.js"></script>
 <script src="sb/pivot-grid-aggregate-units-sold.js"></script>
 <script src="sb/pivot-grid-features.js"></script>
+<script src="sb/tree-grid-cell-editing-sample.js"></script>
 <script src="sb/tree-grid-clipboard-operations.js"></script>
 <script src="sb/tree-grid-column-moving-options.js"></script>
+<script src="sb/tree-grid-column-moving-styles.js"></script>
 <script src="sb/tree-grid-column-pinning-options.js"></script>
+<script src="sb/tree-grid-column-pinning-styles.js"></script>
 <script src="sb/tree-grid-conditional-cell-style-1.js"></script>
 <script src="sb/tree-grid-editing-events.js"></script>
 <script src="sb/tree-grid-editing-lifecycle.js"></script>
+<script src="sb/tree-grid-excel-style-filtering-sample-1.js"></script>
+<script src="sb/tree-grid-excel-style-filtering-sample-2.js"></script>
+<script src="sb/tree-grid-excel-style-filtering-sample-3.js"></script>
+<script src="sb/tree-grid-excel-style-filtering-style.js"></script>
+<script src="sb/tree-grid-finjs.js"></script>
+<script src="sb/tree-grid-keyboard-custom-navigation.js"></script>
+<script src="sb/tree-grid-multi-column-headers-export.js"></script>
+<script src="sb/tree-grid-multi-column-headers-template.js"></script>
 <script src="sb/tree-grid-row-selection-template-numbers.js"></script>
 <script src="sb/tree-grid-row-styles.js"></script>
 <script src="sb/combo-templates.js"></script>
 <script src="sb/dock-manager-styling.js"></script>
 <script src="sb/geo-map-marker-template.js"></script>
 <script src="sb/geo-map-type-shape-polygon-series.js"></script>
     <!--AutoInsertJavaScriptsForSamples End-->
-
 </body>
-
 </html>
diff --git a/browser/IgBlazorSamples.Core/IgBlazorSamples.Core.csproj b/browser/IgBlazorSamples.Core/IgBlazorSamples.Core.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -21,8 +21,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
     <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
   </ItemGroup>
 

diff --git a/browser/IgBlazorSamples.Core/Navigation/BrowserLayout.razor b/browser/IgBlazorSamples.Core/Navigation/BrowserLayout.razor
@@ -2,10 +2,12 @@
 
 @using Microsoft.AspNetCore.Components
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.JSInterop;
 
 @inject NavigationManager NavManager
-@*@inject IJSRuntime JSRuntime;*@
+@inject IJSRuntime JSRuntime; 
 @inject Infragistics.Samples.Core.SampleBrowser SB
+@implements IAsyncDisposable
 
 <div class="sb-root">
 
@@ -80,6 +82,13 @@ protected override async Task OnInitializedAsync()
     @* await SB.CheckUIAsync(NavManager.Uri);
         StateHasChanged(); *@
     await Task.Delay(1);
+    await JSRuntime.InvokeVoidAsync("attachPreventScroll");
+}
+
+public async ValueTask DisposeAsync()
+{
+    await JSRuntime.InvokeVoidAsync("removePreventScroll");
+
 }
 
 protected bool IsSampleWithNavigation() {

diff --git a/browser/IgBlazorSamples.Gulp/gulpfile.js b/browser/IgBlazorSamples.Gulp/gulpfile.js
@@ -77,6 +77,7 @@ exports.copySamplesToClient = copySamplesToClient = gulp.series(
     sb.getSamples,
     sb.copySamplesToClient,
     sb.updateCodeViewer,
+    sb.updateReadme,
 );
 exports.updateBrowser = updateBrowser = copySamplesToClient;
 
@@ -120,3 +121,5 @@ var gt = require('./tasks/gulp-tests.js')
 exports.testSampleFiles = testSampleFiles = gulp.series(
     gt.testSampleFiles,
 );
+
+exports.cleanupSamples = cleanupSamples = sb.cleanupSamples;
diff --git a/browser/IgBlazorSamples.Gulp/package-lock.json b/browser/IgBlazorSamples.Gulp/package-lock.json
diff --git a/browser/IgBlazorSamples.Gulp/tasks/Transformer.ts b/browser/IgBlazorSamples.Gulp/tasks/Transformer.ts
@@ -426,6 +426,7 @@ class Transformer {
 
         let comparedFiles: string[] = [];
 
+        let foundErrors = 0;
         for (const sampleA of samples) {
 
             for (const fileA of sampleA.SourceFiles) {
@@ -443,14 +444,17 @@ class Transformer {
                         let contentB = transFS.readFileSync(fileB.Path).toString().trim();
 
                         if (contentA !== contentB) {
-                            console.log('WARNING: File "' + fileA.Name + '" has different content in these locations: \n' + fileA.Path + '\n' + fileB.Path)
+                            console.log('ERROR: File "' + fileA.Name + '" has different content in these locations: \n' + fileA.Path + '\n' + fileB.Path)
+                            foundErrors++;
                         }
 
                     }
                 }
                 comparedFiles.push(fileA.Name);
             }
-
+        }
+        if (foundErrors > 0) {
+            throw new Error('You must fixed above ' + foundErrors + ' errors before the Blazor Sample Browser can combine individual samples')
         }
     }