Skip to content
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

Jump to bottom

Categorized tenants #10586

Merged
merged 16 commits into from
Feb 2, 2022
Merged

Categorized tenants #10586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
930310e
Categorized tenants
hishamco Oct 29, 2021
d476ded
Ability to add or edit tenant category
hishamco Oct 29, 2021
eae1223
Add categories as filter
hishamco Oct 29, 2021
260951d
Use indexer instead
hishamco Oct 29, 2021
4a52846
Revert feature profiles changes
hishamco Oct 29, 2021
b75835b
Fix route value
hishamco Oct 31, 2021
101d59e
Address feedback
hishamco Oct 31, 2021
31b92c6
Set All as default category filter
hishamco Oct 31, 2021
39c8a20
Localization
hishamco Oct 31, 2021
62ba0e4
Merge branch 'main' into hishamco/tenant-classification
hishamco Dec 10, 2021
573e7e9
Show category if present
hishamco Dec 10, 2021
b2f8112
TenantsStatus -> TenantsState
hishamco Dec 13, 2021
e2c6bd7
Address feedback
hishamco Dec 31, 2021
e187789
Address feedback
hishamco Jan 2, 2022
34187fc
Fix the build
hishamco Jan 2, 2022
e9b5ecb
Remove DefaultCategory
hishamco Jan 5, 2022
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
47 changes: 34 additions & 13 deletions src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/AdminController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
using OrchardCore.Recipes.Services;
using OrchardCore.Routing;
using OrchardCore.Settings;
using OrchardCore.Tenants.Services;
using OrchardCore.Tenants.ViewModels;

namespace OrchardCore.Tenants.Controllers
Expand Down Expand Up @@ -98,6 +97,7 @@ public async Task<IActionResult> Index(TenantIndexOptions options, PagerParamete
{
var entry = new ShellSettingsEntry
{
Category = x["Category"],
Description = x["Description"],
Name = x.Name,
ShellSettings = x,
Expand All @@ -120,15 +120,20 @@ public async Task<IActionResult> Index(TenantIndexOptions options, PagerParamete
(t.ShellSettings.RequestUrlPrefix != null && t.ShellSettings.RequestUrlPrefix.IndexOf(options.Search, StringComparison.OrdinalIgnoreCase) > -1)))).ToList();
}

switch (options.Filter)
if (!String.IsNullOrWhiteSpace(options.Category))
{
case TenantsFilter.Disabled:
entries = entries.Where(t => t.Category.Equals(options.Category, StringComparison.OrdinalIgnoreCase)).ToList();
}

switch (options.Status)
{
case TenantsState.Disabled:
entries = entries.Where(t => t.ShellSettings.State == TenantState.Disabled).ToList();
break;
case TenantsFilter.Running:
case TenantsState.Running:
entries = entries.Where(t => t.ShellSettings.State == TenantState.Running).ToList();
break;
case TenantsFilter.Uninitialized:
case TenantsState.Uninitialized:
entries = entries.Where(t => t.ShellSettings.State == TenantState.Uninitialized).ToList();
break;
}
Expand All @@ -153,7 +158,8 @@ public async Task<IActionResult> Index(TenantIndexOptions options, PagerParamete

// Maintain previous route data when generating page links
var routeData = new RouteData();
routeData.Values.Add("Options.Filter", options.Filter);
routeData.Values.Add("Options.Category", options.Category);
routeData.Values.Add("Options.Status", options.Status);
routeData.Values.Add("Options.Search", options.Search);
routeData.Values.Add("Options.OrderBy", options.OrderBy);

Expand All @@ -167,11 +173,22 @@ public async Task<IActionResult> Index(TenantIndexOptions options, PagerParamete
};

// We populate the SelectLists
model.Options.TenantsCategories = allSettings
.GroupBy(t => t["Category"])
.Where(t => !String.IsNullOrEmpty(t.Key))
.Select(t => new SelectListItem(t.Key, t.Key, String.Equals(options.Category, t.Key, StringComparison.OrdinalIgnoreCase)))
.ToList();

model.Options.TenantsCategories.Insert(0, new SelectListItem(
S["All"],
String.Empty,
selected: String.IsNullOrEmpty(options.Category)));

model.Options.TenantsStates = new List<SelectListItem>() {
new SelectListItem() { Text = S["All states"], Value = nameof(TenantsFilter.All) },
new SelectListItem() { Text = S["Running"], Value = nameof(TenantsFilter.Running) },
new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsFilter.Disabled) },
new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsFilter.Uninitialized) }
new SelectListItem() { Text = S["All states"], Value = nameof(TenantsState.All) },
new SelectListItem() { Text = S["Running"], Value = nameof(TenantsState.Running) },
new SelectListItem() { Text = S["Disabled"], Value = nameof(TenantsState.Disabled) },
new SelectListItem() { Text = S["Uninitialized"], Value = nameof(TenantsState.Uninitialized) }
};

model.Options.TenantsSorts = new List<SelectListItem>() {
Expand All @@ -192,7 +209,8 @@ public async Task<IActionResult> Index(TenantIndexOptions options, PagerParamete
public ActionResult IndexFilterPOST(AdminIndexViewModel model)
{
return RedirectToAction("Index", new RouteValueDictionary {
{ "Options.Filter", model.Options.Filter },
{ "Options.Category", model.Options.Category },
{ "Options.Status", model.Options.Status },
{ "Options.OrderBy", model.Options.OrderBy },
{ "Options.Search", model.Options.Search },
{ "Options.TenantsStates", model.Options.TenantsStates }
Expand Down Expand Up @@ -335,6 +353,7 @@ public async Task<IActionResult> Create(EditTenantViewModel model)
shellSettings.State = TenantState.Uninitialized;

SetConfigurationShellValues(model);
shellSettings["Category"] = model.Category;
shellSettings["Description"] = model.Description;
shellSettings["ConnectionString"] = model.ConnectionString;
shellSettings["TablePrefix"] = model.TablePrefix;
Expand Down Expand Up @@ -384,6 +403,7 @@ public async Task<IActionResult> Edit(string id)

var model = new EditTenantViewModel
{
Category = shellSettings["Category"],
Description = shellSettings["Description"],
Name = shellSettings.Name,
RequestUrlHost = shellSettings.RequestUrlHost,
Expand Down Expand Up @@ -441,6 +461,7 @@ public async Task<IActionResult> Edit(EditTenantViewModel model)
if (ModelState.IsValid)
{
shellSettings["Description"] = model.Description;
shellSettings["Category"] = model.Category;
shellSettings.RequestUrlPrefix = model.RequestUrlPrefix;
shellSettings.RequestUrlHost = model.RequestUrlHost;
shellSettings["FeatureProfile"] = model.FeatureProfile;
Expand Down Expand Up @@ -657,12 +678,12 @@ private void SetConfigurationShellValues(EditTenantViewModel model)

model.DatabaseConfigurationPreset = !string.IsNullOrEmpty(configurationShellConnectionString) || !string.IsNullOrEmpty(configurationDatabaseProvider);

if(!string.IsNullOrEmpty(configurationShellConnectionString))
if (!string.IsNullOrEmpty(configurationShellConnectionString))
{
model.ConnectionString = configurationShellConnectionString;
}

if(!string.IsNullOrEmpty(configurationDatabaseProvider))
if (!string.IsNullOrEmpty(configurationDatabaseProvider))
{
model.DatabaseProvider = configurationDatabaseProvider;
}
Expand Down
14 changes: 12 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/AdminIndexViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ namespace OrchardCore.Tenants.ViewModels
public class AdminIndexViewModel
{
public List<ShellSettingsEntry> ShellSettingsEntries { get; set; } = new List<ShellSettingsEntry>();

public TenantIndexOptions Options { get; set; } = new TenantIndexOptions();

[BindNever]
Expand All @@ -28,6 +29,8 @@ public enum BulkAction

public class ShellSettingsEntry
{
public string Category { get; set; }

public string Description { get; set; }

public bool Selected { get; set; }
Expand All @@ -45,10 +48,17 @@ public class ShellSettingsEntry
public class TenantIndexOptions
{
public string Search { get; set; }
public TenantsFilter Filter { get; set; }

public string Category { get; set; }

public TenantsState Status { get; set; }

public TenantsBulkAction BulkAction { get; set; }

public TenantsOrder OrderBy { get; set; }

public List<SelectListItem> TenantsCategories { get; set; }

[BindNever]
public List<SelectListItem> TenantsStates { get; set; }

Expand All @@ -59,7 +69,7 @@ public class TenantIndexOptions
public List<SelectListItem> TenantsBulkAction { get; set; }
}

public enum TenantsFilter
public enum TenantsState
{
All,
Running,
Expand Down
2 changes: 2 additions & 0 deletions src/OrchardCore.Modules/OrchardCore.Tenants/ViewModels/EditTenantViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ namespace OrchardCore.Tenants.ViewModels
{
public class EditTenantViewModel
{
public string Category { get; set; }

public string Description { get; set; }

public string Name { get; set; }
Expand Down
5 changes: 5 additions & 0 deletions src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Create.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
<span asp-validation-for="Name" class="text-danger"></span>
<span class="hint">@T["The name of the tenant."]</span>
</div>
<div class="form-group col-md-6">
<label asp-for="Category">@T["Category"]</label>
<input asp-for="Category" class="form-control" />
<span class="hint">@T["The category of the tenant."]</span>
</div>
</div>
<div class="row">
<div class="form-group col-md-6" asp-validation-class-for="Description">
Expand Down
6 changes: 6 additions & 0 deletions src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
<span class="hint">@T["The name of the tenant."]</span>
</div>

<div class="form-group">
<label asp-for="Category">@T["Category"]</label>
<input asp-for="Category" class="form-control" />
<span class="hint">@T["The category of the tenant."]</span>
</div>

<div class="form-group" asp-validation-class-for="Description">
<label asp-for="Description">@T["Description"]</label>
<input asp-for="Description" class="form-control" autofocus />
Expand Down
7 changes: 6 additions & 1 deletion src/OrchardCore.Modules/OrchardCore.Tenants/Views/Admin/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@
</div>
<div class="form-group col mb-n1 filter">
<div class="btn-group float-right mt-1">
<select asp-for="Options.Filter" asp-items="@Model.Options.TenantsStates" class="selectpicker show-tick mr-2" data-header="@T["Filter by state"]" data-width="fit" data-selected-text-format="static" data-dropdown-align-right="true" title="@T["State"]" data-style="btn-sm"></select>
<select asp-for="Options.Category" asp-items="@Model.Options.TenantsCategories" class="selectpicker show-tick mr-2" data-header="@T["Filter by category"]" data-width="fit" data-selected-text-format="static" data-dropdown-align-right="true" title="@T["Category"]" data-style="btn-sm"></select>
<select asp-for="Options.Status" asp-items="@Model.Options.TenantsStates" class="selectpicker show-tick mr-2" data-header="@T["Filter by state"]" data-width="fit" data-selected-text-format="static" data-dropdown-align-right="true" title="@T["State"]" data-style="btn-sm"></select>
<select asp-for="Options.OrderBy" asp-items="@Model.Options.TenantsSorts" class="selectpicker show-tick" data-header="@T["Sort by"]" data-width="fit" data-selected-text-format="static" data-dropdown-align-right="true" title="@T["Sort"]" data-style="btn-sm"></select>
</div>
</div>
Expand All @@ -116,6 +117,10 @@
</div>
<div class="d-inline">
<a class="text-break" href="@GetEncodedUrl(entry, originalPathBase)">@entry.Name</a>
@if(!string.IsNullOrEmpty(entry.Category))
{
<span class="badge ta-badge font-weight-normal"><i class="fa fa-tag text-info" aria-hidden="true"></i> @entry.Category</span>
}
@if (!string.IsNullOrEmpty(entry.ShellSettings["DatabaseProvider"]))
{
<span class="badge ta-badge font-weight-normal"><i class="fa fa-database text-info" aria-hidden="true"></i> @entry.ShellSettings["DatabaseProvider"]</span>
Expand Down