Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Minor changes - add to installation process new field - AvailableProviders (Database providers)

KrzysztofPajak5eaee9548367
diff --git a/src/Web/Grand.Web/App_Data/Resources/Installation/installation.en.xml b/src/Web/Grand.Web/App_Data/Resources/Installation/installation.en.xml
index b0f9f5713..4ca36ba41 100644
--- a/src/Web/Grand.Web/App_Data/Resources/Installation/installation.en.xml
+++ b/src/Web/Grand.Web/App_Data/Resources/Installation/installation.en.xml
@@ -71,8 +71,8 @@
<LocaleResource Name="DatabaseNotExists">
<Value>Database does not exist or you don't have permissions to connect to it</Value>
</LocaleResource>
- <LocaleResource Name="DataProviderRequired">
- <Value>Select data provider</Value>
+ <LocaleResource Name="DataProvider">
+ <Value>Data provider</Value>
</LocaleResource>
<LocaleResource Name="Documentation1">
<Value>If you need information on how to use grandnode, visit</Value>
diff --git a/src/Web/Grand.Web/App_Data/Resources/Installation/installation.pl.xml b/src/Web/Grand.Web/App_Data/Resources/Installation/installation.pl.xml
index 294d6c29b..6b5ee51bd 100644
--- a/src/Web/Grand.Web/App_Data/Resources/Installation/installation.pl.xml
+++ b/src/Web/Grand.Web/App_Data/Resources/Installation/installation.pl.xml
@@ -74,8 +74,8 @@
<LocaleResource Name="DatabaseNotExists">
<Value>Baza danych nie istnieje lub nie masz uprawnień aby się do niej podłączyć</Value>
</LocaleResource>
- <LocaleResource Name="DataProviderRequired">
- <Value>Wybierz dostawcę danych </Value>
+ <LocaleResource Name="DataProvider">
+ <Value>Dostawca danych</Value>
</LocaleResource>
<LocaleResource Name="Documentation1">
<Value>Jeżeli potrzebujesz więcej informacji na temat korzystania z grandnode, zobacz</Value>
diff --git a/src/Web/Grand.Web/Controllers/InstallController.cs b/src/Web/Grand.Web/Controllers/InstallController.cs
index fc905cd9f..beaef55a2 100644
--- a/src/Web/Grand.Web/Controllers/InstallController.cs
+++ b/src/Web/Grand.Web/Controllers/InstallController.cs
@@ -65,8 +65,13 @@ namespace Grand.Web.Controllers
AdminEmail = "[email protected]",
InstallSampleData = false,
DatabaseConnectionString = "",
- DataProvider = "mongodb",
};
+
+ model.AvailableProviders = Enum.GetValues(typeof(DbProvider)).Cast<DbProvider>().Select(v => new SelectListItem {
+ Text = v.ToString(),
+ Value = ((int)v).ToString()
+ }).ToList();
+
foreach (var lang in locService.GetAvailableLanguages())
{
model.AvailableLanguages.Add(new SelectListItem {
@@ -100,7 +105,7 @@ namespace Grand.Web.Controllers
string connectionString = "";
- if (model.MongoDBConnectionInfo)
+ if (model.ConnectionInfo)
{
if (String.IsNullOrEmpty(model.DatabaseConnectionString))
{
@@ -153,7 +158,7 @@ namespace Grand.Web.Controllers
//save settings
var settings = new DataSettings {
ConnectionString = connectionString,
- DbProvider = DbProvider.MongoDB
+ DbProvider = model.DataProvider
};
await DataSettingsManager.SaveSettings(settings);
@@ -206,6 +211,11 @@ namespace Grand.Web.Controllers
ModelState.AddModelError("", string.Format(locService.GetResource("SetupFailed"), exception.Message + " " + exception.InnerException?.Message));
}
}
+ //prepare db providers
+ model.AvailableProviders = Enum.GetValues(typeof(DbProvider)).Cast<DbProvider>().Select(v => new SelectListItem {
+ Text = v.ToString(),
+ Value = ((int)v).ToString()
+ }).ToList();
//prepare language list
foreach (var lang in locService.GetAvailableLanguages())
diff --git a/src/Web/Grand.Web/Models/Install/InstallModel.cs b/src/Web/Grand.Web/Models/Install/InstallModel.cs
index 375be8424..e5231a754 100644
--- a/src/Web/Grand.Web/Models/Install/InstallModel.cs
+++ b/src/Web/Grand.Web/Models/Install/InstallModel.cs
@@ -1,4 +1,5 @@
-using Grand.Infrastructure.Models;
+using Grand.Domain.Data;
+using Grand.Infrastructure.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@@ -11,6 +12,7 @@ namespace Grand.Web.Models.Install
{
AvailableLanguages = new List<SelectListItem>();
AvailableCollation = new List<SelectListItem>();
+ AvailableProviders = new List<SelectListItem>();
}
[DataType(DataType.EmailAddress)]
public string AdminEmail { get; set; }
@@ -19,8 +21,8 @@ namespace Grand.Web.Models.Install
[DataType(DataType.Password)]
public string ConfirmPassword { get; set; }
public string DatabaseConnectionString { get; set; }
- public string DataProvider { get; set; }
- public bool MongoDBConnectionInfo { get; set; }
+ public DbProvider DataProvider { get; set; }
+ public bool ConnectionInfo { get; set; }
public string MongoDBServerName { get; set; }
public string MongoDBDatabaseName { get; set; }
public string MongoDBUsername { get; set; }
@@ -32,6 +34,7 @@ namespace Grand.Web.Models.Install
public string Collation { get; set; }
public List<SelectListItem> AvailableLanguages { get; set; }
public List<SelectListItem> AvailableCollation { get; set; }
+ public List<SelectListItem> AvailableProviders { get; set; }
public string CompanyName { get; set; }
public string CompanyAddress { get; set; }
public string CompanyPhoneNumber { get; set; }
diff --git a/src/Web/Grand.Web/Views/Install/Index.cshtml b/src/Web/Grand.Web/Views/Install/Index.cshtml
index f16a1fd43..8935edd64 100644
--- a/src/Web/Grand.Web/Views/Install/Index.cshtml
+++ b/src/Web/Grand.Web/Views/Install/Index.cshtml
@@ -50,7 +50,7 @@
@LocalizedService.GetResource("CompanyInformation")
</h3>
<div class="card-body">
-
+
<div class="row">
<div class="col-md-6 col-12">
<label for="AdminPassword">
@@ -106,6 +106,14 @@
</div>
</div>
</div>
+ <div class="card">
+ <h3 class="card-header">
+ @LocalizedService.GetResource("DataProvider")
+ </h3>
+ <div class="card-body">
+ @Html.DropDownList("DataProvider", Model.AvailableProviders, new { @class = "custom-select", onchange = "DataProviderChange(this.value);" })
+ </div>
+ </div>
@if (!Model.DisableSampleDataOption)
{
<div nowrap="nowrap" align="left">
@@ -116,8 +124,8 @@
</label>
</div>
}
- <section id="MongoDBConnectionInformation">
- <div id="MongoDBSimpleData">
+ <section id="ConnectionInformation">
+ <div id="DBSampleData">
<div class="card">
<h3 class="card-header">
@LocalizedService.GetResource("DatabaseInformation")
@@ -161,19 +169,18 @@
<label class="custom-control custom-checkbox my-3">
- <input asp-for="MongoDBConnectionInfo" onchange="toggleMongoDBConnectionInfo()" class="custom-control-input" />
+ <input asp-for="ConnectionInfo" onchange="toggleMongoDBConnectionInfo()" class="custom-control-input" />
<span class="custom-control-label"></span>
<span class="custom-control-description">@LocalizedService.GetResource("ConnectionString"):</span>
</label>
- <div id="MongoDBDatabaseConnectionString" class="connection-string-container" style="display:none;">
+ <div id="DatabaseConnectionString" class="connection-string-container" style="display:none;">
<span style="white-space: nowrap;">
<input asp-for="DatabaseConnectionString" class="textbox form-control" />
</span>
<span class="hint">
@LocalizedService.GetResource("Example"):<br />
- @Html.Raw("mongodb://[username:password@]host1[:port1]/databaseName")
- <br />
- Find more info <a href="https://docs.mongodb.org/manual/reference/connection-string/" target="_blank">here</a>
+ For MongoDB: @Html.Raw("mongodb://[username:password@]host1[:port1]/databaseName")
+ (Find more info <a href="https://docs.mongodb.org/manual/reference/connection-string/" target="_blank">here</a>)
</span>
</div>
</section>
diff --git a/src/Web/Grand.Web/wwwroot/assets/install/install.js b/src/Web/Grand.Web/wwwroot/assets/install/install.js
index 42ec51919..0c2942070 100644
--- a/src/Web/Grand.Web/wwwroot/assets/install/install.js
+++ b/src/Web/Grand.Web/wwwroot/assets/install/install.js
@@ -1,17 +1,36 @@
function toggleMongoDBConnectionInfo() {
- if (document.getElementById('MongoDBConnectionInfo').checked == true) {
- document.getElementById('MongoDBDatabaseConnectionString').style.display = "flex";
- document.getElementById('MongoDBSimpleData').style.display = "none";
+ if (document.getElementById('ConnectionInfo').checked == true) {
+ document.getElementById('DatabaseConnectionString').style.display = "flex";
+ document.getElementById('DBSampleData').style.display = "none";
var child = document.getElementById('collation');
- document.getElementById('MongoDBDatabaseConnectionString').appendChild(child);
-
+ document.getElementById('DatabaseConnectionString').appendChild(child);
} else {
- document.getElementById('MongoDBDatabaseConnectionString').style.display = "none";
- document.getElementById('MongoDBSimpleData').style.display = "block";
+ document.getElementById('DatabaseConnectionString').style.display = "none";
+ document.getElementById('DBSampleData').style.display = "block";
var child = document.getElementById('collation');
document.querySelector('.mongoDBDatabaseName').appendChild(child);
+
+ let dataProvider = document.getElementById('DataProvider');
+ if (dataProvider.value != "0") {
+ dataProvider.value = 0;
+ }
+ }
+}
+function DataProviderChange(provider) {
+ if (provider != 0) {
+ var elm = document.getElementById('ConnectionInfo');
+ if (!elm.checked) {
+ elm.click();
+ }
+ }
+ else {
+ var elm = document.getElementById('ConnectionInfo');
+ if (elm.checked) {
+ elm.click();
+ }
}
}
+
document.addEventListener('DOMContentLoaded', function () {
if (document.getElementById('installation')) {
document.getElementById('installation').addEventListener("click", function () {
@@ -22,7 +41,7 @@ document.addEventListener('DOMContentLoaded', function () {
}, 10);
});
}
- if (document.getElementById('MongoDBConnectionInfo')) {
+ if (document.getElementById('ConnectionInfo')) {
toggleMongoDBConnectionInfo();
}
});
\ No newline at end of file