{!isEditing &&
diff --git a/Binner/Binner.Web/ClientApp/src/pages/Search.js b/Binner/Binner.Web/ClientApp/src/pages/Search.js
index fc57886b..3a6ac8bc 100644
--- a/Binner/Binner.Web/ClientApp/src/pages/Search.js
+++ b/Binner/Binner.Web/ClientApp/src/pages/Search.js
@@ -55,7 +55,7 @@ export function Search(props) {
}
setKeyword(cleanPartNumber);
- const response = await fetchApi(`api/part/barcode/info?barcode=${cleanPartNumber}`, {
+ const response = await fetchApi(`api/part/barcode/info?barcode=${encodeURIComponent(cleanPartNumber.trim())}`, {
method: "GET",
headers: {
"Content-Type": "application/json"
@@ -128,7 +128,7 @@ export function Search(props) {
setShowPartNotFound(false);
try {
- await fetchApi(`api/part/search?keywords=${keyword || ""}`, {
+ await fetchApi(`api/part/search?keywords=${encodeURIComponent((keyword || "").trim())}`, {
signal: Search.abortController.signal,
}).then((response) => {
const { data } = response;
diff --git a/Binner/Binner.Web/ClientApp/src/pages/Settings.js b/Binner/Binner.Web/ClientApp/src/pages/Settings.js
index 56a00280..bab83e30 100644
--- a/Binner/Binner.Web/ClientApp/src/pages/Settings.js
+++ b/Binner/Binner.Web/ClientApp/src/pages/Settings.js
@@ -10,7 +10,9 @@ import { DigiKeySites } from "../common/digiKeySites";
import { FormHeader } from "../components/FormHeader";
import { fetchApi } from "../common/fetchApi";
import { getLocalData, setLocalData, removeLocalData } from "../common/storage";
+import { setSystemSettings } from "../common/applicationSettings";
import { toast } from "react-toastify";
+import { getCurrencySymbol } from "../common/Utils";
import "./Settings.css";
export const Settings = (props) => {
@@ -66,9 +68,209 @@ export const Settings = (props) => {
text: "Enabled",
},
]);
+ const [languages] = useState([{
+ key: 1,
+ value: "en",
+ text: "English",
+ },{
+ key: 2,
+ value: "br",
+ text: "Breton",
+ },{
+ key: 3,
+ value: "cs",
+ text: "Czech",
+ },{
+ key: 4,
+ value: "da",
+ text: "Danish",
+ },{
+ key: 5,
+ value: "de",
+ text: "German",
+ },{
+ key: 6,
+ value: "es",
+ text: "Spanish",
+ },{
+ key: 7,
+ value: "fi",
+ text: "Finnish",
+ },{
+ key: 8,
+ value: "fr",
+ text: "French",
+ },{
+ key: 9,
+ value: "he",
+ text: "Hebrew",
+ },{
+ key: 10,
+ value: "hu",
+ text: "Hungarian",
+ },{
+ key: 11,
+ value: "it",
+ text: "Italian",
+ },{
+ key: 12,
+ value: "ja",
+ text: "Japanese",
+ },{
+ key: 13,
+ value: "ko",
+ text: "Korean",
+ },{
+ key: 14,
+ value: "nl",
+ text: "Dutch",
+ },{
+ key: 15,
+ value: "no",
+ text: "Norwegian",
+ },{
+ key: 16,
+ value: "pl",
+ text: "Polish",
+ },{
+ key: 17,
+ value: "pt",
+ text: "Portuguese",
+ },{
+ key: 18,
+ value: "ro",
+ text: "Romanian",
+ },{
+ key: 19,
+ value: "sv",
+ text: "Swedish",
+ },{
+ key: 20,
+ value: "th",
+ text: "Thai",
+ },{
+ key: 21,
+ value: "zhs",
+ text: "Chinese (Simplified)",
+ },{
+ key: 22,
+ value: "zht",
+ text: "Chinese (Traditional)",
+ },]);
+ const [currencies] = useState([{
+ key: 1,
+ value: "USD",
+ text: `${getCurrencySymbol("USD")} - US Dollar`,
+ },{
+ key: 2,
+ value: "CAD",
+ text: `${getCurrencySymbol("CAD")} - Canadian Dollar`,
+ },{
+ key: 3,
+ value: "JPY",
+ text: `${getCurrencySymbol("JPY")} - Japanese Yen`,
+ },{
+ key: 4,
+ value: "GBP",
+ text: `${getCurrencySymbol("GBP")} - Pound sterling`,
+ },{
+ key: 5,
+ value: "EUR",
+ text: `${getCurrencySymbol("EUR")} - Euro`,
+ },{
+ key: 6,
+ value: "HKD",
+ text: `${getCurrencySymbol("HKD")} - Hong Kong dollar`,
+ },{
+ key: 7,
+ value: "SGD",
+ text: `${getCurrencySymbol("SGD")} - Singapore dollar`,
+ },{
+ key: 8,
+ value: "TWD",
+ text: `${getCurrencySymbol("TWD")} - New Taiwan dollar`,
+ },{
+ key: 9,
+ value: "KRW",
+ text: `${getCurrencySymbol("KRW")} - South Korean won`,
+ },{
+ key: 10,
+ value: "AUD",
+ text: `${getCurrencySymbol("AUD")} - Australian dollar`,
+ },{
+ key: 11,
+ value: "NZD",
+ text: `${getCurrencySymbol("NZD")} - New Zealand dollar`,
+ },{
+ key: 12,
+ value: "INR",
+ text: `${getCurrencySymbol("INR")} - Indian Rupee`,
+ },{
+ key: 13,
+ value: "DKK",
+ text: `${getCurrencySymbol("DKK")} - Danish krone`,
+ },{
+ key: 14,
+ value: "NOK",
+ text: `${getCurrencySymbol("NOK")} - Norwegian krone`,
+ },{
+ key: 15,
+ value: "SEK",
+ text: `${getCurrencySymbol("SEK")} - Swedish krona`,
+ },{
+ key: 16,
+ value: "ILS",
+ text: `${getCurrencySymbol("ILS")} - Israeli new shekel`,
+ },{
+ key: 17,
+ value: "CNY",
+ text: `${getCurrencySymbol("CNY")} - Chinese Yuan (Renminbi)`,
+ },{
+ key: 18,
+ value: "PLN",
+ text: `${getCurrencySymbol("PLN")} - Polish Zloty`,
+ },{
+ key: 19,
+ value: "CHF",
+ text: `${getCurrencySymbol("CHF")} - Swiss Franc`,
+ },{
+ key: 20,
+ value: "CZK",
+ text: `${getCurrencySymbol("CZK")} - Czech Koruna`,
+ },{
+ key: 21,
+ value: "HUF",
+ text: `${getCurrencySymbol("HUF")} - Hungarian Forint`,
+ },{
+ key: 22,
+ value: "RON",
+ text: `${getCurrencySymbol("RON")} - Romanian Leu`,
+ },{
+ key: 23,
+ value: "ZAR",
+ text: `${getCurrencySymbol("ZAR")} - South African Rand`,
+ },{
+ key: 24,
+ value: "MYR",
+ text: `${getCurrencySymbol("MYR")} - Malaysian Ringgit`,
+ },{
+ key: 25,
+ value: "THB",
+ text: `${getCurrencySymbol("THB")} - Thai Baht`,
+ },{
+ key: 26,
+ value: "PHP",
+ text: `${getCurrencySymbol("PHP")} - Philippine peso`,
+ },]);
const barcodeProfileOptions = GetTypeDropdown(BarcodeProfiles);
const digikeySites = GetAdvancedTypeDropdown(DigiKeySites);
const [settings, setSettings] = useState({
+ licenseKey: "",
+ language: "",
+ currency: "",
+ maxCacheItems: 1024,
+ cacheAbsoluteExpirationMinutes: 0,
+ cacheSlidingExpirationMinutes: 30,
binner: {
enabled: true,
apiKey: "",
@@ -265,6 +467,8 @@ export const Settings = (props) => {
const { data } = response;
setLoading(false);
setSettings({ ...data, barcode: {...data.barcode }});
+ setSystemSettings(data);
+ console.log('settings', data);
const digikeyTempSettings = getViewPreference("digikey");
if (digikeyTempSettings) {
setSettings({...data, digikey: digikeyTempSettings});
@@ -292,6 +496,7 @@ export const Settings = (props) => {
body: JSON.stringify(newSettings),
}).then((response) => {
if (response.responseObject.ok) {
+ setSystemSettings(newSettings);
const saveMessage = t('success.systemSettingsSaved', "System settings were saved.");
toast.success(saveMessage);
setSaveMessage(saveMessage);
@@ -313,24 +518,21 @@ export const Settings = (props) => {
if (control.name.startsWith("swarm")) {
setControlValue(newSettings.binner, "swarm", control);
}
- if (control.name.startsWith("digikey")) {
+ else if (control.name.startsWith("digikey")) {
setControlValue(newSettings.digikey, "digikey", control);
}
- if (control.name.startsWith("mouser")) {
+ else if (control.name.startsWith("mouser")) {
setControlValue(newSettings.mouser, "mouser", control);
}
- if (control.name.startsWith("arrow")) {
+ else if (control.name.startsWith("arrow")) {
setControlValue(newSettings.arrow, "arrow", control);
}
- if (control.name.startsWith("octopart")) {
+ else if (control.name.startsWith("octopart")) {
setControlValue(newSettings.octopart, "octopart", control);
}
- if (control.name.startsWith("barcode")) {
+ else if (control.name.startsWith("barcode")) {
setControlValue(newSettings.barcode, "barcode", control);
- }
-
- // todo: find a better way to clean up state changes
- if (control.name.startsWith("printer")) {
+ } else if (control.name.startsWith("printer")) {
if (control.name.startsWith("printerLine")) {
if (control.name.startsWith("printerLine1"))
setControlValue(
@@ -372,6 +574,8 @@ export const Settings = (props) => {
} else {
setControlValue(newSettings.printer, "printer", control);
}
+ } else {
+ setControlValue(newSettings, "", control);
}
setSettings(newSettings);
setIsDirty(true);
@@ -565,6 +769,158 @@ export const Settings = (props) => {
content={t('page.settings.confirm.mustAuthenticate', "External Api is requesting that you authenticate first. You will be redirected back after authenticating with the external provider.")}
/>