Bumping up version for Docker containers.

build-docker.bat

@@ -0,0 +1,3 @@
+docker build --no-cache -t rsdo-concordancer-api -f src/apps/Rsdo.Concordancer.Api/Dockerfile .
+docker build --no-cache --build-arg WEBAPP_PUBLIC_URL=/korpus -t rsdo-concordancer-api-term-portal -f src/apps/Rsdo.Concordancer.Api/Dockerfile .
+docker build --no-cache -t rsdo-concordancer-systemmanager -f src/apps/Rsdo.Concordancer.SystemManager/Dockerfile .

build-publish-docker.bat

@@ -0,0 +1,24 @@
+docker build --no-cache -t rsdo-concordancer-api -f src/apps/Rsdo.Concordancer.Api/Dockerfile .
+docker build --no-cache --build-arg WEBAPP_PUBLIC_URL=/korpus -t rsdo-concordancer-api-term-portal -f src/apps/Rsdo.Concordancer.Api/Dockerfile .
+docker build --no-cache -t rsdo-concordancer-systemmanager -f src/apps/Rsdo.Concordancer.SystemManager/Dockerfile .
+
+docker login ghcr.io
+
+docker tag rsdo-concordancer-api ghcr.io/clarinsi/rsdo-concordancer-api:latest
+docker tag rsdo-concordancer-api ghcr.io/clarinsi/rsdo-concordancer-api:v1.0.4
+docker tag rsdo-concordancer-api ghcr.io/clarinsi/rsdo-concordancer-api:v1.0
+docker tag rsdo-concordancer-api ghcr.io/clarinsi/rsdo-concordancer-api:v1
+
+docker tag rsdo-concordancer-api-term-portal ghcr.io/clarinsi/rsdo-concordancer-api-term-portal:latest
+docker tag rsdo-concordancer-api-term-portal ghcr.io/clarinsi/rsdo-concordancer-api-term-portal:v1.0.4
+docker tag rsdo-concordancer-api-term-portal ghcr.io/clarinsi/rsdo-concordancer-api-term-portal:v1.0
+docker tag rsdo-concordancer-api-term-portal ghcr.io/clarinsi/rsdo-concordancer-api-term-portal:v1
+
+docker tag rsdo-concordancer-systemmanager ghcr.io/clarinsi/rsdo-concordancer-systemmanager:latest
+docker tag rsdo-concordancer-systemmanager ghcr.io/clarinsi/rsdo-concordancer-systemmanager:v1.0.4
+docker tag rsdo-concordancer-systemmanager ghcr.io/clarinsi/rsdo-concordancer-systemmanager:v1.0
+docker tag rsdo-concordancer-systemmanager ghcr.io/clarinsi/rsdo-concordancer-systemmanager:v1
+
+docker push --all-tags ghcr.io/clarinsi/rsdo-concordancer-api
+docker push --all-tags ghcr.io/clarinsi/rsdo-concordancer-api-term-portal
+docker push --all-tags ghcr.io/clarinsi/rsdo-concordancer-systemmanager

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.2</Version>
+        <Version>1.0.4</Version>
     </PropertyGroup>
 
     <ItemGroup>

src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceAggregationItem.js

@@ -8,7 +8,7 @@ const ConcordanceAggregationItem = (props) => {
     const link = isSelected ? search.getClearFilterLink('TextIds', props.filterKey) : search.getFilterLink('TextIds', props.filterKey);
 
     return (
-        <li className={styles.aggregationItem}><Link to={link}>{isSelected && <span>X - </span>}{props.title}<span className='float-end'>{props.count}</span></Link></li>
+        <li className={styles.aggregationItem}><Link to={link}>{isSelected && <span className={styles.remove} >X</span>}<span className={styles.title}>{props.title}</span><span className={styles.count}>{props.count}</span></Link></li>
     );
 };
 

src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceAggregationItem.module.scss

@@ -7,6 +7,18 @@
 
     a {
         color: $text-color;
+        display: flex;
         text-decoration: none;
+
+        .remove {
+            margin-right: 0.8rem;
+        }
+
+        .title {
+            flex-grow: 1;
+            margin-right: 0.8rem;
+            overflow: hidden;
+            text-overflow: clip;
+        }
     }
 }

src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceAlternateSearchItem.js

@@ -6,7 +6,7 @@ const ConcordanceAlternateSearchItem = (props) => {
     const search = useSearch();
     const link = search.getAlternateSearchLink(props.search);
     return (
-        <li className={styles.alternateSearchItem}><Link to={link}>{props.title}<span className='float-end'>{props.count}</span></Link></li>
+        <li className={styles.alternateSearchItem}><Link to={link}><span className={styles.title}>{props.title}</span><span className={styles.count}>{props.count}</span></Link></li>
     );
 };
 

src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceAlternateSearchItem.module.scss

@@ -7,6 +7,14 @@
 
     a {
         color: $text-color;
+        display: flex;
         text-decoration: none;
+
+        .title {
+            flex-grow: 1;
+            margin-right: 0.8rem;
+            overflow: hidden;
+            text-overflow: clip;
+        }
     }
 }

src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceDetailsText.js

@@ -1,6 +1,6 @@
-import { useTranslation } from 'react-i18next';
+import ConcordanceDetailsTextInfo from './ConcordanceDetailsTextInfo';
 
-import sytles from './ConcordanceDetailsText.module.scss';
+import { useTranslation } from 'react-i18next';
 
 const ConcordanceDetailsText = (props) => {
     // Hooks
@@ -8,22 +8,10 @@ const ConcordanceDetailsText = (props) => {
 
     return (
         <>
-            <div className={sytles.textInfo}>
+            <ConcordanceDetailsTextInfo title={t('concordance.detailsTextSource')} value={props.source} />
-                <h5>{t('concordance.detailsTextSource')}</h5>
+            <ConcordanceDetailsTextInfo title={t('concordance.detailsTextYear')} value={props.year} />
-                <p>{props.source}</p>
+            <ConcordanceDetailsTextInfo title={t('concordance.detailsTextTitle')} value={props.title} />
-            </div>
+            <ConcordanceDetailsTextInfo title={t('concordance.detailsTextAuthor')} value={props.author} />
-            <div className={sytles.textInfo}>
-                <h5>{t('concordance.detailsTextYear')}</h5>
-                <p>{props.year}</p>
-            </div>
-            <div className={sytles.textInfo}>
-                <h5>{t('concordance.detailsTextTitle')}</h5>
-                <p>{props.title}</p>
-            </div>
-            <div className={sytles.textInfo}>
-                <h5>{t('concordance.detailsTextAuthor')}</h5>
-                <p>{props.author}</p>
-            </div>
         </>
     );
 };

src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceDetailsTextInfo.js

@@ -0,0 +1,15 @@
+import styles from './ConcordanceDetailsTextInfo.module.scss';
+
+const ConcordanceDetailsTextInfo = (props) => {
+    var title = props.title;
+    var value = props.value;
+
+    if (value) {
+        return (<div className={styles.textInfo}>
+            <h5>{title}</h5>
+            <p>{value}</p>
+        </div>);
+    }
+};
+
+export default ConcordanceDetailsTextInfo;

src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceDetailsTextInfo.module.scss

@@ -18,5 +18,7 @@
 
     p {
         margin: 0;
+        text-overflow: clip;
+        overflow: hidden;
     }
 }

src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceListItem.js

@@ -6,8 +6,8 @@ const ConcordanceListItem = (props) => {
     return (
         <>
             <div className={`row ${styles.item}`} onClick={() => { props.toggleDetails(props.index) }}>
-                <div className='col text-end'><ConcordanceTokens tokens={props.item.leftContext} />&nbsp;</div>
+                <div className={`col ${styles.left}`}><span><ConcordanceTokens tokens={props.item.leftContext} />&nbsp;</span></div>
-                <div className='col'><ConcordanceTokens tokens={[props.item.centerContext]} /> <ConcordanceTokens tokens={props.item.rightContext} /></div>
+                <div className={`col ${styles.right}`}><ConcordanceTokens tokens={[props.item.centerContext]} /> <ConcordanceTokens tokens={props.item.rightContext} /></div>
             </div>
             {props.expanded && <ConcordanceDetails paragraphId={props.item.paragraphId} tokenOrder={props.item.centerContext.tokenOrder} onClose={() => { props.toggleDetails(null) }} />}
         </>

src/apps/Rsdo.Concordancer.Api/WebApp/src/components/concordance/ConcordanceListItem.module.scss

@@ -5,4 +5,24 @@
     cursor: pointer;
     margin-bottom: 0.5rem;
     padding-bottom: 0.5rem;
+
+    :global(.col) {
+
+        &.left,
+        &.right {
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: clip;
+        }
+
+        &.left {
+            span {
+                display: inline-block;
+                float: right;
+                min-width: 100%;
+                overflow: visible;
+                text-align: right;
+            }
+        }
+    }
 }

src/apps/Rsdo.Concordancer.Api/WebApp/src/hooks/use-download.js

@@ -12,7 +12,7 @@ const useDownload = (url) => {
                 var url = window.URL.createObjectURL(blob);
                 var a = document.createElement('a');
                 a.href = url;
-                a.download = "export.csv";
+                a.download = "export.txt";
                 document.body.appendChild(a); // we need to append the element to the dom -> otherwise it will not work in firefox
                 a.click();
                 a.remove();  //afterwards we remove the element again                       

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.2</Version>
+        <Version>1.0.4</Version>
     </PropertyGroup>
 
     <ItemGroup>

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.2</Version>
+        <Version>1.0.4</Version>
     </PropertyGroup>
 
     <ItemGroup>

src/core/Rsdo.Concordancer.Data/Migrations/v1_0/Corpus/Mig20230413111500_ChangeFormToText.cs

@@ -0,0 +1,22 @@
+using System;
+using FluentMigrator;
+using Rsdo.Concordancer.Core.Entities;
+using Rsdo.Concordancer.Data.Framework;
+
+namespace Rsdo.Concordancer.Data.Migrations.v1_0.Corpus;
+
+[CorpusDb]
+[Migration(20230413111500)]
+public class Mig20230413111500_ChangeFormToText : ForwardOnlyMigration
+{
+    public override void Up()
+    {
+        // Token
+        Alter.Column(nameof(Token.Form)).OnTable(nameof(Token)).AsString(int.MaxValue).Nullable();
+        Alter.Column(nameof(Token.Lemma)).OnTable(nameof(Token)).AsString(int.MaxValue).Nullable();
+
+        // Term
+        Alter.Column(nameof(Term.Form)).OnTable(nameof(Term)).AsString(int.MaxValue).NotNullable();
+        Alter.Column(nameof(Term.Lemma)).OnTable(nameof(Term)).AsString(int.MaxValue).NotNullable();
+    }
+}

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.2</Version>
+        <Version>1.0.4</Version>
     </PropertyGroup>
 
     <ItemGroup>

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.2</Version>
+        <Version>1.0.4</Version>
     </PropertyGroup>
 
     <ItemGroup>

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.2</Version>
+        <Version>1.0.4</Version>
     </PropertyGroup>
 
     <ItemGroup>

src/core/Rsdo.Concordancer.Services/Framework/DatabaseManager/PostgreSqlDatabaseManager.cs

@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Npgsql;
 using Rsdo.Concordancer.Core.Interfaces;
+using Rsdo.Concordancer.ServiceModel.Types;
 using Rsdo.Concordancer.Services.Framework.DbContext;
 
 namespace Rsdo.Concordancer.Services.Framework.DatabaseManager;
@@ -57,7 +58,7 @@ public class PostgreSqlDatabaseManager : IDatabaseManager
     public async Task UpdateCorpusDatabases()
     {
         // Update all corpus databases
-        var corpusIds = await dbContext.Corpus.Select(c => c.Id).ToListAsync();
+        var corpusIds = await dbContext.Corpus.Where(s => s.Status == CorpusStatus.Active).Select(c => c.Id).ToListAsync();
         foreach (var corpusId in corpusIds)
         {
             var connectionString = connectionStringProvider.GetCorpusConnectionString(corpusId);

src/core/Rsdo.Concordancer.Services/RequestHandlers/Concordances/ExportConcordancesHandler.cs

@@ -1,8 +1,11 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
 using Rsdo.Concordancer.Core.Constants;
 using Rsdo.Concordancer.Core.Interfaces;
 using Rsdo.Concordancer.Core.Model;
@@ -11,6 +14,7 @@ using Rsdo.Concordancer.Core.Search.Queries.Concordances;
 using Rsdo.Concordancer.ServiceModel.Requests.Concordances;
 using Rsdo.Concordancer.ServiceModel.Shared;
 using Rsdo.Concordancer.ServiceModel.Types;
+using Rsdo.Concordancer.Services.Framework.DbContext;
 using Rsdo.Concordancer.Services.Search.QueryFactories;
 using Rsdo.Concordancer.Services.Services.ParagraphService;
 
@@ -18,15 +22,18 @@ namespace Rsdo.Concordancer.Services.RequestHandlers.Concordances;
 
 public class ExportConcordancesHandler : BaseSearchConcordancesHandler, IRequestHandler<ExportConcordances, ExportConcordancesResponse>
 {
+    private readonly CorpusDbContext dbContext;
     private readonly IQueryFactory<ExportConcordances, ConcordancesQuery> queryFactory;
     private readonly ISearchEngine searchEngine;
 
     public ExportConcordancesHandler(
+        CorpusDbContext dbContext,
         IParagraphService paragraphService,
         IQueryFactory<ExportConcordances, ConcordancesQuery> queryFactory,
         ISearchEngine searchEngine)
         : base(paragraphService)
     {
+        this.dbContext = dbContext;
         this.queryFactory = queryFactory;
         this.searchEngine = searchEngine;
     }
@@ -42,6 +49,9 @@ public class ExportConcordancesHandler : BaseSearchConcordancesHandler, IRequest
         // Get search items
         var items = await GetItems(query, result.EntityIds);
 
+        // Get sources
+        var sources = await GetSources(items);
+
         // Export
         var stream = new MemoryStream();
         await using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
@@ -52,7 +62,7 @@ public class ExportConcordancesHandler : BaseSearchConcordancesHandler, IRequest
             // Write items
             foreach (var item in items)
             {
-                await WriteItem(writer, item);
+                await WriteItem(writer, item, sources[item.ParagraphId]);
             }
         }
 
@@ -91,16 +101,35 @@ public class ExportConcordancesHandler : BaseSearchConcordancesHandler, IRequest
         await writer.WriteAsync("Iskani niz");
         await writer.WriteAsync("\t");
         await writer.WriteAsync("Desno besedilo");
+        await writer.WriteAsync("\t");
+        await writer.WriteAsync("Vir");
         await writer.WriteLineAsync();
     }
 
-    private static async Task WriteItem(StreamWriter writer, SearchConcordancesResponseItem item)
+    private static async Task WriteItem(StreamWriter writer, SearchConcordancesResponseItem item, string source)
     {
         await WriteContext(writer, item.LeftContext);
         await writer.WriteAsync("\t");
         await writer.WriteAsync(item.CenterContext.Form);
         await writer.WriteAsync("\t");
         await WriteContext(writer, item.RightContext);
+        await writer.WriteAsync("\t");
+        await writer.WriteAsync(source);
         await writer.WriteLineAsync();
     }
+
+    private async Task<Dictionary<Guid, string>> GetSources(List<SearchConcordancesResponseItem> items)
+    {
+        var paragraphIds = items.Select(i => i.ParagraphId).ToList();
+        var sources = await dbContext.Paragraph.Include(p => p.Text)
+            .Where(p => paragraphIds.Contains(p.Id))
+            .Select(
+                p => new
+                {
+                    p.Id,
+                    p.Text.SourceFile,
+                })
+            .ToListAsync();
+        return sources.ToDictionary(x => x.Id, x => Path.GetFileNameWithoutExtension(x.SourceFile));
+    }
 }

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.2</Version>
+        <Version>1.0.4</Version>
     </PropertyGroup>
 
     <ItemGroup>