aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main/js/helpers
diff options
context:
space:
mode:
authorStas Vilchik <stas.vilchik@sonarsource.com>2018-03-16 16:24:04 +0100
committerSonarTech <sonartech@sonarsource.com>2018-03-22 12:37:48 +0100
commitfe9a68f2ccd3a1a90b619f3fe0e2fae4f4d20c36 (patch)
tree2dcebf80d8a84442fc1adb18b2486b1b5ac3bb56 /server/sonar-web/src/main/js/helpers
parentaf09abd297eee6694b088437f7f33bea210b82f0 (diff)
downloadsonarqube-fe9a68f2ccd3a1a90b619f3fe0e2fae4f4d20c36.tar.gz
sonarqube-fe9a68f2ccd3a1a90b619f3fe0e2fae4f4d20c36.zip
SONAR-9338 Make all date pickers consistent (#3157)
Diffstat (limited to 'server/sonar-web/src/main/js/helpers')
-rw-r--r--server/sonar-web/src/main/js/helpers/l10n.ts28
-rw-r--r--server/sonar-web/src/main/js/helpers/query.ts21
2 files changed, 30 insertions, 19 deletions
diff --git a/server/sonar-web/src/main/js/helpers/l10n.ts b/server/sonar-web/src/main/js/helpers/l10n.ts
index df95089855f..28ea4d6c93c 100644
--- a/server/sonar-web/src/main/js/helpers/l10n.ts
+++ b/server/sonar-web/src/main/js/helpers/l10n.ts
@@ -186,3 +186,31 @@ export function getCurrentLocale() {
DEFAULT_LANGUAGE
);
}
+
+export function getShortMonthName(index: number) {
+ const months = [
+ 'Jan',
+ 'Feb',
+ 'Mar',
+ 'Apr',
+ 'May',
+ 'Jun',
+ 'Jul',
+ 'Aug',
+ 'Sep',
+ 'Oct',
+ 'Nov',
+ 'Dec'
+ ];
+ return translate(months[index]);
+}
+
+export function getWeekDayName(index: number) {
+ const weekdays = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+ return weekdays[index] ? translate(weekdays[index]) : '';
+}
+
+export function getShortWeekDayName(index: number) {
+ const weekdays = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+ return weekdays[index] ? translate(weekdays[index]) : '';
+}
diff --git a/server/sonar-web/src/main/js/helpers/query.ts b/server/sonar-web/src/main/js/helpers/query.ts
index e495eb7da3a..5da77512078 100644
--- a/server/sonar-web/src/main/js/helpers/query.ts
+++ b/server/sonar-web/src/main/js/helpers/query.ts
@@ -17,25 +17,13 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import { isNil, omitBy } from 'lodash';
+import { isEqual, isNil, omitBy } from 'lodash';
import { isValidDate, parseDate, toNotSoISOString, toShortNotSoISOString } from './dates';
export interface RawQuery {
[x: string]: any;
}
-function arraysEqual(a: RawQuery, b: RawQuery): boolean {
- if (a.length !== b.length) {
- return false;
- }
- for (let i = 0; i < a.length; i++) {
- if (a[i] !== b[i]) {
- return false;
- }
- }
- return true;
-}
-
export function queriesEqual(a: RawQuery, b: RawQuery): boolean {
const keysA = Object.keys(a);
const keysB = Object.keys(b);
@@ -44,12 +32,7 @@ export function queriesEqual(a: RawQuery, b: RawQuery): boolean {
return false;
}
- return keysA.every(
- key =>
- Array.isArray(a[key]) && Array.isArray(b[key])
- ? arraysEqual(a[key], b[key])
- : a[key] === b[key]
- );
+ return keysA.every(key => isEqual(a[key], b[key]));
}
export function cleanQuery(query: RawQuery): RawQuery {