From d830c523a9d133577c027bd364bb022571411ed9 Mon Sep 17 00:00:00 2001
From: Rok Rejc <rok@rejc.org>
Date: Wed, 14 Dec 2022 14:40:12 +0100
Subject: [PATCH] Enable running concordancer (frontend) outside servers root
 folder.

---
 .../Controllers/WebAppController.cs           | 42 -------------------
 src/apps/Rsdo.Concordancer.Api/Dockerfile     | 14 ++++++-
 .../Rsdo.Concordancer.Api.csproj              |  3 +-
 src/apps/Rsdo.Concordancer.Api/Startup.cs     |  2 +-
 .../WebApp/package-lock.json                  |  4 +-
 .../Rsdo.Concordancer.Api/WebApp/package.json |  2 +-
 .../WebApp/public/index.html                  |  5 +--
 .../concordance/ConcordanceDetails.js         |  4 +-
 .../src/components/index/IndexStatistics.js   |  4 +-
 .../Rsdo.Concordancer.Api/WebApp/src/index.js |  5 ++-
 .../pages/concordance/ConcordanceResults.js   |  6 +--
 .../WebApp/src/pages/list/ListResults.js      |  4 +-
 .../Rsdo.Concordancer.SystemManager.csproj    |  2 +-
 .../Constants/ConfigurationKey.cs             |  5 ---
 .../Rsdo.Concordancer.Core.csproj             |  2 +-
 .../Rsdo.Concordancer.Data.csproj             |  2 +-
 .../Rsdo.Concordancer.Infrastructure.csproj   |  2 +-
 .../Rsdo.Concordancer.ServiceModel.csproj     |  2 +-
 .../Rsdo.Concordancer.Services.csproj         |  2 +-
 19 files changed, 37 insertions(+), 75 deletions(-)
 delete mode 100644 src/apps/Rsdo.Concordancer.Api/Controllers/WebAppController.cs

diff --git a/src/apps/Rsdo.Concordancer.Api/Controllers/WebAppController.cs b/src/apps/Rsdo.Concordancer.Api/Controllers/WebAppController.cs
deleted file mode 100644
index 1da3267..0000000
--- a/src/apps/Rsdo.Concordancer.Api/Controllers/WebAppController.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Net.Mime;
-using HtmlAgilityPack;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
-using Rsdo.Concordancer.Core.Constants;
-
-namespace Rsdo.Concordancer.Api.Controllers
-{
-    public class WebAppController : Controller
-    {
-        private readonly IConfiguration configuration;
-        private readonly IWebHostEnvironment webHostEnvironment;
-
-        public WebAppController(IConfiguration configuration, IWebHostEnvironment webHostEnvironment)
-        {
-            this.configuration = configuration;
-            this.webHostEnvironment = webHostEnvironment;
-        }
-
-        public IActionResult Index()
-        {
-            var indexFilePath = webHostEnvironment.WebRootFileProvider.GetFileInfo("index.html").PhysicalPath;
-            var html = new HtmlDocument();
-            html.Load(indexFilePath);
-
-            var baseAppPath = configuration[ConfigurationKey.Web.BaseAppPath] ?? string.Empty;
-            var scriptNode = HtmlNode.CreateNode($"<script>window.baseAppPath = '{baseAppPath}';</script>");
-            var headNode = html.DocumentNode.SelectSingleNode("//head");
-            headNode.ChildNodes.Add(scriptNode);
-
-            var indexStream = new MemoryStream();
-            html.Save(indexStream);
-            indexStream.Position = 0;
-
-            return File(indexStream, MediaTypeNames.Text.Html);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/apps/Rsdo.Concordancer.Api/Dockerfile b/src/apps/Rsdo.Concordancer.Api/Dockerfile
index c665279..ede4bf3 100644
--- a/src/apps/Rsdo.Concordancer.Api/Dockerfile
+++ b/src/apps/Rsdo.Concordancer.Api/Dockerfile
@@ -4,6 +4,12 @@ EXPOSE 80
 
 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 
+# INSTALL NODE.JS
+RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
+    && apt-get install -y \
+        nodejs \
+    && rm -rf /var/lib/apt/lists/*
+
 # COPY LOCAL NUGET PACKAGES
 WORKDIR /nuget
 COPY local-packages/. .
@@ -36,8 +42,14 @@ COPY src/core/Rsdo.Concordancer.Infrastructure/. Rsdo.Concordancer.Infrastructur
 COPY src/core/Rsdo.Concordancer.ServiceModel/. Rsdo.Concordancer.ServiceModel/
 COPY src/core/Rsdo.Concordancer.Services/. Rsdo.Concordancer.Services/
 
-# BUILD
+# BUILD WEBAPP AND AFTER THAT API, WHICH INCLUDES WEBAPP
 FROM build AS publish
+
+WORKDIR /src/apps/Rsdo.Concordancer.Api/WebApp
+ARG WEBAPP_PUBLIC_URL=''
+ENV PUBLIC_URL=${WEBAPP_PUBLIC_URL}
+RUN npm install && npm run build
+
 WORKDIR /src/apps/Rsdo.Concordancer.Api
 RUN dotnet publish "Rsdo.Concordancer.Api.csproj" -c Release -o /app/publish
 
diff --git a/src/apps/Rsdo.Concordancer.Api/Rsdo.Concordancer.Api.csproj b/src/apps/Rsdo.Concordancer.Api/Rsdo.Concordancer.Api.csproj
index 897933a..c07d158 100644
--- a/src/apps/Rsdo.Concordancer.Api/Rsdo.Concordancer.Api.csproj
+++ b/src/apps/Rsdo.Concordancer.Api/Rsdo.Concordancer.Api.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <EnableNETAnalyzers>false</EnableNETAnalyzers>
-        <Version>1.0.0</Version>
+        <Version>1.0.1</Version>
     </PropertyGroup>
 
     <ItemGroup>
@@ -12,7 +12,6 @@
         <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
         <PackageReference Include="Hangfire" Version="1.7.31" />
         <PackageReference Include="Hangfire.PostgreSql" Version="1.9.9" />
-        <PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
         <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
         <PackageReference Include="Rsdo.StyleCop" Version="1.0.0" />
         <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
diff --git a/src/apps/Rsdo.Concordancer.Api/Startup.cs b/src/apps/Rsdo.Concordancer.Api/Startup.cs
index 6458b3e..40f9f0a 100644
--- a/src/apps/Rsdo.Concordancer.Api/Startup.cs
+++ b/src/apps/Rsdo.Concordancer.Api/Startup.cs
@@ -144,7 +144,7 @@ public class Startup
             {
                 endpoints.MapControllers();
                 endpoints.MapHangfireDashboard("/hangfire");
-                endpoints.MapFallbackToController("Index", "WebApp");
+                endpoints.MapFallbackToFile("index.html");
             });
     }
 }
\ No newline at end of file
diff --git a/src/apps/Rsdo.Concordancer.Api/WebApp/package-lock.json b/src/apps/Rsdo.Concordancer.Api/WebApp/package-lock.json
index cb141bd..3e3e75c 100644
--- a/src/apps/Rsdo.Concordancer.Api/WebApp/package-lock.json
+++ b/src/apps/Rsdo.Concordancer.Api/WebApp/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "concordancer-web",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "concordancer-web",
-      "version": "0.1.0",
+      "version": "1.0.0",
       "dependencies": {
         "@testing-library/jest-dom": "^5.16.5",
         "@testing-library/react": "^13.4.0",
diff --git a/src/apps/Rsdo.Concordancer.Api/WebApp/package.json b/src/apps/Rsdo.Concordancer.Api/WebApp/package.json
index b3e9c45..6cdc58b 100644
--- a/src/apps/Rsdo.Concordancer.Api/WebApp/package.json
+++ b/src/apps/Rsdo.Concordancer.Api/WebApp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "concordancer-web",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "private": true,
   "dependencies": {
     "@testing-library/jest-dom": "^5.16.5",
diff --git a/src/apps/Rsdo.Concordancer.Api/WebApp/public/index.html b/src/apps/Rsdo.Concordancer.Api/WebApp/public/index.html
index aac82e4..94690a4 100644
--- a/src/apps/Rsdo.Concordancer.Api/WebApp/public/index.html
+++ b/src/apps/Rsdo.Concordancer.Api/WebApp/public/index.html
@@ -5,10 +5,7 @@
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
+    <base href="%PUBLIC_URL%/" />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
diff --git a/src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceDetails.js b/src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceDetails.js
index f0b88dc..90ba509 100644
--- a/src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceDetails.js
+++ b/src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceDetails.js
@@ -20,7 +20,7 @@ const ConcordanceDetails = (props) => {
     const search = useSearch();
     const body = search.getDetailsRequest(props.paragraphId, props.tokenOrder);
 
-    const fetchDetails = () => fetch(`${window.baseAppPath}/concordancer/corpus/${search.corpusId}/concordances/details`, {
+    const fetchDetails = () => fetch(`${process.env.PUBLIC_URL}/concordancer/corpus/${search.corpusId}/concordances/details`, {
         method: 'POST',
         body: JSON.stringify(body),
         headers: {
@@ -79,4 +79,4 @@ const ConcordanceDetails = (props) => {
     }
 };
 
-export default ConcordanceDetails;
\ No newline at end of file
+export default ConcordanceDetails;
diff --git a/src/apps/Rsdo.Concordancer.Api/WebApp/src/components/index/IndexStatistics.js b/src/apps/Rsdo.Concordancer.Api/WebApp/src/components/index/IndexStatistics.js
index 83a7504..7ab6ba4 100644
--- a/src/apps/Rsdo.Concordancer.Api/WebApp/src/components/index/IndexStatistics.js
+++ b/src/apps/Rsdo.Concordancer.Api/WebApp/src/components/index/IndexStatistics.js
@@ -9,7 +9,7 @@ const IndexStatistics = () => {
     const search = useSearch();
     const corpusId = search.corpusId;
 
-    const fetchStatistics = () => fetch(`${window.baseAppPath}/concordancer/corpus/${corpusId}/stats`, {
+    const fetchStatistics = () => fetch(`${process.env.PUBLIC_URL}/concordancer/corpus/${corpusId}/stats`, {
         method: 'GET',
         headers: {
             'Content-Type': 'application/json'
@@ -31,4 +31,4 @@ const IndexStatistics = () => {
     );
 };
 
-export default IndexStatistics;
\ No newline at end of file
+export default IndexStatistics;
diff --git a/src/apps/Rsdo.Concordancer.Api/WebApp/src/index.js b/src/apps/Rsdo.Concordancer.Api/WebApp/src/index.js
index ace3c9d..d401cc8 100644
--- a/src/apps/Rsdo.Concordancer.Api/WebApp/src/index.js
+++ b/src/apps/Rsdo.Concordancer.Api/WebApp/src/index.js
@@ -13,11 +13,12 @@ if (language) {
   i18n.changeLanguage(language);
 }
 
+const baseUrl = document.getElementsByTagName('base')[0].getAttribute('href');
 const root = ReactDOM.createRoot(document.getElementById('root'));
 root.render(
   <React.StrictMode>
-    <BrowserRouter basename={window.baseAppPath}>
+    <BrowserRouter basename={baseUrl}>
       <App />
     </BrowserRouter>
   </React.StrictMode>
-);
\ No newline at end of file
+);
diff --git a/src/apps/Rsdo.Concordancer.Api/WebApp/src/pages/concordance/ConcordanceResults.js b/src/apps/Rsdo.Concordancer.Api/WebApp/src/pages/concordance/ConcordanceResults.js
index 6b731fe..33472c6 100644
--- a/src/apps/Rsdo.Concordancer.Api/WebApp/src/pages/concordance/ConcordanceResults.js
+++ b/src/apps/Rsdo.Concordancer.Api/WebApp/src/pages/concordance/ConcordanceResults.js
@@ -21,7 +21,7 @@ const ConcordanceResults = () => {
 
     const body = search.getSearchRequest();
 
-    const fetchConcordances = () => fetch(`${window.baseAppPath}/concordancer/corpus/${search.corpusId}/concordances/search`, {
+    const fetchConcordances = () => fetch(`${process.env.PUBLIC_URL}/concordancer/corpus/${search.corpusId}/concordances/search`, {
         method: 'POST',
         body: JSON.stringify(body),
         headers: {
@@ -34,7 +34,7 @@ const ConcordanceResults = () => {
 
     const { isLoading, isSuccess, isError, data, error } = useQuery(['concordances', body], fetchConcordances, { keepPreviousData: true, refetchOnWindowFocus: false });
     const [isVisible, setIsVisible] = useState(false);
-    const download = useDownload(`${window.baseAppPath}/concordancer/corpus/${search.corpusId}/concordances/export`);
+    const download = useDownload(`${process.env.PUBLIC_URL}/concordancer/corpus/${search.corpusId}/concordances/export`);
 
     const onExportClose = () => {
         setIsVisible(false);
@@ -84,4 +84,4 @@ const ConcordanceResults = () => {
     };
 };
 
-export default ConcordanceResults;
\ No newline at end of file
+export default ConcordanceResults;
diff --git a/src/apps/Rsdo.Concordancer.Api/WebApp/src/pages/list/ListResults.js b/src/apps/Rsdo.Concordancer.Api/WebApp/src/pages/list/ListResults.js
index e82ef58..af5983d 100644
--- a/src/apps/Rsdo.Concordancer.Api/WebApp/src/pages/list/ListResults.js
+++ b/src/apps/Rsdo.Concordancer.Api/WebApp/src/pages/list/ListResults.js
@@ -20,7 +20,7 @@ const ListResults = () => {
     const history = useHistory();
     const body = search.getSearchRequest();
 
-    const fetchList = () => fetch(`${window.baseAppPath}/concordancer/corpus/${search.corpusId}/list/search`, {
+    const fetchList = () => fetch(`${process.env.PUBLIC_URL}/concordancer/corpus/${search.corpusId}/list/search`, {
         method: 'POST',
         body: JSON.stringify(body),
         headers: {
@@ -33,7 +33,7 @@ const ListResults = () => {
 
     const { isLoading, isSuccess, isError, data, error } = useQuery(['list', body], fetchList, { keepPreviousData: true, refetchOnWindowFocus: false });
     const [isVisible, setIsVisible] = useState(false);
-    const download = useDownload(`${window.baseAppPath}/concordancer/corpus/${search.corpusId}/list/export`);
+    const download = useDownload(`${process.env.PUBLIC_URL}/concordancer/corpus/${search.corpusId}/list/export`);
 
     const onExportClose = () => {
         setIsVisible(false);
diff --git a/src/apps/Rsdo.Concordancer.SystemManager/Rsdo.Concordancer.SystemManager.csproj b/src/apps/Rsdo.Concordancer.SystemManager/Rsdo.Concordancer.SystemManager.csproj
index 03e7254..e7211fc 100644
--- a/src/apps/Rsdo.Concordancer.SystemManager/Rsdo.Concordancer.SystemManager.csproj
+++ b/src/apps/Rsdo.Concordancer.SystemManager/Rsdo.Concordancer.SystemManager.csproj
@@ -5,7 +5,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <EnableNETAnalyzers>false</EnableNETAnalyzers>
-        <Version>1.0.0</Version>
+        <Version>1.0.1</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/core/Rsdo.Concordancer.Core/Constants/ConfigurationKey.cs b/src/core/Rsdo.Concordancer.Core/Constants/ConfigurationKey.cs
index 86f4e7b..aa67faa 100644
--- a/src/core/Rsdo.Concordancer.Core/Constants/ConfigurationKey.cs
+++ b/src/core/Rsdo.Concordancer.Core/Constants/ConfigurationKey.cs
@@ -16,9 +16,4 @@ public static class ConfigurationKey
     {
         public const string ClasslaTokenizerUrl = "RSDO:Tokenizer:ClasslaUrl";
     }
-
-    public static class Web
-    {
-        public const string BaseAppPath = "RSDO:Web:BaseAppPath";
-    }
 }
\ No newline at end of file
diff --git a/src/core/Rsdo.Concordancer.Core/Rsdo.Concordancer.Core.csproj b/src/core/Rsdo.Concordancer.Core/Rsdo.Concordancer.Core.csproj
index a104da2..1805de5 100644
--- a/src/core/Rsdo.Concordancer.Core/Rsdo.Concordancer.Core.csproj
+++ b/src/core/Rsdo.Concordancer.Core/Rsdo.Concordancer.Core.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <EnableNETAnalyzers>false</EnableNETAnalyzers>
-        <Version>1.0.0</Version>
+        <Version>1.0.1</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/core/Rsdo.Concordancer.Data/Rsdo.Concordancer.Data.csproj b/src/core/Rsdo.Concordancer.Data/Rsdo.Concordancer.Data.csproj
index 03e2dd3..38d03c6 100644
--- a/src/core/Rsdo.Concordancer.Data/Rsdo.Concordancer.Data.csproj
+++ b/src/core/Rsdo.Concordancer.Data/Rsdo.Concordancer.Data.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <EnableNETAnalyzers>false</EnableNETAnalyzers>
-        <Version>1.0.0</Version>
+        <Version>1.0.1</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/core/Rsdo.Concordancer.Infrastructure/Rsdo.Concordancer.Infrastructure.csproj b/src/core/Rsdo.Concordancer.Infrastructure/Rsdo.Concordancer.Infrastructure.csproj
index 330e89d..5a3434e 100644
--- a/src/core/Rsdo.Concordancer.Infrastructure/Rsdo.Concordancer.Infrastructure.csproj
+++ b/src/core/Rsdo.Concordancer.Infrastructure/Rsdo.Concordancer.Infrastructure.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <EnableNETAnalyzers>false</EnableNETAnalyzers>
-        <Version>1.0.0</Version>
+        <Version>1.0.1</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/core/Rsdo.Concordancer.ServiceModel/Rsdo.Concordancer.ServiceModel.csproj b/src/core/Rsdo.Concordancer.ServiceModel/Rsdo.Concordancer.ServiceModel.csproj
index 9695d28..c7a46b8 100644
--- a/src/core/Rsdo.Concordancer.ServiceModel/Rsdo.Concordancer.ServiceModel.csproj
+++ b/src/core/Rsdo.Concordancer.ServiceModel/Rsdo.Concordancer.ServiceModel.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <EnableNETAnalyzers>false</EnableNETAnalyzers>
-        <Version>1.0.0</Version>
+        <Version>1.0.1</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/core/Rsdo.Concordancer.Services/Rsdo.Concordancer.Services.csproj b/src/core/Rsdo.Concordancer.Services/Rsdo.Concordancer.Services.csproj
index 21e8a8b..5f0ab94 100644
--- a/src/core/Rsdo.Concordancer.Services/Rsdo.Concordancer.Services.csproj
+++ b/src/core/Rsdo.Concordancer.Services/Rsdo.Concordancer.Services.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <EnableNETAnalyzers>false</EnableNETAnalyzers>
-        <Version>1.0.0</Version>
+        <Version>1.0.1</Version>
     </PropertyGroup>
 
     <ItemGroup>