Upgrade GraphiQL to 1.5.1 (#649)

Author: boulc

samples/Samples.Schemas.Chat/IChat.cs

@@ -44,7 +44,7 @@ public Message AddMessage(ReceivedMessage message)
             return AddMessage(new Message
             {
                 Content = message.Content,
-                SentAt = message.SentAt,
+                SentAt = message.SentAt ?? DateTime.UtcNow,
                 From = new MessageFrom
                 {
                     DisplayName = displayName,

samples/Samples.Schemas.Chat/Message.cs

@@ -10,6 +10,6 @@ public class Message
 
         public string Content { get; set; }
 
-        public DateTime SentAt { get; set; }
+        public DateTime? SentAt { get; set; }
     }
 }

samples/Samples.Schemas.Chat/MessageType.cs

@@ -7,7 +7,7 @@ public class MessageType : ObjectGraphType<Message>
         public MessageType()
         {
             Field(o => o.Content);
-            Field(o => o.SentAt, type: typeof(DateGraphType));
+            Field(o => o.SentAt, type: typeof(DateTimeGraphType));
             Field(o => o.Sub);
             Field(o => o.From, false, typeof(MessageFromType)).Resolve(ResolveFrom);
         }

samples/Samples.Schemas.Chat/ReceivedMessage.cs

@@ -8,6 +8,6 @@ public class ReceivedMessage
 
         public string Content { get; set; }
 
-        public DateTime SentAt { get; set; }
+        public DateTime? SentAt { get; set; }
     }
 }

samples/Samples.Server/Samples.Server.csproj

@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="GraphQL.SystemReactive" Version="4.6.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="4.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
     <PackageReference Include="GraphQL.MicrosoftDI" Version="4.6.1" />

samples/Samples.Server/Startup.cs

@@ -7,6 +7,7 @@
 using GraphQL.Server.Ui.GraphiQL;
 using GraphQL.Server.Ui.Playground;
 using GraphQL.Server.Ui.Voyager;
+using GraphQL.SystemReactive;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -34,6 +35,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddSingleton<IChat, Chat>();
 
             MicrosoftDI.GraphQLBuilderExtensions.AddGraphQL(services)
+                .AddSubscriptionDocumentExecuter()
                 .AddServer(true)
                 .AddSchema<ChatSchema>()
                 .ConfigureExecution(options =>

samples/Samples.Server/StartupWithRouting.cs

@@ -7,6 +7,7 @@
 using GraphQL.Server.Ui.GraphiQL;
 using GraphQL.Server.Ui.Playground;
 using GraphQL.Server.Ui.Voyager;
+using GraphQL.SystemReactive;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -35,6 +36,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddSingleton<IChat, Chat>();
 
             MicrosoftDI.GraphQLBuilderExtensions.AddGraphQL(services)
+                .AddSubscriptionDocumentExecuter()
                 .AddServer(true)
                 .AddSchema<ChatSchema>()
                 .ConfigureExecution(options =>

src/Ui.GraphiQL/GraphiQLOptions.cs

@@ -35,5 +35,19 @@ public class GraphiQLOptions
         /// Gets or sets a delegate that is called after all transformations of the GraphiQL UI page.
         /// </summary>
         public Func<GraphiQLOptions, string, string> PostConfigure { get; set; } = (options, result) => result;
+
+        /// <summary>
+        /// Enables the header editor when <see langword="true"/>.
+        /// Not supported when <see cref="ExplorerExtensionEnabled"/> is <see langword="true"/>.
+        /// </summary>
+        /// <remarks>
+        /// Original setting from <see href="https://github.com/graphql/graphiql/blob/08250feb6ee8335c3b1ca83a912911ae92a75722/packages/graphiql/src/components/GraphiQL.tsx#L186">GraphiQL</see>.
+        /// </remarks>
+        public bool HeaderEditorEnabled { get; set; } = true;
+
+        /// <summary>
+        /// Enables the explorer extension when <see langword="true"/>.
+        /// </summary>
+        public bool ExplorerExtensionEnabled { get; set; } = true;
     }
 }

src/Ui.GraphiQL/Internal/GraphiQLPageModel.cs

@@ -39,7 +39,9 @@ public string Render()
                 var builder = new StringBuilder(streamReader.ReadToEnd())
                     .Replace("@Model.GraphQLEndPoint", _options.GraphQLEndPoint)
                     .Replace("@Model.SubscriptionsEndPoint", _options.SubscriptionsEndPoint)
-                    .Replace("@Model.Headers", JsonSerializer.Serialize<object>(headers));
+                    .Replace("@Model.Headers", JsonSerializer.Serialize<object>(headers))
+                    .Replace("@Model.HeaderEditorEnabled", _options.HeaderEditorEnabled ? "true" : "false")
+                    .Replace("@Model.GraphiQLElement", _options.ExplorerExtensionEnabled ? "GraphiQLWithExtensions.GraphiQLWithExtensions" : "GraphiQL");
 
                 _graphiQLCSHtml = _options.PostConfigure(_options, builder.ToString());
             }