From f7189c916717b9935a4eb7cb8bf8296283d481ff Mon Sep 17 00:00:00 2001 From: Bryan Carlson Date: Tue, 2 Nov 2021 16:47:28 -0700 Subject: [PATCH 1/8] Created a shared component for all catalog filters, started conversion of page URLs to better resemble RESTful API URIs --- Caf.Midden.Wasm/Pages/ProjectCatalog.razor | 14 +- Caf.Midden.Wasm/Pages/TagCatalog.razor | 31 +++++ Caf.Midden.Wasm/Pages/ZoneCatalog.razor | 6 +- .../FilteredCatalogMetadataViewer.razor | 58 ++++++++ .../FilteredCatalogMetadataViewer.razor.cs | 128 ++++++++++++++++++ 5 files changed, 225 insertions(+), 12 deletions(-) create mode 100644 Caf.Midden.Wasm/Pages/TagCatalog.razor create mode 100644 Caf.Midden.Wasm/Shared/FilteredCatalogMetadataViewer.razor create mode 100644 Caf.Midden.Wasm/Shared/FilteredCatalogMetadataViewer.razor.cs diff --git a/Caf.Midden.Wasm/Pages/ProjectCatalog.razor b/Caf.Midden.Wasm/Pages/ProjectCatalog.razor index 2da8ae1..5189639 100644 --- a/Caf.Midden.Wasm/Pages/ProjectCatalog.razor +++ b/Caf.Midden.Wasm/Pages/ProjectCatalog.razor @@ -1,4 +1,4 @@ -@page "/catalog/{ZoneName}/{ProjectName}" +@page "/catalog/projects/{ProjectName}" @inject Services.StateContainer State @@ -13,8 +13,8 @@ - - @ZoneName + + Projects @@ -25,16 +25,12 @@
- + Title="@($"Catalog for Project: {ProjectName}")" /> +
@code { - [Parameter] - public string ZoneName { get; set; } - [Parameter] public string ProjectName { get; set; } } \ No newline at end of file diff --git a/Caf.Midden.Wasm/Pages/TagCatalog.razor b/Caf.Midden.Wasm/Pages/TagCatalog.razor new file mode 100644 index 0000000..397d8ab --- /dev/null +++ b/Caf.Midden.Wasm/Pages/TagCatalog.razor @@ -0,0 +1,31 @@ +@page "/catalog/tags/{TagName}" +@inject Services.StateContainer State + + + + + + + + + + Catalog + + + + @TagName + + + +
+ + + +
+ + +@code { + [Parameter] + public string TagName { get; set; } +} \ No newline at end of file diff --git a/Caf.Midden.Wasm/Pages/ZoneCatalog.razor b/Caf.Midden.Wasm/Pages/ZoneCatalog.razor index e81489a..1b92e06 100644 --- a/Caf.Midden.Wasm/Pages/ZoneCatalog.razor +++ b/Caf.Midden.Wasm/Pages/ZoneCatalog.razor @@ -1,4 +1,4 @@ -@page "/catalog/{ZoneName}" +@page "/catalog/zones/{ZoneName}" @inject Services.StateContainer State @@ -20,8 +20,8 @@
- + Title="@($"Catalog for Zone: {ZoneName}")" /> +
diff --git a/Caf.Midden.Wasm/Shared/FilteredCatalogMetadataViewer.razor b/Caf.Midden.Wasm/Shared/FilteredCatalogMetadataViewer.razor new file mode 100644 index 0000000..9695c5f --- /dev/null +++ b/Caf.Midden.Wasm/Shared/FilteredCatalogMetadataViewer.razor @@ -0,0 +1,58 @@ +@inject Caf.Midden.Wasm.Services.StateContainer State +@inject ModalService ModalService + +@if (State.Catalog != null) +{ + + + + + +} + +Datasets + +@if (FilteredMetadata != null) +{ + + @foreach (var metadata in FilteredMetadata) + { + + + + + @metadata.Dataset.Name + + + + + + + + @metadata.Dataset.Zone + / + + @metadata.Dataset.Project + + + + + @metadata.Dataset.Description + + + + @foreach (var tag in metadata.Dataset.Tags) + { + @tag + } + + + + } + +} \ No newline at end of file diff --git a/Caf.Midden.Wasm/Shared/FilteredCatalogMetadataViewer.razor.cs b/Caf.Midden.Wasm/Shared/FilteredCatalogMetadataViewer.razor.cs new file mode 100644 index 0000000..01a5793 --- /dev/null +++ b/Caf.Midden.Wasm/Shared/FilteredCatalogMetadataViewer.razor.cs @@ -0,0 +1,128 @@ +using AntDesign; +using Caf.Midden.Core.Models.v0_1; +using Caf.Midden.Wasm.Shared.Modals; +using Microsoft.AspNetCore.Components; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Caf.Midden.Wasm.Shared +{ + public partial class FilteredCatalogMetadataViewer : IDisposable + { + [Parameter] + public string Zone { get; set; } + + [Parameter] + public string Project { get; set; } + + [Parameter] + public string Tag { get; set; } + + + public List BaseMetadatas { get; set; } = new List(); + public List FilteredMetadata { get; set; } = new List(); + + public string SearchTerm { get; set; } + + protected override void OnInitialized() + { + State.StateChanged += async (source, property) + => await StateChanged(source, property); + + if (State?.Catalog != null) + { + SetBaseMetadatas(); + FilteredMetadata = this.BaseMetadatas; + } + } + + private async Task StateChanged( + ComponentBase source, + string property) + { + if (source != this) + { + if (property == "UpdateCatalog") + { + SetBaseMetadatas(); + FilteredMetadata = this.BaseMetadatas; + } + + await InvokeAsync(StateHasChanged); + } + + + } + + private void SetBaseMetadatas() + { + BaseMetadatas = State.Catalog.Metadatas + .Where(m => + (String.IsNullOrEmpty(this.Zone) || m.Dataset.Zone.ToLower() == this.Zone.ToLower()) && + (String.IsNullOrEmpty(this.Project) || m.Dataset.Project.ToLower() == this.Project.ToLower()) && + (String.IsNullOrEmpty(this.Tag) || m.Dataset.Tags.Any(t => t.ToLower() == this.Tag.ToLower()))) + .ToList(); + + } + private void SearchHandler() + { + if (string.IsNullOrWhiteSpace(SearchTerm)) + { + FilteredMetadata = this.BaseMetadatas; + } + else + { + FilteredMetadata = this.BaseMetadatas + .Where(m => + (m.Dataset.Name.ToLower().Contains( + SearchTerm.ToLower())) || + (m.Dataset.Description.ToLower().Contains( + SearchTerm.ToLower())) || + (m.Dataset.Tags.Any(t => t.ToLower().Contains( + SearchTerm.ToLower())))) + .ToList(); + } + } + + private ModalRef metadataDetailsModalRef; + private async Task OpenMetadataDetailsModalTemplate(Metadata metadata) + { + var templateOptions = new ViewModels.MetadataDetailsViewModel + { + Metadata = metadata + }; + + var modalConfig = new ModalOptions(); + modalConfig.Title = "Metadata Preview"; + modalConfig.Width = "90%"; + modalConfig.DestroyOnClose = true; + modalConfig.OnCancel = async (e) => + { + await metadataDetailsModalRef.CloseAsync(); + }; + modalConfig.OnOk = async (e) => + { + await metadataDetailsModalRef.CloseAsync(); + }; + + modalConfig.AfterClose = () => + { + InvokeAsync(StateHasChanged); + + return Task.CompletedTask; + }; + + metadataDetailsModalRef = await ModalService + .CreateModalAsync( + modalConfig, templateOptions); + } + + public void Dispose() + { + State.StateChanged -= async (source, property) + => await StateChanged(source, property); + } + } +} From b4b508803ab7c4bf4fcd54652dcd5a2d46b9faf0 Mon Sep 17 00:00:00 2001 From: Bryan Carlson Date: Tue, 2 Nov 2021 16:51:35 -0700 Subject: [PATCH 2/8] Changed links to new format, also added links to tag page --- Caf.Midden.Wasm/Shared/FilteredCatalogMetadataViewer.razor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Caf.Midden.Wasm/Shared/FilteredCatalogMetadataViewer.razor b/Caf.Midden.Wasm/Shared/FilteredCatalogMetadataViewer.razor index 9695c5f..8e1b6f9 100644 --- a/Caf.Midden.Wasm/Shared/FilteredCatalogMetadataViewer.razor +++ b/Caf.Midden.Wasm/Shared/FilteredCatalogMetadataViewer.razor @@ -33,10 +33,10 @@ - + @metadata.Dataset.Zone / - + @metadata.Dataset.Project @@ -48,7 +48,7 @@ @foreach (var tag in metadata.Dataset.Tags) { - @tag + @tag } From 7a5fd17e1162dc2b078cb61270443e8ba3be8533 Mon Sep 17 00:00:00 2001 From: Bryan Carlson Date: Tue, 2 Nov 2021 16:57:38 -0700 Subject: [PATCH 3/8] Using filteredcatalogmetadataviewer to display all datasets, since that works too! Now, only single component to edit --- Caf.Midden.Wasm/Pages/Catalog.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Caf.Midden.Wasm/Pages/Catalog.razor b/Caf.Midden.Wasm/Pages/Catalog.razor index a930e97..35061f6 100644 --- a/Caf.Midden.Wasm/Pages/Catalog.razor +++ b/Caf.Midden.Wasm/Pages/Catalog.razor @@ -22,7 +22,7 @@ - + From 48061de4a7735ac73d39b42e300205a5d8a72c99 Mon Sep 17 00:00:00 2001 From: Bryan Carlson Date: Tue, 2 Nov 2021 17:01:29 -0700 Subject: [PATCH 4/8] Deleted old catalog components, updated titles for filtered pages (still not happy with them) --- Caf.Midden.Wasm/Pages/ProjectCatalog.razor | 2 +- Caf.Midden.Wasm/Pages/TagCatalog.razor | 7 +- Caf.Midden.Wasm/Pages/ZoneCatalog.razor | 2 +- .../Shared/CatalogMetadataViewer.razor | 58 --------- .../Shared/CatalogMetadataViewer.razor.cs | 105 --------------- .../Shared/ProjectCatalogMetadataViewer.razor | 58 --------- .../ProjectCatalogMetadataViewer.razor.cs | 123 ------------------ .../Shared/ZoneCatalogMetadataViewer.razor | 58 --------- .../Shared/ZoneCatalogMetadataViewer.razor.cs | 119 ----------------- 9 files changed, 8 insertions(+), 524 deletions(-) delete mode 100644 Caf.Midden.Wasm/Shared/CatalogMetadataViewer.razor delete mode 100644 Caf.Midden.Wasm/Shared/CatalogMetadataViewer.razor.cs delete mode 100644 Caf.Midden.Wasm/Shared/ProjectCatalogMetadataViewer.razor delete mode 100644 Caf.Midden.Wasm/Shared/ProjectCatalogMetadataViewer.razor.cs delete mode 100644 Caf.Midden.Wasm/Shared/ZoneCatalogMetadataViewer.razor delete mode 100644 Caf.Midden.Wasm/Shared/ZoneCatalogMetadataViewer.razor.cs diff --git a/Caf.Midden.Wasm/Pages/ProjectCatalog.razor b/Caf.Midden.Wasm/Pages/ProjectCatalog.razor index 5189639..ad33224 100644 --- a/Caf.Midden.Wasm/Pages/ProjectCatalog.razor +++ b/Caf.Midden.Wasm/Pages/ProjectCatalog.razor @@ -25,7 +25,7 @@
+ Title="@($"Catalog filtered by Project: {ProjectName}")" />
diff --git a/Caf.Midden.Wasm/Pages/TagCatalog.razor b/Caf.Midden.Wasm/Pages/TagCatalog.razor index 397d8ab..782f597 100644 --- a/Caf.Midden.Wasm/Pages/TagCatalog.razor +++ b/Caf.Midden.Wasm/Pages/TagCatalog.razor @@ -12,6 +12,11 @@ Catalog + + + Tags + + @TagName @@ -20,7 +25,7 @@
+ Title="@($"Catalog filtered by Tag: {TagName}")" />
diff --git a/Caf.Midden.Wasm/Pages/ZoneCatalog.razor b/Caf.Midden.Wasm/Pages/ZoneCatalog.razor index 1b92e06..8697d93 100644 --- a/Caf.Midden.Wasm/Pages/ZoneCatalog.razor +++ b/Caf.Midden.Wasm/Pages/ZoneCatalog.razor @@ -20,7 +20,7 @@
+ Title="@($"Catalog filtered by Zone: {ZoneName}")" />
diff --git a/Caf.Midden.Wasm/Shared/CatalogMetadataViewer.razor b/Caf.Midden.Wasm/Shared/CatalogMetadataViewer.razor deleted file mode 100644 index 13d2818..0000000 --- a/Caf.Midden.Wasm/Shared/CatalogMetadataViewer.razor +++ /dev/null @@ -1,58 +0,0 @@ -@inject Caf.Midden.Wasm.Services.StateContainer State -@inject ModalService ModalService - -@if (State.Catalog != null) -{ - - - - - -} - -Datasets - -@if (FilteredMetadata != null) -{ - - @foreach (var metadata in FilteredMetadata) - { - - - - - @metadata.Dataset.Name - - - - - - - - @metadata.Dataset.Zone - / - - @metadata.Dataset.Project - - - - - @metadata.Dataset.Description - - - - @foreach (var tag in metadata.Dataset.Tags) - { - @tag - } - - - - } - -} \ No newline at end of file diff --git a/Caf.Midden.Wasm/Shared/CatalogMetadataViewer.razor.cs b/Caf.Midden.Wasm/Shared/CatalogMetadataViewer.razor.cs deleted file mode 100644 index 005987f..0000000 --- a/Caf.Midden.Wasm/Shared/CatalogMetadataViewer.razor.cs +++ /dev/null @@ -1,105 +0,0 @@ -using AntDesign; -using Caf.Midden.Core.Models.v0_1; -using Caf.Midden.Wasm.Shared.Modals; -using Microsoft.AspNetCore.Components; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Caf.Midden.Wasm.Shared -{ - public partial class CatalogMetadataViewer : IDisposable - { - public List FilteredMetadata { get; set; } = new List(); - - public string SearchTerm { get; set; } - - protected override void OnInitialized() - { - State.StateChanged += async (source, property) - => await StateChanged(source, property); - - if (State?.Catalog != null) - FilteredMetadata = State?.Catalog?.Metadatas; - } - - private async Task StateChanged( - ComponentBase source, - string property) - { - if(source != this) - { - if (property == "UpdateCatalog") - { - FilteredMetadata = State?.Catalog?.Metadatas; - } - - await InvokeAsync(StateHasChanged); - } - - - } - - private void SearchHandler() - { - if (string.IsNullOrWhiteSpace(SearchTerm)) - { - FilteredMetadata = State.Catalog.Metadatas; - } - else - { - FilteredMetadata = State.Catalog.Metadatas - .Where(m => - (m.Dataset.Project.ToLower().Contains( - SearchTerm.ToLower())) || - (m.Dataset.Name.ToLower().Contains( - SearchTerm.ToLower())) || - (m.Dataset.Description.ToLower().Contains( - SearchTerm.ToLower())) || - (m.Dataset.Tags.Any(t => t.ToLower().Contains( - SearchTerm.ToLower())))) - .ToList(); - } - } - - private ModalRef metadataDetailsModalRef; - private async Task OpenMetadataDetailsModalTemplate(Metadata metadata) - { - var templateOptions = new ViewModels.MetadataDetailsViewModel - { - Metadata = metadata - }; - - var modalConfig = new ModalOptions(); - modalConfig.Title = "Metadata Preview"; - modalConfig.Width = "90%"; - modalConfig.DestroyOnClose = true; - modalConfig.OnCancel = async (e) => - { - await metadataDetailsModalRef.CloseAsync(); - }; - modalConfig.OnOk = async (e) => - { - await metadataDetailsModalRef.CloseAsync(); - }; - - modalConfig.AfterClose = () => - { - InvokeAsync(StateHasChanged); - - return Task.CompletedTask; - }; - - metadataDetailsModalRef = await ModalService - .CreateModalAsync( - modalConfig, templateOptions); - } - - public void Dispose() - { - State.StateChanged -= async (source, property) - => await StateChanged(source, property); - } - } -} diff --git a/Caf.Midden.Wasm/Shared/ProjectCatalogMetadataViewer.razor b/Caf.Midden.Wasm/Shared/ProjectCatalogMetadataViewer.razor deleted file mode 100644 index 9695c5f..0000000 --- a/Caf.Midden.Wasm/Shared/ProjectCatalogMetadataViewer.razor +++ /dev/null @@ -1,58 +0,0 @@ -@inject Caf.Midden.Wasm.Services.StateContainer State -@inject ModalService ModalService - -@if (State.Catalog != null) -{ - - - - - -} - -Datasets - -@if (FilteredMetadata != null) -{ - - @foreach (var metadata in FilteredMetadata) - { - - - - - @metadata.Dataset.Name - - - - - - - - @metadata.Dataset.Zone - / - - @metadata.Dataset.Project - - - - - @metadata.Dataset.Description - - - - @foreach (var tag in metadata.Dataset.Tags) - { - @tag - } - - - - } - -} \ No newline at end of file diff --git a/Caf.Midden.Wasm/Shared/ProjectCatalogMetadataViewer.razor.cs b/Caf.Midden.Wasm/Shared/ProjectCatalogMetadataViewer.razor.cs deleted file mode 100644 index 70c658e..0000000 --- a/Caf.Midden.Wasm/Shared/ProjectCatalogMetadataViewer.razor.cs +++ /dev/null @@ -1,123 +0,0 @@ -using AntDesign; -using Caf.Midden.Core.Models.v0_1; -using Caf.Midden.Wasm.Shared.Modals; -using Microsoft.AspNetCore.Components; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Caf.Midden.Wasm.Shared -{ - public partial class ProjectCatalogMetadataViewer : IDisposable - { - [Parameter] - public string Zone { get; set; } - - [Parameter] - public string Project { get; set; } - - - public List BaseMetadatas { get; set; } = new List(); - public List FilteredMetadata { get; set; } = new List(); - - public string SearchTerm { get; set; } - - protected override void OnInitialized() - { - State.StateChanged += async (source, property) - => await StateChanged(source, property); - - if (State?.Catalog != null) - { - SetBaseMetadatas(); - FilteredMetadata = this.BaseMetadatas; - } - } - - private async Task StateChanged( - ComponentBase source, - string property) - { - if (source != this) - { - if (property == "UpdateCatalog") - { - SetBaseMetadatas(); - FilteredMetadata = this.BaseMetadatas; - } - - await InvokeAsync(StateHasChanged); - } - - - } - - private void SetBaseMetadatas() - { - BaseMetadatas = State.Catalog.Metadatas - .Where(m => - (m.Dataset.Zone.ToLower() == this.Zone.ToLower()) && - (m.Dataset.Project.ToLower() == this.Project.ToLower())) - .ToList(); - } - private void SearchHandler() - { - if (string.IsNullOrWhiteSpace(SearchTerm)) - { - FilteredMetadata = this.BaseMetadatas; - } - else - { - FilteredMetadata = this.BaseMetadatas - .Where(m => - (m.Dataset.Name.ToLower().Contains( - SearchTerm.ToLower())) || - (m.Dataset.Description.ToLower().Contains( - SearchTerm.ToLower())) || - (m.Dataset.Tags.Any(t => t.ToLower().Contains( - SearchTerm.ToLower())))) - .ToList(); - } - } - - private ModalRef metadataDetailsModalRef; - private async Task OpenMetadataDetailsModalTemplate(Metadata metadata) - { - var templateOptions = new ViewModels.MetadataDetailsViewModel - { - Metadata = metadata - }; - - var modalConfig = new ModalOptions(); - modalConfig.Title = "Metadata Preview"; - modalConfig.Width = "90%"; - modalConfig.DestroyOnClose = true; - modalConfig.OnCancel = async (e) => - { - await metadataDetailsModalRef.CloseAsync(); - }; - modalConfig.OnOk = async (e) => - { - await metadataDetailsModalRef.CloseAsync(); - }; - - modalConfig.AfterClose = () => - { - InvokeAsync(StateHasChanged); - - return Task.CompletedTask; - }; - - metadataDetailsModalRef = await ModalService - .CreateModalAsync( - modalConfig, templateOptions); - } - - public void Dispose() - { - State.StateChanged -= async (source, property) - => await StateChanged(source, property); - } - } -} diff --git a/Caf.Midden.Wasm/Shared/ZoneCatalogMetadataViewer.razor b/Caf.Midden.Wasm/Shared/ZoneCatalogMetadataViewer.razor deleted file mode 100644 index 9695c5f..0000000 --- a/Caf.Midden.Wasm/Shared/ZoneCatalogMetadataViewer.razor +++ /dev/null @@ -1,58 +0,0 @@ -@inject Caf.Midden.Wasm.Services.StateContainer State -@inject ModalService ModalService - -@if (State.Catalog != null) -{ - - - - - -} - -Datasets - -@if (FilteredMetadata != null) -{ - - @foreach (var metadata in FilteredMetadata) - { - - - - - @metadata.Dataset.Name - - - - - - - - @metadata.Dataset.Zone - / - - @metadata.Dataset.Project - - - - - @metadata.Dataset.Description - - - - @foreach (var tag in metadata.Dataset.Tags) - { - @tag - } - - - - } - -} \ No newline at end of file diff --git a/Caf.Midden.Wasm/Shared/ZoneCatalogMetadataViewer.razor.cs b/Caf.Midden.Wasm/Shared/ZoneCatalogMetadataViewer.razor.cs deleted file mode 100644 index 5fde6f3..0000000 --- a/Caf.Midden.Wasm/Shared/ZoneCatalogMetadataViewer.razor.cs +++ /dev/null @@ -1,119 +0,0 @@ -using AntDesign; -using Caf.Midden.Core.Models.v0_1; -using Caf.Midden.Wasm.Shared.Modals; -using Microsoft.AspNetCore.Components; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Caf.Midden.Wasm.Shared -{ - public partial class ZoneCatalogMetadataViewer : IDisposable - { - [Parameter] - public string Zone { get; set; } - - public List BaseMetadatas { get; set; } = new List(); - public List FilteredMetadata { get; set; } = new List(); - - public string SearchTerm { get; set; } - - protected override void OnInitialized() - { - State.StateChanged += async (source, property) - => await StateChanged(source, property); - - if (State?.Catalog != null) - { - SetBaseMetadatas(); - FilteredMetadata = this.BaseMetadatas; - } - } - - private async Task StateChanged( - ComponentBase source, - string property) - { - if (source != this) - { - if (property == "UpdateCatalog") - { - SetBaseMetadatas(); - FilteredMetadata = this.BaseMetadatas; - } - - await InvokeAsync(StateHasChanged); - } - - - } - - private void SetBaseMetadatas() - { - BaseMetadatas = State.Catalog.Metadatas - .Where(m => - m.Dataset.Zone.ToLower() == this.Zone.ToLower()) - .ToList(); - } - - private void SearchHandler() - { - if (string.IsNullOrWhiteSpace(SearchTerm)) - { - FilteredMetadata = this.BaseMetadatas; - } - else - { - FilteredMetadata = this.BaseMetadatas - .Where(m => - (m.Dataset.Name.ToLower().Contains( - SearchTerm.ToLower())) || - (m.Dataset.Description.ToLower().Contains( - SearchTerm.ToLower())) || - (m.Dataset.Tags.Any(t => t.ToLower().Contains( - SearchTerm.ToLower())))) - .ToList(); - } - } - - private ModalRef metadataDetailsModalRef; - private async Task OpenMetadataDetailsModalTemplate(Metadata metadata) - { - var templateOptions = new ViewModels.MetadataDetailsViewModel - { - Metadata = metadata - }; - - var modalConfig = new ModalOptions(); - modalConfig.Title = "Metadata Preview"; - modalConfig.Width = "90%"; - modalConfig.DestroyOnClose = true; - modalConfig.OnCancel = async (e) => - { - await metadataDetailsModalRef.CloseAsync(); - }; - modalConfig.OnOk = async (e) => - { - await metadataDetailsModalRef.CloseAsync(); - }; - - modalConfig.AfterClose = () => - { - InvokeAsync(StateHasChanged); - - return Task.CompletedTask; - }; - - metadataDetailsModalRef = await ModalService - .CreateModalAsync( - modalConfig, templateOptions); - } - - public void Dispose() - { - State.StateChanged -= async (source, property) - => await StateChanged(source, property); - } - } -} From fb8a805772c8d70737085d1aa5cd8e34f37f61c8 Mon Sep 17 00:00:00 2001 From: Bryan Carlson Date: Wed, 3 Nov 2021 09:28:55 -0700 Subject: [PATCH 5/8] Reverted project links to nest under zones (unnested projects will be in Projects tab in later release), updated url links, added icons to breadcrumbs --- Caf.Midden.Wasm/Pages/MetadataView.razor | 11 ++--- Caf.Midden.Wasm/Pages/ProjectCatalog.razor | 7 +--- Caf.Midden.Wasm/Pages/TagCatalog.razor | 7 +--- Caf.Midden.Wasm/Pages/ZoneCatalog.razor | 2 +- .../Pages/ZoneProjectCatalog.razor | 40 +++++++++++++++++++ .../FilteredCatalogMetadataViewer.razor | 4 +- .../Shared/Modals/MetadataDetailsModal.razor | 2 +- 7 files changed, 52 insertions(+), 21 deletions(-) create mode 100644 Caf.Midden.Wasm/Pages/ZoneProjectCatalog.razor diff --git a/Caf.Midden.Wasm/Pages/MetadataView.razor b/Caf.Midden.Wasm/Pages/MetadataView.razor index 7016299..6acbf40 100644 --- a/Caf.Midden.Wasm/Pages/MetadataView.razor +++ b/Caf.Midden.Wasm/Pages/MetadataView.razor @@ -1,5 +1,6 @@ @page "/catalog/{ZoneName}/{ProjectName}/{DatasetName}" @page "/datasets/{ZoneName}/{ProjectName}/{DatasetName}" +@page "/catalog/zones/{ZoneName}/projects/{ProjectName}/datasets/{DatasetName}" @inject Services.StateContainer State @inject NavigationManager NavManager @@ -16,17 +17,17 @@ - - @ZoneName + + @ZoneName - - @ProjectName + + @ProjectName - @DatasetName + @DatasetName diff --git a/Caf.Midden.Wasm/Pages/ProjectCatalog.razor b/Caf.Midden.Wasm/Pages/ProjectCatalog.razor index ad33224..c31c43a 100644 --- a/Caf.Midden.Wasm/Pages/ProjectCatalog.razor +++ b/Caf.Midden.Wasm/Pages/ProjectCatalog.razor @@ -13,12 +13,7 @@ - - Projects - - - - @ProjectName + @ProjectName diff --git a/Caf.Midden.Wasm/Pages/TagCatalog.razor b/Caf.Midden.Wasm/Pages/TagCatalog.razor index 782f597..2523a7a 100644 --- a/Caf.Midden.Wasm/Pages/TagCatalog.razor +++ b/Caf.Midden.Wasm/Pages/TagCatalog.razor @@ -13,12 +13,7 @@ - - Tags - - - - @TagName + @TagName diff --git a/Caf.Midden.Wasm/Pages/ZoneCatalog.razor b/Caf.Midden.Wasm/Pages/ZoneCatalog.razor index 8697d93..b881f9e 100644 --- a/Caf.Midden.Wasm/Pages/ZoneCatalog.razor +++ b/Caf.Midden.Wasm/Pages/ZoneCatalog.razor @@ -13,7 +13,7 @@ - @ZoneName + @ZoneName diff --git a/Caf.Midden.Wasm/Pages/ZoneProjectCatalog.razor b/Caf.Midden.Wasm/Pages/ZoneProjectCatalog.razor new file mode 100644 index 0000000..f593031 --- /dev/null +++ b/Caf.Midden.Wasm/Pages/ZoneProjectCatalog.razor @@ -0,0 +1,40 @@ +@page "/catalog/zones/{ZoneName}/projects/{ProjectName}" +@inject Services.StateContainer State + + + + + + + + + + Catalog + + + + + @ZoneName + + + + @ProjectName + + + +
+ + + +
+ + +@code { + [Parameter] + public string ProjectName { get; set; } + + [Parameter] + public string ZoneName { get; set; } +} \ No newline at end of file diff --git a/Caf.Midden.Wasm/Shared/FilteredCatalogMetadataViewer.razor b/Caf.Midden.Wasm/Shared/FilteredCatalogMetadataViewer.razor index 8e1b6f9..4987de8 100644 --- a/Caf.Midden.Wasm/Shared/FilteredCatalogMetadataViewer.razor +++ b/Caf.Midden.Wasm/Shared/FilteredCatalogMetadataViewer.razor @@ -23,7 +23,7 @@ - + @metadata.Dataset.Name @@ -36,7 +36,7 @@ @metadata.Dataset.Zone / - + @metadata.Dataset.Project diff --git a/Caf.Midden.Wasm/Shared/Modals/MetadataDetailsModal.razor b/Caf.Midden.Wasm/Shared/Modals/MetadataDetailsModal.razor index 7dc9e18..2e36736 100644 --- a/Caf.Midden.Wasm/Shared/Modals/MetadataDetailsModal.razor +++ b/Caf.Midden.Wasm/Shared/Modals/MetadataDetailsModal.razor @@ -40,7 +40,7 @@ { await base.CloseFeedbackAsync(); - NavManager.NavigateTo($"catalog/{_model.Metadata.Dataset.Zone}/{_model.Metadata.Dataset.Project}/{_model.Metadata.Dataset.Name}"); + NavManager.NavigateTo($"catalog/zones/{_model.Metadata.Dataset.Zone}/projects/{_model.Metadata.Dataset.Project}/datasets/{_model.Metadata.Dataset.Name}"); } private void OnFinish(EditContext editContext) From 02bda92f1a455ab90a12c5bec6939f7a5a119566 Mon Sep 17 00:00:00 2001 From: Bryan Carlson Date: Wed, 3 Nov 2021 09:34:09 -0700 Subject: [PATCH 6/8] Added tag links to metadata view --- Caf.Midden.Wasm/Shared/MetadataDetails.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Caf.Midden.Wasm/Shared/MetadataDetails.razor b/Caf.Midden.Wasm/Shared/MetadataDetails.razor index 579a1e0..1a6cffc 100644 --- a/Caf.Midden.Wasm/Shared/MetadataDetails.razor +++ b/Caf.Midden.Wasm/Shared/MetadataDetails.razor @@ -221,7 +221,7 @@ @foreach (var tag in Metadata.Dataset.Tags) { - @tag + @tag } From a920e410a784b285bd747fcf83a8714db0def776 Mon Sep 17 00:00:00 2001 From: Bryan Carlson Date: Wed, 3 Nov 2021 09:56:45 -0700 Subject: [PATCH 7/8] Stubbed pages for all url paths --- Caf.Midden.Wasm/Pages/Projects.razor | 29 +++++++++++++++ Caf.Midden.Wasm/Pages/Tags.razor | 29 +++++++++++++++ .../Pages/ZoneProjectCatalog.razor | 2 ++ Caf.Midden.Wasm/Pages/ZoneProjects.razor | 36 +++++++++++++++++++ Caf.Midden.Wasm/Pages/Zones.razor | 29 +++++++++++++++ 5 files changed, 125 insertions(+) create mode 100644 Caf.Midden.Wasm/Pages/Projects.razor create mode 100644 Caf.Midden.Wasm/Pages/Tags.razor create mode 100644 Caf.Midden.Wasm/Pages/ZoneProjects.razor create mode 100644 Caf.Midden.Wasm/Pages/Zones.razor diff --git a/Caf.Midden.Wasm/Pages/Projects.razor b/Caf.Midden.Wasm/Pages/Projects.razor new file mode 100644 index 0000000..0e42f0b --- /dev/null +++ b/Caf.Midden.Wasm/Pages/Projects.razor @@ -0,0 +1,29 @@ +@page "/catalog/projects" +@inject Services.StateContainer State + + + + + + + + + + Catalog + + + + Projects + + + +
+ +

Coming soon...

+
+ + +@code { + +} \ No newline at end of file diff --git a/Caf.Midden.Wasm/Pages/Tags.razor b/Caf.Midden.Wasm/Pages/Tags.razor new file mode 100644 index 0000000..2a7c6f3 --- /dev/null +++ b/Caf.Midden.Wasm/Pages/Tags.razor @@ -0,0 +1,29 @@ +@page "/catalog/tags" +@inject Services.StateContainer State + + + + + + + + + + Catalog + + + + Tags + + + +
+ +

Coming soon...

+
+ + +@code { + +} \ No newline at end of file diff --git a/Caf.Midden.Wasm/Pages/ZoneProjectCatalog.razor b/Caf.Midden.Wasm/Pages/ZoneProjectCatalog.razor index f593031..0c74ccc 100644 --- a/Caf.Midden.Wasm/Pages/ZoneProjectCatalog.razor +++ b/Caf.Midden.Wasm/Pages/ZoneProjectCatalog.razor @@ -1,4 +1,6 @@ @page "/catalog/zones/{ZoneName}/projects/{ProjectName}" +@page "/catalog/zones/{ZoneName}/projects/{ProjectName}/datasets" + @inject Services.StateContainer State diff --git a/Caf.Midden.Wasm/Pages/ZoneProjects.razor b/Caf.Midden.Wasm/Pages/ZoneProjects.razor new file mode 100644 index 0000000..bb79c08 --- /dev/null +++ b/Caf.Midden.Wasm/Pages/ZoneProjects.razor @@ -0,0 +1,36 @@ +@page "/catalog/zones/{ZoneName}/projects" +@inject Services.StateContainer State + + + + + + + + + + Catalog + + + + + @ZoneName + + + + Projects + + + +
+ +

Coming soon...

+
+ + +@code { + + [Parameter] + public string ZoneName { get; set; } +} \ No newline at end of file diff --git a/Caf.Midden.Wasm/Pages/Zones.razor b/Caf.Midden.Wasm/Pages/Zones.razor new file mode 100644 index 0000000..3527fe7 --- /dev/null +++ b/Caf.Midden.Wasm/Pages/Zones.razor @@ -0,0 +1,29 @@ +@page "/catalog/zones" +@inject Services.StateContainer State + + + + + + + + + + Catalog + + + + Zones + + + +
+ +

Coming soon...

+
+ + +@code { + +} \ No newline at end of file From 1102eff774a42f5a81dec3c0758d353c260328ae Mon Sep 17 00:00:00 2001 From: Bryan Carlson Date: Wed, 3 Nov 2021 11:08:57 -0700 Subject: [PATCH 8/8] Re-styled page titles --- Caf.Midden.Wasm/Pages/ProjectCatalog.razor | 5 +++-- Caf.Midden.Wasm/Pages/TagCatalog.razor | 3 ++- Caf.Midden.Wasm/Pages/ZoneCatalog.razor | 3 ++- Caf.Midden.Wasm/Pages/ZoneProjectCatalog.razor | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Caf.Midden.Wasm/Pages/ProjectCatalog.razor b/Caf.Midden.Wasm/Pages/ProjectCatalog.razor index c31c43a..2d360af 100644 --- a/Caf.Midden.Wasm/Pages/ProjectCatalog.razor +++ b/Caf.Midden.Wasm/Pages/ProjectCatalog.razor @@ -19,8 +19,9 @@
- +
diff --git a/Caf.Midden.Wasm/Pages/TagCatalog.razor b/Caf.Midden.Wasm/Pages/TagCatalog.razor index 2523a7a..28a2fe1 100644 --- a/Caf.Midden.Wasm/Pages/TagCatalog.razor +++ b/Caf.Midden.Wasm/Pages/TagCatalog.razor @@ -20,7 +20,8 @@
+ Title="Dataset Catalog" + Subtitle="Filtered by tag" />
diff --git a/Caf.Midden.Wasm/Pages/ZoneCatalog.razor b/Caf.Midden.Wasm/Pages/ZoneCatalog.razor index b881f9e..73a96ef 100644 --- a/Caf.Midden.Wasm/Pages/ZoneCatalog.razor +++ b/Caf.Midden.Wasm/Pages/ZoneCatalog.razor @@ -20,7 +20,8 @@
+ Title="Dataset Catalog" + Subtitle="Filtered by zone" />
diff --git a/Caf.Midden.Wasm/Pages/ZoneProjectCatalog.razor b/Caf.Midden.Wasm/Pages/ZoneProjectCatalog.razor index 0c74ccc..767f2c2 100644 --- a/Caf.Midden.Wasm/Pages/ZoneProjectCatalog.razor +++ b/Caf.Midden.Wasm/Pages/ZoneProjectCatalog.razor @@ -27,7 +27,8 @@
+ Title="Dataset Catalog" + Subtitle="Filtered by zone and project"/>