Tech/find 13346 GitHub artifact v3 action deprecate

.github/workflows/ci.yml

@@ -34,7 +34,7 @@ jobs:
       publishPackages: ${{ env.publishPackages }}
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Apply versioning
         if: success()
@@ -78,7 +78,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set Variables
         run: |
           if [[ $GITHUB_BASE_REF = 'develop' ]]

.github/workflows/createJiraIssue.yml

@@ -17,7 +17,7 @@ jobs:
 
           - name: Checkout source code
             if: ${{steps.checkPermission.outputs.require-result}} == true
-            uses: actions/checkout@v3
+            uses: actions/checkout@v4
 
           - name: Create Jira Issue
             id: createJiraIssue

.github/workflows/createRelease.yml

@@ -49,7 +49,7 @@ jobs:
       release_sha: ${{ env.release_sha }}
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Apply versioning
         if: success()
@@ -78,7 +78,7 @@ jobs:
       release_sha: ${{ needs.manageVariable.outputs.release_sha }}
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build
         if: success()
@@ -94,7 +94,7 @@ jobs:
 
       - name: Upload packages to artifacts
         if: success() && env.publishPackages == 'true'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Optimizely.Graph.Client-${{ env.packageVersion }}
           path: ${{ github.workspace}}/artifacts/
@@ -129,7 +129,7 @@ jobs:
       release_sha: ${{ needs.manageVariable.outputs.release_sha }}
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Fetch all tags
         run: |
@@ -163,7 +163,7 @@ jobs:
           New-Item -Path "artifacts" -ItemType Directory
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: Optimizely.Graph.Client-${{ env.packageVersion }}
           path: artifacts
@@ -198,7 +198,7 @@ jobs:
       release_sha: ${{ needs.manageVariable.outputs.release_sha }}
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Check tag exist
         uses: mukunku/[email protected]
@@ -247,7 +247,7 @@ jobs:
           New-Item -Path "artifacts" -ItemType Directory
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: Optimizely.Graph.Client-${{ env.packageVersion }}
           path: artifacts

.github/workflows/intergrationTest.yml

@@ -20,18 +20,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout current branch
-        uses: actions/checkout@v3
-
-      - name: Replace settings variables
-        if: success()
-        uses: microsoft/variable-substitution@v1
-        with:
-          files: 'APIs/src/Testing/EPiServer.ContentGraph.IntegrationTests/appsettings.json'
-        env:
-          Optimizely.ContentGraph.GatewayAddress: ${{ secrets.GATEWAYADDRESS }}
-          Optimizely.ContentGraph.AppKey: ${{ secrets.APPKEY }}
-          Optimizely.ContentGraph.Secret: ${{ secrets.SECRET }}
-          Optimizely.ContentGraph.SingleKey: ${{ secrets.SINGLEKEY }}
+        uses: actions/checkout@v4
 
       - name: Setup test environment
         if: success()

.github/workflows/unitTest.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout current branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build and run tests
         if: success()

APIs/src/EpiServer.ContentGraph/Api/Querying/BaseTypeQueryBuilder.cs

@@ -56,11 +56,7 @@ public virtual BaseTypeQueryBuilder Field(string propertyName)
             if (!propertyName.IsNullOrEmpty())
             {
                 string clonedPropName = ConvertNestedFieldToString.ConvertNestedFieldForQuery(propertyName);
-                graphObject.SelectItems.Append(
-                    graphObject.SelectItems.Length == 0 ?
-                    $"{clonedPropName}" :
-                    $" {clonedPropName}"
-                );
+                AppendItem(clonedPropName);
             }
 
             return this;
@@ -72,11 +68,7 @@ public virtual BaseTypeQueryBuilder Field(string propertyName, string alias)
             if (!propertyName.IsNullOrEmpty() && !alias.IsNullOrEmpty())
             {
                 string clonedPropName = ConvertNestedFieldToString.ConvertNestedFieldForQuery(propertyName);
-                graphObject.SelectItems.Append(
-                    graphObject.SelectItems.Length == 0 ?
-                    $"{alias}:{clonedPropName}" :
-                    $" {alias}:{clonedPropName}"
-                );
+                AppendItem($"{alias}:{clonedPropName}");
             }
             else
             {
@@ -97,11 +89,7 @@ public virtual BaseTypeQueryBuilder Field(string propertyName, HighLightOptions
                     return this;
                 }
                 string clonedPropName = ConvertNestedFieldToString.ConvertNestedFieldForQuery(propertyName);
-                graphObject.SelectItems.Append(
-                    graphObject.SelectItems.Length == 0 ?
-                    $"{clonedPropName}{highLightOptions.Query}" :
-                    $" {clonedPropName}{highLightOptions.Query}"
-                );
+                AppendItem($"{clonedPropName}{highLightOptions.Query}");
             }
 
             return this;
@@ -119,17 +107,9 @@ public virtual BaseTypeQueryBuilder Link(ITypeQueryBuilder link)
             {
                 if (!linkQueryBuilder.GetLinkType().IsNullOrEmpty())
                 {
-                    graphObject.SelectItems.Append(
-                        graphObject.SelectItems.Length == 0 ?
-                        $"_link(type:{linkQueryBuilder.GetLinkType()})" :
-                        $" _link(type:{linkQueryBuilder.GetLinkType()})"
-                    );
+                    AppendItem($"_link(type:{linkQueryBuilder.GetLinkType()})");
                 }
-                graphObject.SelectItems.Append(
-                    graphObject.SelectItems.Length == 0 ?
-                    $"{{{linkQuery}}}" :
-                    $" {{{linkQuery}}}"
-                );
+                AppendItem($"{{{linkQuery}}}");
             }
             return this;
         }
@@ -152,27 +132,15 @@ public virtual BaseTypeQueryBuilder Link(ITypeQueryBuilder link, string alias)
                 {
                     if (string.IsNullOrEmpty(alias))
                     {
-                        graphObject.SelectItems.Append(
-                            graphObject.SelectItems.Length == 0 ?
-                            $"_link(type:{linkQueryBuilder.GetLinkType()})" :
-                            $" _link(type:{linkQueryBuilder.GetLinkType()})"
-                        );
+                        AppendItem($"_link(type:{linkQueryBuilder.GetLinkType()})");
                     }
                     else
                     {
-                        graphObject.SelectItems.Append(
-                            graphObject.SelectItems.Length == 0 ?
-                            $"{alias}:_link(type:{linkQueryBuilder.GetLinkType()})" :
-                            $" {alias}:_link(type:{linkQueryBuilder.GetLinkType()})"
-                        );
+                        AppendItem($"{alias}:_link(type:{linkQueryBuilder.GetLinkType()})");
                     }  
 
                 }
-                graphObject.SelectItems.Append(
-                    graphObject.SelectItems.Length == 0 ?
-                    $"{{{linkQuery}}}" :
-                    $" {{{linkQuery}}}"
-                );
+                AppendItem($"{{{linkQuery}}}");
 
             }
             return this;
@@ -184,11 +152,7 @@ public virtual BaseTypeQueryBuilder Children(ITypeQueryBuilder children)
             string childrenItems = children.GetQuery()?.Query ?? string.Empty;
             if (!childrenItems.IsNullOrEmpty())
             {
-                graphObject.SelectItems.Append(
-                    graphObject.SelectItems.Length == 0 ?
-                    $"_children{{{childrenItems}}}" :
-                    $" _children{{{childrenItems}}}"
-                );
+                AppendItem($"_children{{{childrenItems}}}");
             }
 
             return this;
@@ -203,13 +167,27 @@ public virtual BaseTypeQueryBuilder AddFragments(params FragmentBuilder[] fragme
             return this;
         }
         protected virtual BaseTypeQueryBuilder AddFragment(FragmentBuilder fragment)
+        {
+            AddFragment(null, fragment);
+            return this;
+        }
+        public virtual BaseTypeQueryBuilder AddFragment(string fieldPath, FragmentBuilder fragment)
         {
             fragment.ValidateNotNullArgument("fragment");
-            graphObject.SelectItems.Append(
-                graphObject.SelectItems.Length == 0 ? 
-                $"...{fragment.GetName()}" : 
-                $" ...{fragment.GetName()}"
-            );
+            string propName;
+            if (fieldPath.IsNullOrEmpty())
+            {
+                propName = $"...{fragment.GetName()}";
+            }
+            else
+            {
+                var newPath = $"{fieldPath}.$$${fragment.GetName()}";
+                //trick: fragment init by $$$ then replace by dots ...
+                propName = ConvertNestedFieldToString.ConvertNestedFieldForQuery(newPath);
+                propName = propName.Replace("$", ".");
+            }
+
+            AppendItem(propName);
 
             if (Parent != null)
             {
@@ -239,5 +217,13 @@ private IEnumerable<FragmentBuilder> GetAllChildren(FragmentBuilder fragment)
                 }
             }
         }
+
+        protected virtual void AppendItem(string item)
+        {
+            if (!item.IsNullOrEmpty())
+            {
+                graphObject.SelectItems.Append(graphObject.SelectItems.Length > 0 ? $" {item}": item);
+            }
+        }
     }
 }

APIs/src/EpiServer.ContentGraph/Api/Querying/FragmentBuilder.cs

@@ -60,6 +60,17 @@ public override FragmentBuilder AddFragments(params FragmentBuilder[] fragments)
             }
             return this;
         }
+        public FragmentBuilder AddFragment(string path, FragmentBuilder fragment)
+        {
+            if (_childrenFragments.IsNull())
+            {
+                _childrenFragments = new List<FragmentBuilder>();
+            }
+            base.AddFragment(path, fragment);
+            _childrenFragments.Add(fragment);
+
+            return this;
+        }
     }
 
     public class FragmentBuilder<T> : FragmentBuilder
@@ -112,10 +123,7 @@ private FragmentBuilder Recursive<TSub>(params Recursion[] recursives) where TSu
             }
 
             string subTypeName = typeof(TSub).Name;
-            graphObject.SelectItems.Append(graphObject.SelectItems.Length == 0 ?
-                $"... on {subTypeName}{{{recursiveNess}}}" :
-                $" ... on {subTypeName}{{{recursiveNess}}}"
-            );
+            AppendItem($"... on {subTypeName}{{{recursiveNess}}}");
             return this;
         }
         private FragmentBuilder<T> Recursive<TSub>(string fieldName, int? depth = null) where TSub : T
@@ -154,10 +162,7 @@ public FragmentBuilder<T> Inline<TSub>(params string[] fields)
                 propertyBuilder.Append(ConvertNestedFieldToString.ConvertNestedFieldForQuery(field));
             }
             string subTypeName = typeof(TSub).Name;
-            graphObject.SelectItems.Append(graphObject.SelectItems.Length == 0 ?
-                $"... on {subTypeName}{{{propertyBuilder}}}" :
-                $" ... on {subTypeName}{{{propertyBuilder}}}"
-            );
+            AppendItem($"... on {subTypeName}{{{propertyBuilder}}}");
             return this;
         }
         /// <summary>
@@ -179,10 +184,7 @@ public FragmentBuilder<T> Inline<TSub>(params Expression<Func<TSub, object>>[] f
                 propertyBuilder.Append(ConvertNestedFieldToString.ConvertNestedFieldForQuery(fieldSelector.GetFieldPath()));
             }
             string subTypeName = typeof(TSub).Name;
-            graphObject.SelectItems.Append(graphObject.SelectItems.Length == 0 ?
-                $"... on {subTypeName}{{{propertyBuilder}}}" :
-                $" ... on {subTypeName}{{{propertyBuilder}}}"
-            );
+            AppendItem($"... on {subTypeName}{{{propertyBuilder}}}");
             return this;
         }
         /// <summary>
@@ -198,6 +200,15 @@ public FragmentBuilder<T> Inline<TSub>(params Expression<Func<TSub, Recursion>>[
             Recursive<TSub>(fieldSelectors.Select(selector => paser.GetReturnType(selector)).ToArray());
             return this;
         }
+        public FragmentBuilder<T> AddFragment<TProp>(Expression<Func<T, TProp>> fieldSelector, FragmentBuilder<TProp> fragment)
+        {
+            fieldSelector.ValidateNotNullArgument(nameof(fieldSelector));
+            fragment.ValidateNotNullArgument(nameof(fragment));
+
+            var fieldPath = fieldSelector.GetFieldPath();
+            base.AddFragment(fieldPath, fragment);
+            return this;
+        }
         public override GraphQLRequest GetQuery()
         {
             _query.Query = $"fragment {_query.OperationName} on {typeof(T).Name} {graphObject}";