Skip to content

Contentfilesview rework #821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andreasweishaupt merged 4 commits into from
Nov 19, 2025
Merged

Contentfilesview rework #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b05339
rework ContentFilesView.razor
andreasweishaupt Oct 27, 2025
6c0fd53
Merge branch 'main' into contentfilesview-rework
andreasweishaupt Nov 6, 2025
a65c3eb
add localization for H5PState
andreasweishaupt Nov 6, 2025
3735c88
make text in H5PStateIcon also clickable
andreasweishaupt Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions IntegrationTest/Components/Adaptivity/Dialogues/CreateEditReferenceActionDialogIt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using NSubstitute;
using NUnit.Framework;
using Presentation.Components.Adaptivity.Dialogues;
using Presentation.Components.ContentFiles;
using Presentation.Components.Forms;
using Presentation.Components.Forms.Element;
using Presentation.PresentationLogic.API;
Expand Down Expand Up @@ -58,6 +59,7 @@ public class CreateEditReferenceActionDialogIt : MudDialogTestFixture<CreateEdit
Context.Services.AddSingleton(_selectedViewModelsProvider);
Context.Services.AddSingleton(_elementModelHandler);
Context.ComponentFactories.AddStub<TableSelect<ILearningContentViewModel>>();
Context.ComponentFactories.AddStub<ContentFilesView>();
Context.RenderComponent<MudPopoverProvider>();
await GetDialogAsync();
}
Expand All @@ -76,7 +78,7 @@ public void Teardown()
private ILearningWorldPresenter LearningWorldPresenter { get; set; }
private ILearningWorldViewModel World { get; set; }
private ILearningContentViewModel[] Contents { get; set; }

private ISelectedViewModelsProvider _selectedViewModelsProvider;
private IElementModelHandler _elementModelHandler;
private IStringLocalizer<DragDropLearningElement> _stringLocalizer;
Expand All @@ -92,6 +94,7 @@ private async Task GetDialogAsync()
dialogParameters.Add(nameof(CreateEditReferenceActionDialog.ExistingAction), ExistingAction);
//dialogParameters.Add(nameof(CreateEditReferenceActionDialog.ExistingRule), ExistingRule);
}

Dialog = await OpenDialogAndGetDialogReferenceAsync("title", new DialogOptions(),
dialogParameters);
}
Expand All @@ -101,7 +104,7 @@ private async Task GetDialogAsync()
public async Task NoExistingAction_ContentSelected_CallsCreateAdaptivityRuleWithContentReferenceAction()
{
await DialogProvider.Find("div.panel-content").ClickAsync(new MouseEventArgs());

var componentUnderTest = DialogProvider.FindComponent<CreateEditReferenceActionDialog>();
componentUnderTest.Instance.LearningContent = Contents[0];
componentUnderTest.Instance.Comment = "foo";
Expand Down Expand Up @@ -197,7 +200,7 @@ public async Task ExistingAction_ContentSelected_NoChange_CallsNothing()

PresentationLogic.DidNotReceiveWithAnyArgs().EditElementReferenceAction(eravm, eravm.ElementId, "foo");
}

[Test]
// ANF-ID: [AWA0027]
public async Task ExistingAction_ElementSelected_CallsReplaceElementReferenceActionByContentReferenceAction()
Expand All @@ -210,9 +213,9 @@ public async Task ExistingAction_ElementSelected_CallsReplaceElementReferenceAct

await DialogProvider.FindComponent<MudTextField<string>>().Find("textarea")
.ChangeAsync(new ChangeEventArgs { Value = "foo" });

await DialogProvider.Find("div.panel-content").ClickAsync(new MouseEventArgs());

var componentUnderTest = DialogProvider.FindComponent<CreateEditReferenceActionDialog>();
componentUnderTest.Instance.LearningContent = Contents[0];

Expand All @@ -224,7 +227,7 @@ await DialogProvider.FindComponent<MudTextField<string>>().Find("textarea")
Arg.Any<ContentReferenceActionViewModel>(),
Arg.Any<CorrectnessTriggerViewModel>());
}

[Test]
// ANF-ID: [AWA0027]
public async Task ExistingAction_ContentSelected_CallsReplaceContentReferenceActionByElementReferenceAction()
Expand All @@ -237,9 +240,9 @@ public async Task ExistingAction_ContentSelected_CallsReplaceContentReferenceAct

await DialogProvider.FindComponent<MudTextField<string>>().Find("textarea")
.ChangeAsync(new ChangeEventArgs { Value = "foo" });

await DialogProvider.Find("div.panel-element").ClickAsync(new MouseEventArgs());

await DialogProvider.Find("div.mud-paper").ClickAsync(new MouseEventArgs());

await DialogProvider.FindComponent<MudButton>().Find("button").ClickAsync(new MouseEventArgs());
Expand Down
108 changes: 55 additions & 53 deletions Presentation/Components/Adaptivity/Dialogues/CreateEditReferenceActionDialog.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@using System.Diagnostics.CodeAnalysis
@using Microsoft.Extensions.Localization
@using Presentation.Components.ContentFiles
@using Presentation.Components.Forms
@using Presentation.PresentationLogic.API
@using Presentation.PresentationLogic.LearningContent
Expand All @@ -16,7 +17,8 @@
<div class="relative w-[800px] h-[520px] flex flex-col mx-4">
<MudText Class="px-2 mb-1 text-sm cursor-default">@Localizer["Reference.Text"]</MudText>
<div class="border-adlergrey-200 border-4 rounded m-2">
<MudText Class="font-bold text-adlertitledarkblue text-sm cursor-default px-3 py-1 pt-2">@Localizer["Note.Label.Text"]</MudText>
<MudText
Class="font-bold text-adlertitledarkblue text-sm cursor-default px-3 py-1 pt-2">@Localizer["Note.Label.Text"]</MudText>
<div class="border-4 border-adlergrey-100 rounded-lg mx-1.5">
<MudTextField Variant="Variant.Outlined"
Class="shadow-none m-0"
Expand All @@ -33,14 +35,20 @@
<MudForm Class="bg-white border-t-2 border-adlergrey-200" @ref="_form">
<div class="p-2">
<div class="flex flex-row justify-between items-center gap-1">
<MudText Class="cursor-default font-bold text-sm text-adlertitledarkblue p-1">@Localizer["Reference.Element.Label.Text"]
<MudTooltip Placement="Placement.Right" Class="w-96 p-4 bg-adlerdarkblue-200 shadow-xl text-start leading-relaxed cursor-default" Text="@Localizer["Reference.Element.Info.Text"]">
<MudIcon Size="Size.Small" Icon="@Icons.Material.Filled.Info" Class="text-adlergrey-300 hover:text-adlerdarkblue"></MudIcon>
<MudText
Class="cursor-default font-bold text-sm text-adlertitledarkblue p-1">@Localizer["Reference.Element.Label.Text"]
<MudTooltip Placement="Placement.Right"
Class="w-96 p-4 bg-adlerdarkblue-200 shadow-xl text-start leading-relaxed cursor-default"
Text="@Localizer["Reference.Element.Info.Text"]">
<MudIcon Size="Size.Small" Icon="@Icons.Material.Filled.Info"
Class="text-adlergrey-300 hover:text-adlerdarkblue"></MudIcon>
</MudTooltip>
</MudText>
<div class="flex flex-row gap-1 w-72 cursor-default">
<MudText Class="text-sm">@Localizer["Reference.Material.Element.Text.Selected"]</MudText>
<MudText Class="text-sm font-bold truncate text-ellipsis"> @LearningElement?.Name </MudText>
<MudText
Class="text-sm">@Localizer["Reference.Material.Element.Text.Selected"]</MudText>
<MudText
Class="text-sm font-bold truncate text-ellipsis"> @LearningElement?.Name </MudText>
</div>
</div>
<GridSelect T="ILearningElementViewModel"
Expand All @@ -65,47 +73,34 @@
<MudForm Class="bg-white border-t-2 border-adlergrey-100" @ref="_form">
<div class="p-2">
<div class="flex flex-row justify-between items-center gap-1">
<MudText Class="font-bold text-sm p-1 cursor-default text-adlertitledarkblue">@Localizer["Reference.Content.Label.Text"]
<MudTooltip Placement="Placement.Right" Class="w-96 p-4 bg-adlerdarkblue-200 shadow-xl text-start leading-relaxed cursor-default" Text="@Localizer["Reference.Content.Info.Text"]">
<MudIcon Size="Size.Small" Icon="@Icons.Material.Filled.Info" Class="text-adlergrey-300 hover:text-adlerdarkblue"></MudIcon>
<MudText
Class="font-bold text-sm p-1 cursor-default text-adlertitledarkblue">@Localizer["Reference.Content.Label.Text"]
<MudTooltip Placement="Placement.Right"
Class="w-96 p-4 bg-adlerdarkblue-200 shadow-xl text-start leading-relaxed cursor-default"
Text="@Localizer["Reference.Content.Info.Text"]">
<MudIcon Size="Size.Small" Icon="@Icons.Material.Filled.Info"
Class="text-adlergrey-300 hover:text-adlerdarkblue"></MudIcon>
</MudTooltip>
</MudText>
<div class="flex flex-row gap-1 w-72 cursor-default">
<MudText Class="text-sm">@Localizer["Reference.Material.Element.Text.Selected"]</MudText>
<MudText Class="text-sm font-bold truncate text-ellipsis"> @LearningContent?.Name </MudText>
<MudText
Class="text-sm">@Localizer["Reference.Material.Element.Text.Selected"]</MudText>
<MudText
Class="text-sm font-bold truncate text-ellipsis"> @LearningContent?.Name </MudText>
</div>
</div>

<TableSelect
T="ILearningContentViewModel"
@bind-Value="LearningContent"
Required="true"
RequiredError="@Localizer["Content.RequiredError.Text"]"
Typo="Typo.body2"
Margin="Margin.None"
AllowDeselect="false"
Elements="LearningContents.OrderBy(x => x.Name, StringComparer.OrdinalIgnoreCase)"
FilterFuncSearchableStrings="ILearningContentViewModel.GetSearchableStrings">
<HeaderContent>
</HeaderContent>
<RowTemplate>
<MudTd Class="px-1.5 py-0 h-6">
<MudIconButton Icon="@Icons.Material.Filled.RemoveRedEye"
OnClick="() => PresentationLogic.ShowLearningContentAsync(context)"/>
</MudTd>
<MudTd Class="cursor-pointer p-0 max-w-[20rem] truncate h-6" DataLabel="Name">@context.Name</MudTd>
<MudTd Class="cursor-pointer py-0 pl-1 h-6" DataLabel="Type">
@if (context is FileContentViewModel fileContentContext)
{
@fileContentContext.Type
}
else
{
<span>Link</span>
}
</MudTd>
</RowTemplate>
</TableSelect>

<ContentFilesView @bind-SelectedLearningContent="LearningContent"
ShowHeadRow="false"
ShowContentState="false"
TableHeight="150px"
SurroundingDivClass="rounded border-2 border-adlergrey-100"
MultipleSelection="false"
ShowPager="false"
DeleteButtonVisible="false"
ShowPreviewButton="true"
ShowHoverMenu="false"
FocusSearch="true"></ContentFilesView>
</div>
</MudForm>
</MudTabPanel>
Expand All @@ -129,9 +124,9 @@
[Inject, AllowNull] internal IStringLocalizer<CreateEditReferenceActionDialog> Localizer { get; set; }

[Parameter] public bool? IsSelected { get; set; }

[Parameter] public IAdaptivityActionViewModel? ExistingAction { get; set; }

[Parameter] public IAdaptivityRuleViewModel? ExistingRule { get; set; }

[Parameter, EditorRequired, AllowNull] public IAdaptivityQuestionViewModel Question { get; set; }
Expand All @@ -149,6 +144,7 @@
private MudTabPanel _contentPanel = null!;
private MudTabPanel _elementPanel = null!;
private ILearningContentViewModel? _learningContent;

internal ILearningContentViewModel? LearningContent
{
get => _learningContent;
Expand All @@ -159,8 +155,9 @@
{
_learningElement = null;
}
}
}
}

private ILearningElementViewModel? _learningElement;

private ILearningElementViewModel? LearningElement
Expand All @@ -175,22 +172,25 @@
}
}
}

internal string Comment = "";

private bool _initialized;

private string GetTabPanelClass(MudTabPanel panel)
{
var isSelected = _tabs.ActivePanel == panel;
@if(panel == _elementPanel)

@if (panel == _elementPanel)
{
return isSelected ? "text-adlertextgrey bg-adlergrey-200 hover:bg-adlergrey-300 font-bold panel-element" : "text-adlergrey-300 bg-adlergrey-100 panel-element";
}
@if(panel == _contentPanel)

@if (panel == _contentPanel)
{
return isSelected ? "text-adlertextgrey bg-adlergrey-200 hover:bg-adlergrey-300 font-bold rounded-tr panel-content" : "text-adlergrey-300 bg-adlergrey-100 rounded-tr panel-content";
}

return "border-2 flex rounded-lg";
}

Expand All @@ -210,6 +210,7 @@
Comment = eravm.Comment;
break;
}

_initialized = true;
}

Expand Down Expand Up @@ -237,16 +238,16 @@

private async Task SubmitAsync()
{
if(!(_tabs.ActivePanel == _elementPanel && LearningContent != null || _tabs.ActivePanel == _contentPanel && LearningElement != null))
if (!(_tabs.ActivePanel == _elementPanel && LearningContent != null || _tabs.ActivePanel == _contentPanel && LearningElement != null))
{
await _form.Validate();
if (!_form.IsValid) return;
}

try
{
switch (ExistingAction)
{
{
case ContentReferenceActionViewModel when LearningContent == null:
PresentationLogic.ReplaceContentReferenceActionByElementReferenceAction(Question, ExistingRule!,
new ElementReferenceActionViewModel(LearningElement!.Id, Comment),
Expand Down Expand Up @@ -297,6 +298,7 @@
{
throw new InvalidOperationException("Either LearningElement or LearningContent must be set");
}

PresentationLogic.CreateAdaptivityRule(
Question,
new CorrectnessTriggerViewModel(AnswerResult.Incorrect),
Expand Down
2 changes: 1 addition & 1 deletion Presentation/Components/ContentFiles/ContentFilesContainer.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ContentFilesAdd/>
</div>
<div class="w-full h-full overflow-y-hidden overflow-x-scroll">
<ContentFilesView @ref="ContentFilesView"/>
<ContentFilesView TableWidthClass="max-w-5xl" @ref="ContentFilesView" ShowHeader="true"/>
</div>
</div>
</CascadingValue>
Expand Down
Loading
Loading