From 91e946c36d2bc10cdaa072f6d699fe332d78c0f6 Mon Sep 17 00:00:00 2001 From: Alex Mickelson Date: Tue, 5 Dec 2023 16:33:04 -0700 Subject: [PATCH] peace nirvana and no yellow warning lines in my console --- Management.Web/Pages/Course.razor | 7 +- Management.Web/Program.cs | 2 +- .../AssignmentForm/AssignmentForm.razor | 2 +- .../AssignmentMarkdownEditor.razor | 2 +- .../AssignmentForm/RubricDisplay.razor | 61 +++--- .../AssignmentForm/RubricEditor.razor | 173 ------------------ .../AssignmentForm/RubricEditorItem.razor | 137 -------------- .../Shared/Components/ConfirmationModal.razor | 2 +- .../Shared/Components/Forms/FormSelect.razor | 3 - .../Shared/Components/MonacoTextArea.razor | 4 +- .../Quiz/Markdown/MarkdownQuizForm.razor | 7 +- .../Shared/InitializeNewCourse.razor | 2 +- .../Assignment/AssignmentListItem.razor | 6 +- .../Shared/Module/NewAssignment.razor | 15 +- Management.Web/Shared/Module/NewQuiz.razor | 15 +- .../Shared/Module/QuizListItem.razor | 1 - .../Shared/Semester/Day/AssignmentInDay.razor | 1 - .../Shared/Semester/Day/QuizInDay.razor | 1 - .../Configuration/AssignmentEditorContext.cs | 3 +- .../Configuration/QuizEditorContext.cs | 2 +- .../AssignmentSyncronizationExtensions.cs | 8 +- Management/Models/Local/LocalCourse.cs | 2 +- .../Canvas/CanvasAssignmentService.cs | 6 +- Management/Services/Canvas/CanvasService.cs | 4 +- .../Services/Files/FileStorageManager.cs | 4 +- .../Services/Files/SaveMarkdownCourse.cs | 2 +- 26 files changed, 75 insertions(+), 397 deletions(-) delete mode 100644 Management.Web/Shared/Components/AssignmentForm/RubricEditor.razor delete mode 100644 Management.Web/Shared/Components/AssignmentForm/RubricEditorItem.razor diff --git a/Management.Web/Pages/Course.razor b/Management.Web/Pages/Course.razor index 3275b55..38f5505 100644 --- a/Management.Web/Pages/Course.razor +++ b/Management.Web/Pages/Course.razor @@ -15,7 +15,7 @@ @code { [Parameter] - public string CourseName { get; set; } + public string? CourseName { get; set; } private bool loading = true; @@ -54,11 +54,6 @@ Select New Course - - - @* *@ View In Canvas diff --git a/Management.Web/Program.cs b/Management.Web/Program.cs index 200c0f7..aa1e23f 100644 --- a/Management.Web/Program.cs +++ b/Management.Web/Program.cs @@ -86,7 +86,7 @@ app.MapFallbackToPage("/_Host"); app.Start(); -var addresses = app.Services.GetService().Features.Get().Addresses; +var addresses = app.Services.GetService()?.Features.Get()?.Addresses ?? []; foreach (var address in addresses) { diff --git a/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor b/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor index 8b2d33f..8d4d522 100644 --- a/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor +++ b/Management.Web/Shared/Components/AssignmentForm/AssignmentForm.razor @@ -143,7 +143,7 @@ private async Task deleteFromCanvas() { if (assignmentInCanvas == null - || planner?.LocalCourse.Settings.CanvasId == null + || planner?.LocalCourse?.Settings.CanvasId == null || assignmentContext.Assignment == null ) return; diff --git a/Management.Web/Shared/Components/AssignmentForm/AssignmentMarkdownEditor.razor b/Management.Web/Shared/Components/AssignmentForm/AssignmentMarkdownEditor.razor index 9bf3fbf..e6c036c 100644 --- a/Management.Web/Shared/Components/AssignmentForm/AssignmentMarkdownEditor.razor +++ b/Management.Web/Shared/Components/AssignmentForm/AssignmentMarkdownEditor.razor @@ -59,7 +59,7 @@ StateHasChanged(); } - private MarkupString preview { get => (MarkupString)Markdown.ToHtml(assignmentContext.Assignment.Description); } + private MarkupString preview { get => (MarkupString)Markdown.ToHtml(assignmentContext?.Assignment?.Description ?? ""); } } diff --git a/Management.Web/Shared/Components/AssignmentForm/RubricDisplay.razor b/Management.Web/Shared/Components/AssignmentForm/RubricDisplay.razor index d2bc757..fc41a17 100644 --- a/Management.Web/Shared/Components/AssignmentForm/RubricDisplay.razor +++ b/Management.Web/Shared/Components/AssignmentForm/RubricDisplay.razor @@ -5,8 +5,6 @@ @code { - private int rubricReloadKey = 0; - private string? error { get; set; } = null; protected override void OnInitialized() @@ -24,39 +22,40 @@ assignmentContext.StateHasChanged -= reload; } - private int requiredPoints => assignmentContext.Assignment.Rubric.Where(r => !r.IsExtraCredit).Select(r => r.Points).Sum(); - private int extraCreditPoints => assignmentContext.Assignment.Rubric.Where(r => r.IsExtraCredit).Select(r => r.Points).Sum(); + private int requiredPoints => assignmentContext?.Assignment?.Rubric.Where(r => !r.IsExtraCredit).Select(r => r.Points).Sum() ?? 0; + private int extraCreditPoints => assignmentContext?.Assignment?.Rubric.Where(r => r.IsExtraCredit).Select(r => r.Points).Sum() ?? 0; } -
-

Rubric

-
- -@if (error != null) +@if(assignmentContext != null) { -

Error: @error

-} +
+

Rubric

+
+ + @if (error != null) + { +

Error: @error

+ } -
-
Label
-
Points
-
Extra Credit
-
-@foreach (var item in assignmentContext.Assignment.Rubric) -{
-
@item.Label
-
@item.Points
-
@item.IsExtraCredit
+
Label
+
Points
+
Extra Credit
-} -
-
- Required Points: @requiredPoints + @foreach (var item in assignmentContext?.Assignment?.Rubric ?? []) + { +
+
@item.Label
+
@item.Points
+
@item.IsExtraCredit
+
+ } +
+
+ Required Points: @requiredPoints +
+
+ Extra Credit Points @extraCreditPoints +
-
- Extra Credit Points @extraCreditPoints -
-
- - +} \ No newline at end of file diff --git a/Management.Web/Shared/Components/AssignmentForm/RubricEditor.razor b/Management.Web/Shared/Components/AssignmentForm/RubricEditor.razor deleted file mode 100644 index 5557704..0000000 --- a/Management.Web/Shared/Components/AssignmentForm/RubricEditor.razor +++ /dev/null @@ -1,173 +0,0 @@ -@using Management.Web.Shared.Components - -@inject CoursePlanner planner -@inject AssignmentEditorContext assignmentContext - -@code -{ - private IEnumerable rubric { get; set; } = Array.Empty(); - private int rubricReloadKey = 0; - - protected override void OnInitialized() - { - assignmentContext.StateHasChanged += reload; - reload(); - } - private void reload() - { - if (assignmentContext.Assignment != null) - { - rubric = assignmentContext.Assignment.Rubric; - } - this.InvokeAsync(this.StateHasChanged); - } - public void Dispose() - { - assignmentContext.StateHasChanged -= reload; - } - - private void save() - { - if (assignmentContext.Assignment != null) - { - var newAssignment = assignmentContext.Assignment with - { - Rubric = rubric, - }; - assignmentContext.SaveAssignment(newAssignment); - StateHasChanged(); - } - } - private void addItem() - { - if (assignmentContext.Assignment != null) - { - rubric = rubric.Append(new RubricItem - { - Label = "", - Points = 0 - }); - } - } - private void removeItem() - { - if (assignmentContext.Assignment != null) - { - rubric = rubric.Take(rubric.Count() - 1); - save(); - } - } - private void editItem(RubricItem newItem, int index) - { - if (assignmentContext.Assignment != null) - { - rubric = rubric.Select((r, i) => i == index ? newItem : r); - save(); - } - } - private void MoveUp(RubricItem item) - { - if (assignmentContext.Assignment != null) - { - var rubricList = rubric.ToList(); - var index = rubricList.IndexOf(item); - - if (index > 0) - { - var previous = rubricList[index - 1]; - rubricList[index - 1] = item; - rubricList[index] = previous; - rubric = rubricList; - save(); - } - rubricReloadKey++; - StateHasChanged(); - } - } - private void MoveDown(RubricItem item) - { - if (assignmentContext.Assignment != null) - { - var rubricList = rubric.ToList(); - var index = rubricList.IndexOf(item); - - if (index < rubricList.Count()) - { - var next = rubricList[index + 1]; - rubricList[index + 1] = item; - rubricList[index] = next; - rubric = rubricList; - save(); - } - rubricReloadKey++; - StateHasChanged(); - } - } - - private int requiredPoints => rubric.Where(r => !r.IsExtraCredit).Select(r => r.Points).Sum(); - private int extraCreditPoints => rubric.Where(r => r.IsExtraCredit).Select(r => r.Points).Sum(); -} - -
-
- -
-

Rubric

-
- -
- -
-
- -
    -@foreach (var (rubricItem, index) in rubric.Select((r, i) => (r, i))) - { - - } -
- - -
-
-
- Requred Points: @requiredPoints -
-
- Extra Credit Points @extraCreditPoints -
-
-
-
- - -
-
-
diff --git a/Management.Web/Shared/Components/AssignmentForm/RubricEditorItem.razor b/Management.Web/Shared/Components/AssignmentForm/RubricEditorItem.razor deleted file mode 100644 index b8aefd2..0000000 --- a/Management.Web/Shared/Components/AssignmentForm/RubricEditorItem.razor +++ /dev/null @@ -1,137 +0,0 @@ - -@inject CoursePlanner planner - -@code -{ - [Parameter, EditorRequired] - public RubricItem RubricItem { get; set; } = default!; - - [Parameter, EditorRequired] - public Action OnUpdate { get; set; } = default!; - [Parameter, EditorRequired] - public Action MoveUp { get; set; } = default!; - [Parameter, EditorRequired] - public Action MoveDown { get; set; } = default!; - - private int points { get; set; } - private string label { get; set; } - private bool firstLoad = true; - protected override void OnParametersSet() - { - if(firstLoad) - { - firstLoad = false; - points = RubricItem.Points; - label = RubricItem.Label; - } - } - - - private void editItem(string label, int points) - { - var newRubricItem = RubricItem with - { - Label = label, - Points = points - }; - OnUpdate(newRubricItem); - } -} - -
  • -
    -
    - - -
    -
    - - -
    -
    - -
    - -
    -
    -
    -
    - - - - -
    -
    - - - - -
    -
    -
    -
    • \ No newline at end of file diff --git a/Management.Web/Shared/Components/ConfirmationModal.razor b/Management.Web/Shared/Components/ConfirmationModal.razor index 87fce84..f58721f 100644 --- a/Management.Web/Shared/Components/ConfirmationModal.razor +++ b/Management.Web/Shared/Components/ConfirmationModal.razor @@ -79,7 +79,7 @@
    @if(doingAsyncThings) { - + }
    \ No newline at end of file diff --git a/Management.Web/Shared/Components/Forms/FormSelect.razor b/Management.Web/Shared/Components/Forms/FormSelect.razor index 782234a..d36ca24 100644 --- a/Management.Web/Shared/Components/Forms/FormSelect.razor +++ b/Management.Web/Shared/Components/Forms/FormSelect.razor @@ -18,8 +18,6 @@ private string htmlLabel => Label.Replace("-", ""); - private string selectedItemId { get; set; } - private void onSelect(ChangeEventArgs e) { var newId = e.Value?.ToString(); @@ -33,7 +31,6 @@