From a04702a8d014e1d2f6563e4fbd3575682a60f500 Mon Sep 17 00:00:00 2001 From: Gucheng Wang Date: Sun, 28 Nov 2021 18:21:34 +0800 Subject: [PATCH] Add Setting.getNewRowNameForTable(). --- web/src/ProviderTable.js | 2 +- web/src/Setting.js | 9 +++++++++ web/src/SignupTable.js | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/web/src/ProviderTable.js b/web/src/ProviderTable.js index df343e2c..723ec0c4 100644 --- a/web/src/ProviderTable.js +++ b/web/src/ProviderTable.js @@ -38,7 +38,7 @@ class ProviderTable extends React.Component { } addRow(table) { - let row = {name: "Please select a provider", canSignUp: true, canSignIn: true, canUnlink: true, alertType: "None"}; + let row = {name: Setting.getNewRowNameForTable(table, "Please select a provider"), canSignUp: true, canSignIn: true, canUnlink: true, alertType: "None"}; if (table === undefined) { table = []; } diff --git a/web/src/Setting.js b/web/src/Setting.js index 7e258122..e1e9b32d 100644 --- a/web/src/Setting.js +++ b/web/src/Setting.js @@ -526,6 +526,15 @@ export function getDeduplicatedArray(array, filterArray, key) { return res; } +export function getNewRowNameForTable(table, rowName) { + const emptyCount = table.filter(row => row.name.includes(rowName)).length; + let res = rowName; + for (let i = 0; i < emptyCount; i ++) { + res = res + " "; + } + return res; +} + export function getTagColor(s) { return "success"; } diff --git a/web/src/SignupTable.js b/web/src/SignupTable.js index eb181025..d005844c 100644 --- a/web/src/SignupTable.js +++ b/web/src/SignupTable.js @@ -38,7 +38,7 @@ class SignupTable extends React.Component { } addRow(table) { - let row = {name: "Please select a signup item", visible: true, required: true, rule: "None"}; + let row = {name: Setting.getNewRowNameForTable(table, "Please select a signup item"), visible: true, required: true, rule: "None"}; if (table === undefined) { table = []; }