From bd9bc62a58c05a597701d2f1cf5008f7f89b62fc Mon Sep 17 00:00:00 2001
From: Linh Hoang <linh.hoang@episerver.com>
Date: Mon, 13 May 2024 17:00:43 +0700
Subject: [PATCH] Update package json run code. Remove CG from ManagementSite
 backend

Fixes: AFORM-4087
Story: AFORM-3507
---
 package-lock.json                             | 21 +++++++++++++++----
 package.json                                  |  5 +++--
 .../Alloy.ManagementSite.csproj               | 16 +++++++-------
 samples/ManagementSite/Startup.cs             |  4 ----
 .../musicfestival-backend-dotnet/Startup.cs   |  3 +++
 5 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 78f3676..6e38982 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,8 @@
         "src/@episerver/forms-sdk",
         "samples/sample-react-app",
         "samples/managementsite",
-        "samples/musicfestival-frontend-react"
+        "samples/musicfestival-frontend-react",
+        "samples/musicfestival-backend-dotnet"
       ],
       "dependencies": {
         "@emotion/react": "^11.11.4",
@@ -16566,6 +16567,10 @@
       "resolved": "samples/musicfestival-frontend-react",
       "link": true
     },
+    "node_modules/musicfestival-backend": {
+      "resolved": "samples/musicfestival-backend-dotnet",
+      "link": true
+    },
     "node_modules/mute-stream": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
@@ -23460,6 +23465,11 @@
       "version": "1.0.0",
       "license": "ISC"
     },
+    "samples/musicfestival-backend-dotnet": {
+      "name": "musicfestival-backend",
+      "version": "1.0.0",
+      "license": "ISC"
+    },
     "samples/musicfestival-frontend-react": {
       "name": "music-festival",
       "version": "0.1.0",
@@ -23622,7 +23632,7 @@
       }
     },
     "samples/sample-react-app": {
-      "version": "0.1.0",
+      "version": "0.1.1",
       "dependencies": {
         "@episerver/forms-react": "file:../../src/@episerver/forms-react",
         "@episerver/forms-sdk": "file:../../src/@episerver/forms-sdk",
@@ -23727,7 +23737,7 @@
       }
     },
     "src/@episerver/forms-react": {
-      "version": "0.1.0",
+      "version": "0.1.1",
       "license": "ISC",
       "dependencies": {
         "@episerver/forms-sdk": "file:../forms-sdk"
@@ -23747,7 +23757,7 @@
       }
     },
     "src/@episerver/forms-sdk": {
-      "version": "0.1.0",
+      "version": "0.1.1",
       "license": "ISC",
       "devDependencies": {
         "@types/jest": "^29.5.6",
@@ -38110,6 +38120,9 @@
         }
       }
     },
+    "musicfestival-backend": {
+      "version": "file:samples/musicfestival-backend-dotnet"
+    },
     "mute-stream": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
diff --git a/package.json b/package.json
index 0b68057..37f78cb 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,8 @@
     "src/@episerver/forms-sdk",
     "samples/sample-react-app",
     "samples/managementsite",
-    "samples/musicfestival-frontend-react"
+    "samples/musicfestival-frontend-react",
+    "samples/musicfestival-backend-dotnet"
   ],
   "author": "Optimizely",
   "license": "ISC",
@@ -36,7 +37,7 @@
     "build-musicfestival": "npm run build -w music-festival",
     "start-musicfestival": "npm start -w music-festival",
     "build-musicfestival-backend": "npm run build -w musicfestival-backend",
-    "start-musicfestival-backend": "npm start -w managementsite musicfestival-backend"
+    "start-musicfestival-backend": "npm start -w musicfestival-backend"
     
   },
   "dependencies": {
diff --git a/samples/ManagementSite/Alloy.ManagementSite.csproj b/samples/ManagementSite/Alloy.ManagementSite.csproj
index 2e1a6c1..e31f2f3 100644
--- a/samples/ManagementSite/Alloy.ManagementSite.csproj
+++ b/samples/ManagementSite/Alloy.ManagementSite.csproj
@@ -28,7 +28,13 @@
   </ItemGroup>
 	<ItemGroup Label="HeadlessForm">
         <PackageReference Include="Optimizely.Cms.Preview1.Content.EPiServer" Version="$(ContentApiVersion)" />
-        <PackageReference Include="Optimizely.ContentGraph.Cms" Version="3.5.1" />
+		<PackageReference Include="Optimizely.Headless.Form.Service" Version="$(HeadlessFormVersion)" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.0" />
 	</ItemGroup>
   <ItemGroup>
     <PackageReference Include="EPiServer.ContentDefinitionsApi" Version="3.3.0" />
@@ -36,14 +42,6 @@
     <PackageReference Include="EPiServer.OpenIDConnect" Version="3.3.0" />
     <PackageReference Include="EPiServer.CloudPlatform.Cms" Version="1.2.0" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.0" />
-    <PackageReference Include="Optimizely.Headless.Form.ContentGraph" Version="$(HeadlessFormVersion)" />
-    <PackageReference Include="Optimizely.Headless.Form.Service" Version="$(HeadlessFormVersion)" />
-  </ItemGroup>
   <PropertyGroup>
     <ApplicationIcon />
     <StartupObject />
diff --git a/samples/ManagementSite/Startup.cs b/samples/ManagementSite/Startup.cs
index f892fb5..e2fa1c0 100644
--- a/samples/ManagementSite/Startup.cs
+++ b/samples/ManagementSite/Startup.cs
@@ -5,7 +5,6 @@
 using EPiServer.Cms.UI.VisitorGroups;
 using EPiServer.ContentApi.Core.DependencyInjection;
 using EPiServer.Core;
-using EPiServer.DependencyInjection;
 using EPiServer.Shell.Telemetry;
 using EPiServer.Web.Mvc.Html;
 using EPiServer.Web.Routing;
@@ -152,9 +151,6 @@ public void ConfigureServices(IServiceCollection services)
                 o.FlattenPropertyModel = true;
                 o.IncludeNumericContentIdentifier = true;
             });
-            services.AddContentGraph();
-
-            services.AddOptimizelyHeadlessFormContentGraph();
         }
 
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
diff --git a/samples/musicfestival-backend-dotnet/Startup.cs b/samples/musicfestival-backend-dotnet/Startup.cs
index 0186a0a..473407c 100644
--- a/samples/musicfestival-backend-dotnet/Startup.cs
+++ b/samples/musicfestival-backend-dotnet/Startup.cs
@@ -13,6 +13,7 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 using OpenIddict.Server;
+using Optimizely.Cms.DependencyInjection;
 using Optimizely.Headless.Form;
 using Optimizely.Headless.Form.DependencyInjection;
 
@@ -164,6 +165,8 @@ public void ConfigureServices(IServiceCollection services)
         services.AddHostedService<ProvisionDatabase>();
 
         services.AddOptimizelyHeadlessFormContentGraph();
+
+        services.AddOptimizelyCmsContentOnEPiServerPreview1();
     }
 
     public void Configure(IApplicationBuilder app, IWebHostEnvironment env)