link permission tree page on relationships page

josxha · Oct 21, 2023 · 7d84937 · 7d84937
1 parent dd93942
commit 7d84937
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/OryAdmin/Components/Pages/Permissions/Index.razor b/OryAdmin/Components/Pages/Permissions/Index.razor
@@ -24,18 +24,14 @@ else
             <thead>
             <th>Name</th>
             <th>Relationships</th>
-            <th>Permissions</th>
             </thead>
             <tbody>
             @foreach (var item in _namespaces.Namespaces)
             {
                 <tr>
                     <td>@item.Name</td>
                     <td>
-                        <a href="permissions/@item.Name/relationships">Relationships</a>
-                    </td>
-                    <td>
-                        <a href="permissions/@item.Name/tree">Permissions</a>
+                        <a href="permissions/@item.Name">Relationships</a>
                     </td>
                 </tr>
             }

diff --git a/OryAdmin/Components/Pages/Permissions/Relationships/Create.razor b/OryAdmin/Components/Pages/Permissions/Relationships/Create.razor
@@ -1,4 +1,4 @@
-@page "/permissions/{NamespaceName}/relationships/create"
+@page "/permissions/{NamespaceName}/create"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
 @inject NavigationManager nav

diff --git a/OryAdmin/Components/Pages/Permissions/Relationships/Index.razor b/OryAdmin/Components/Pages/Permissions/Relationships/Index.razor
@@ -1,4 +1,4 @@
-@page "/permissions/{NamespaceName}/relationships"
+@page "/permissions/{NamespaceName}"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
 
@@ -7,7 +7,7 @@
 <h1 class="title">Relationships for @NamespaceName</h1>
 <div class="buttons">
     <a class="button is-dark" href="permissions">Back</a>
-    <a class="button is-success" href="permissions/@NamespaceName/relationships/create">Create Relationship</a>
+    <a class="button is-success" href="permissions/@NamespaceName/create">Create Relationship</a>
 </div>
 @if (_isLoading)
 {
@@ -37,6 +37,7 @@ else
                 <th>Relation</th>
                 <th></th>
                 <th>Object</th>
+                <th></th>
                 </thead>
                 <tbody>
                 @foreach (var relationship in _relationships.RelationTuples)
@@ -51,6 +52,11 @@ else
                             <p class="is-bold">of</p>
                         </td>
                         <td>@relationship.Object</td>
+                        <td>
+                            <a href="permissions/@NamespaceName/[email protected]&[email protected]">
+                                Permission Tree
+                            </a>
+                        </td>
                     </tr>
                 }
                 </tbody>

diff --git a/...n/Components/Pages/Permissions/Tree.razor → ...ages/Permissions/Relationships/Tree.razor b/...n/Components/Pages/Permissions/Tree.razor → ...ages/Permissions/Relationships/Tree.razor
@@ -1,4 +1,4 @@
-@page "/permissions/{namespaceName}/tree"
+@page "/permissions/{NamespaceName}/tree"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
 

diff --git a/...omponents/Pages/Permissions/Tree.razor.cs → ...s/Permissions/Relationships/Tree.razor.cs b/...omponents/Pages/Permissions/Tree.razor.cs → ...s/Permissions/Relationships/Tree.razor.cs
@@ -4,16 +4,15 @@
 
 // ReSharper disable UnusedAutoPropertyAccessor.Local
 
-namespace OryAdmin.Components.Pages.Permissions;
+namespace OryAdmin.Components.Pages.Permissions.Relationships;
 
 public partial class Tree
 {
     private string? _errorMessage;
     private bool _isLoading = true;
     private KetoExpandedPermissionTree? _permissionTree;
 
-    [Parameter]
-    public required string NamespaceName { get; set; }
+    [Parameter] public required string NamespaceName { get; set; }
 
     [SupplyParameterFromQuery(Name = "relation")]
     private string? Relation { get; set; }