Skip to content

Commit 794f21e

Browse files
droshevdroshev
authored
Merge pull request #47 from SAP/reduce-eslint-warnings
reduce eslint warnings
2 parents a8a7214 + 12a1519 commit 794f21e

File tree

14 files changed

+72
-76
lines changed

14 files changed

+72
-76
lines changed

‎src/Alert/Alert.Component.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export const AlertComponent = () => {
1212
</Alert>`
1313

1414
const errorAlertCode = `<Alert type="error" dismissable={true} link="#" linkText="link">Error message with a </Alert>`
15-
const json = ''
15+
1616
return (
1717
<div>
1818
<Header>Alert</Header>

‎src/Calendar/Calendar.js‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ export class Calendar extends Component {
5454
//Updates the states when the props of the parent component are changed.
5555
static getDerivedStateFromProps(updatedPropsParent, previousStates) {
5656

57-
if(updatedPropsParent.customDate == undefined) {
57+
if(updatedPropsParent.customDate === undefined) {
5858
return null;
5959
}
6060

6161
//If range is enabled and the date from the parent component does not match the array dates of the states then states are updated
62-
if (updatedPropsParent.enableRangeSelection != undefined) {
63-
if (updatedPropsParent.customDate != previousStates.arrSelectedDates) {
62+
if (updatedPropsParent.enableRangeSelection !== undefined) {
63+
if (updatedPropsParent.customDate !== previousStates.arrSelectedDates) {
6464
//This checks if the date from date picker is undefined
65-
if (updatedPropsParent.customDate == "undefined") {
65+
if (updatedPropsParent.customDate === "undefined") {
6666
//DateClick allows to update the date from the date picker if it is undefined
6767
if (previousStates.dateClick) {
6868
return ({dateClick: false});
@@ -73,12 +73,12 @@ export class Calendar extends Component {
7373
return ({arrSelectedDates: updatedPropsParent.customDate, selectedDate: new Date(0,0,0)});
7474
}
7575
}
76-
else if (updatedPropsParent.customDate != previousStates.currentDateDisplayed) {
77-
if (updatedPropsParent.customDate == undefined || updatedPropsParent.customDate == "") {
76+
else if (updatedPropsParent.customDate !== previousStates.currentDateDisplayed) {
77+
if (updatedPropsParent.customDate === undefined || updatedPropsParent.customDate === "") {
7878
return null;
7979
}
80-
else if (updatedPropsParent.customDate == "undefined") {
81-
if (previousStates.selectedDate.getFullYear() != 1899 && previousStates.dateClick) {
80+
else if (updatedPropsParent.customDate === "undefined") {
81+
if (previousStates.selectedDate.getFullYear() !== 1899 && previousStates.dateClick) {
8282
return ({dateClick: false})
8383
}
8484
//If date was not clicked then the date is reset
@@ -107,7 +107,7 @@ export class Calendar extends Component {
107107
}
108108

109109
displaySelectedRangeLast(day) {
110-
return this.props.enableRangeSelection && (this.state.arrSelectedDates[1] != undefined && this.state.arrSelectedDates[1].getTime() === day.getTime()) ? " is-selected-range-last" : ""
110+
return this.props.enableRangeSelection && (this.state.arrSelectedDates[1] !== undefined && this.state.arrSelectedDates[1].getTime() === day.getTime()) ? " is-selected-range-last" : ""
111111
}
112112

113113
displayIsDayOtherMonth(day) {
@@ -116,9 +116,9 @@ export class Calendar extends Component {
116116

117117
displayIsSelected(day) {
118118
return (this.isSelected(day)
119-
|| (this.props.enableRangeSelection && ((this.state.arrSelectedDates[0] != undefined ? this.state.arrSelectedDates[0].getTime() == day.getTime() : false)
120-
|| (this.state.arrSelectedDates[1] != undefined ? this.state.arrSelectedDates[1].getTime() == day.getTime() : false))))
121-
&& !(this.props.disableWeekends && (day.getDay() == 0 || day.getDay() == 6))
119+
|| (this.props.enableRangeSelection && ((this.state.arrSelectedDates[0] !== undefined ? this.state.arrSelectedDates[0].getTime() === day.getTime() : false)
120+
|| (this.state.arrSelectedDates[1] !== undefined ? this.state.arrSelectedDates[1].getTime() === day.getTime() : false))))
121+
&& !(this.props.disableWeekends && (day.getDay() === 0 || day.getDay() === 6))
122122
&& !(this.disableBeforeDate(day, this.props.disableBeforeDate))
123123
&& !this.isDateBetween(day, this.props.blockedDates)
124124
&& !(this.disableWeekday(day, this.props.disableWeekday))
@@ -128,11 +128,11 @@ export class Calendar extends Component {
128128
}
129129

130130
displaySelectedRangeFirst(day) {
131-
return this.props.enableRangeSelection && (this.state.arrSelectedDates[0] != undefined) && this.state.arrSelectedDates[0].getTime() === day.getTime() ? " is-selected-range-first " : ""
131+
return this.props.enableRangeSelection && (this.state.arrSelectedDates[0] !== undefined) && this.state.arrSelectedDates[0].getTime() === day.getTime() ? " is-selected-range-first " : ""
132132
}
133133

134134
displayDisabled(day) {
135-
return (this.props.disableWeekends && (day.getDay() == 0 || day.getDay() == 6)) || (this.props.disablePastDates && (this.disableBeforeTodayDate(day))) || (this.props.disableFutureDates && this.disableAfterTodayDate(day)) ||(this.disableWeekday(day, this.props.disableWeekday)) || this.disableBeforeDate(day, this.props.disableBeforeDate) || this.disableAfterDate(day, this.props.disableAfterDate) || this.isDateBetween(day, this.props.disabledDates) ? " is-disabled": ""
135+
return (this.props.disableWeekends && (day.getDay() === 0 || day.getDay() === 6)) || (this.props.disablePastDates && (this.disableBeforeTodayDate(day))) || (this.props.disableFutureDates && this.disableAfterTodayDate(day)) ||(this.disableWeekday(day, this.props.disableWeekday)) || this.disableBeforeDate(day, this.props.disableBeforeDate) || this.disableAfterDate(day, this.props.disableAfterDate) || this.isDateBetween(day, this.props.disabledDates) ? " is-disabled": ""
136136
}
137137

138138

@@ -204,7 +204,7 @@ export class Calendar extends Component {
204204
shortenedNameMonth = element.substring(0, 3);
205205
}
206206

207-
return <li className={`fd-calendar__item${months[this.state.currentDateDisplayed.getMonth()] == element ? " is-selected" : ""}${months[this.state.todayDate.getMonth()] == element ? " fd-calendar__item--current" : ""}`} key={element} name={element} onClick={() => this.changeMonth(element)}>{shortenedNameMonth}</li>
207+
return <li className={`fd-calendar__item${months[this.state.currentDateDisplayed.getMonth()] === element ? " is-selected" : ""}${months[this.state.todayDate.getMonth()] === element ? " fd-calendar__item--current" : ""}`} key={element} name={element} onClick={() => this.changeMonth(element)}>{shortenedNameMonth}</li>
208208
});
209209

210210
return (
@@ -225,7 +225,7 @@ export class Calendar extends Component {
225225
years.push(year);
226226
}
227227
let listOfYears = years.map(element=>{
228-
return <li className={`fd-calendar__item${this.state.currentDateDisplayed.getFullYear() == element ? " is-selected" : ""}${this.state.todayDate.getFullYear() == element ? " fd-calendar__item--current" : ""}`} key={element} name={element} onClick={() => this.changeYear(element)}>{element}</li>
228+
return <li className={`fd-calendar__item${this.state.currentDateDisplayed.getFullYear() === element ? " is-selected" : ""}${this.state.todayDate.getFullYear() === element ? " fd-calendar__item--current" : ""}`} key={element} name={element} onClick={() => this.changeYear(element)}>{element}</li>
229229
})
230230
return (
231231
<div className="fd-calendar__months">
@@ -274,13 +274,13 @@ export class Calendar extends Component {
274274

275275
dateClick = (day, isRangeEnabled) => {
276276
let selectedDates = [];
277-
if (isRangeEnabled != undefined && isRangeEnabled) {
277+
if (isRangeEnabled !== undefined && isRangeEnabled) {
278278
selectedDates = this.state.arrSelectedDates;
279-
if (selectedDates.length == 2) {
279+
if (selectedDates.length === 2) {
280280
selectedDates = [];
281281
selectedDates.push(day);
282282
}
283-
else if (selectedDates[0] != undefined && day.getTime() <= selectedDates[0].getTime()){
283+
else if (selectedDates[0] !== undefined && day.getTime() <= selectedDates[0].getTime()){
284284
let newArr = [];
285285
newArr.push(day);
286286
newArr.push(selectedDates[0]);
@@ -307,7 +307,7 @@ export class Calendar extends Component {
307307

308308
retrieveStartOfWeek(date){
309309
let day = date.getDay();
310-
let difference = date.getDate() - day + (day == 0 ? -6:0);
310+
let difference = date.getDate() - day + (day === 0 ? -6:0);
311311
return new Date(date.setDate(difference));
312312
}
313313

@@ -335,11 +335,11 @@ export class Calendar extends Component {
335335

336336
isDateBetween(date, blockedDates, isRangeEnabled) {
337337

338-
if (blockedDates == undefined || blockedDates[0] == undefined || blockedDates[1] == undefined) {
338+
if (blockedDates === undefined || blockedDates[0] === undefined || blockedDates[1] === undefined) {
339339
return false;
340340
}
341341

342-
if (isRangeEnabled != undefined || isRangeEnabled) {
342+
if (isRangeEnabled !== undefined || isRangeEnabled) {
343343
if (blockedDates[0].getTime() > blockedDates[1].getTime()){
344344
return blockedDates[1].getTime() < date.getTime() && blockedDates[0].getTime() > date.getTime();
345345
}
@@ -348,15 +348,15 @@ export class Calendar extends Component {
348348
}
349349

350350
isSelected (date) {
351-
return (this.state.selectedDate.getDate() == date.getDate() &&
352-
this.state.selectedDate.getMonth() == date.getMonth() &&
353-
this.state.selectedDate.getFullYear() == date.getFullYear());
351+
return (this.state.selectedDate.getDate() === date.getDate() &&
352+
this.state.selectedDate.getMonth() === date.getMonth() &&
353+
this.state.selectedDate.getFullYear() === date.getFullYear());
354354
}
355355

356356
disableWeekday(date, weekDays) {
357357
let daysName = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
358358

359-
if (weekDays == undefined){
359+
if (weekDays === undefined){
360360
return false;
361361
}
362362

@@ -367,15 +367,15 @@ export class Calendar extends Component {
367367
}
368368

369369
disableBeforeDate(date, beforeDate){
370-
if (beforeDate == undefined) {
370+
if (beforeDate === undefined) {
371371
return false;
372372
}
373373
return (date.getTime() < beforeDate.getTime());
374374
}
375375

376376
disableAfterDate(date, afterDate){
377377

378-
if (afterDate == undefined){
378+
if (afterDate === undefined){
379379
return false;
380380
}
381381
return (date.getTime() > afterDate.getTime());
@@ -397,7 +397,7 @@ export class Calendar extends Component {
397397

398398
selectRangeSelection(date){
399399
let selectedDates = this.state.arrSelectedDates;
400-
if (selectedDates.length == 2) {
400+
if (selectedDates.length === 2) {
401401
selectedDates = [];
402402
}
403403
selectedDates.push(date);
@@ -410,8 +410,8 @@ export class Calendar extends Component {
410410
}
411411

412412
returnDateSelected(dates) {
413-
if (this.props.onChange != undefined) {
414-
if (this.props.enableRangeSelection == true) {
413+
if (this.props.onChange !== undefined) {
414+
if (this.props.enableRangeSelection === true) {
415415
this.props.onChange(dates);
416416
}
417417
else {
@@ -489,7 +489,7 @@ export class Calendar extends Component {
489489
for (let iterations = 0; iterations < 7; iterations++) {
490490
dateFormatted = day.getDate();
491491
let copyDate = day;
492-
days.push(<td className={`fd-calendar__item fd-calendar__item${this.displayIsDayOtherMonth(day)} ${this.state.todayDate.getTime() == copyDate.getTime() ? "fd-calendar__item--current":""} ${this.displayIsSelected(day)} ${this.displaySelectedRangeFirst(day)}${this.displaySelectedRangeLast(day)}${this.displayBetweenRange(day)} ${this.displayDisabled(day)} ${this.isDateBetween(day, blockedDates) ? "is-blocked": ""}` } role="gridcell" onClick={() => this.dateClick(copyDate, enableRangeSelection)} key={copyDate}><span className="fd-calendar__text">{dateFormatted}</span>
492+
days.push(<td className={`fd-calendar__item fd-calendar__item${this.displayIsDayOtherMonth(day)} ${this.state.todayDate.getTime() === copyDate.getTime() ? "fd-calendar__item--current":""} ${this.displayIsSelected(day)} ${this.displaySelectedRangeFirst(day)}${this.displaySelectedRangeLast(day)}${this.displayBetweenRange(day)} ${this.displayDisabled(day)} ${this.isDateBetween(day, blockedDates) ? "is-blocked": ""}` } role="gridcell" onClick={() => this.dateClick(copyDate, enableRangeSelection)} key={copyDate}><span className="fd-calendar__text">{dateFormatted}</span>
493493
</td>)
494494
day = this.addDays(day, 1);
495495
}

‎src/DatePicker/DatePicker.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export class DatePicker extends Component {
2121
}
2222

2323
openCalendar = (type) => {
24-
if (type == "input") {
24+
if (type === "input") {
2525
if (this.state.hidden) {
2626
this.setState({hidden: !this.state.hidden});
2727
}
@@ -42,7 +42,7 @@ export class DatePicker extends Component {
4242
let formatDate = "";
4343
if (this.props.enableRangeSelection) {
4444

45-
if(date.length == 0) {
45+
if(date.length === 0) {
4646
return "";
4747
}
4848

@@ -61,7 +61,7 @@ export class DatePicker extends Component {
6161
}
6262
else {
6363
//Checks if the type of date doesn't match those types and that it doesn't contain any special character symbols
64-
if ((typeof date != "array" || typeof date != "date" || typeof date != "object") && (date.toString().search(regex)!=1)) {
64+
if ((typeof date !== "array" || typeof date !== "date" || typeof date !== "object") && (date.toString().search(regex)!==1)) {
6565
return "";
6666
}
6767
else {
@@ -83,7 +83,7 @@ export class DatePicker extends Component {
8383
if(this.props.enableRangeSelection) {
8484

8585
//If the formattedDate contains a list of special characters symbols then it will be reset
86-
if (this.state.formattedDate.search(regex) != -1 || this.state.formattedDate == "" || this.state.formattedDate.split("-").length < 2) {
86+
if (this.state.formattedDate.search(regex) !== -1 || this.state.formattedDate === "" || this.state.formattedDate.split("-").length < 2) {
8787
this.setState({formattedDate: "", arrSelectedDates: "undefined", hidden: false});
8888
}
8989
else {
@@ -103,7 +103,7 @@ export class DatePicker extends Component {
103103
let secondMonthRange = parseInt(dateSeparatedSecondRange[0], 10);
104104

105105
//Checks if the input is actually numbers and follows the required form
106-
if ((firstYearRange != NaN || firstDateRange != NaN || firstMonthRange != NaN) && (secondYearRange != NaN || secondDateRange != NaN || secondMonthRange != NaN) &&
106+
if ((!isNaN(firstYearRange) || !isNaN(firstDateRange) || !isNaN(firstMonthRange)) && (!isNaN(secondYearRange) || !isNaN(secondDateRange) || !isNaN(secondMonthRange)) &&
107107
(1 <= firstDateRange && firstDateRange <= 31) && (1<firstMonthRange && firstMonthRange <= 12) && (firstYearRange <= 3000) && (1 <= secondDateRange && secondDateRange <= 31) && (1<secondMonthRange && secondMonthRange <= 12)&&
108108
(secondYearRange <= 3000)) {
109109

@@ -129,7 +129,7 @@ export class DatePicker extends Component {
129129
}
130130
}
131131
else {
132-
if (this.state.formattedDate.search(regex) != -1) {
132+
if (this.state.formattedDate.search(regex) !== -1) {
133133
this.setState({formattedDate: this.formatDate(this.state.selectedDate),
134134
selectedDate: "undefined"})
135135
}
@@ -140,7 +140,7 @@ export class DatePicker extends Component {
140140
let date = parseInt(dateSeparated[1], 10);
141141
let month = parseInt(dateSeparated[0], 10);
142142

143-
if ((year != NaN || date != NaN || month != NaN) && (1 <= date && date <= 31) && (1<month && month <= 12) && (year <= 3000)) {
143+
if ((!isNaN(year) || !isNaN(date) || !isNaN(month)) && (1 <= date && date <= 31) && (1<month && month <= 12) && (year <= 3000)) {
144144
this.setState({
145145
selectedDate: new Date(year, month - 1, date)
146146
});
@@ -180,7 +180,7 @@ export class DatePicker extends Component {
180180
if(this.props.enableRangeSelection) {
181181

182182
//If the formattedDate contains a list of special characters symbols then it will be reset
183-
if (this.state.formattedDate.search(regex) != -1 || this.state.formattedDate == "" || this.state.formattedDate.split("-").length < 2) {
183+
if (this.state.formattedDate.search(regex) !== -1 || this.state.formattedDate === "" || this.state.formattedDate.split("-").length < 2) {
184184
this.setState({formattedDate: "", arrSelectedDates: "undefined", hidden: true});
185185
}
186186
else {
@@ -198,7 +198,7 @@ export class DatePicker extends Component {
198198
let secondDateRange = parseInt(dateSeparatedSecondRange[1], 10);
199199
let secondMonthRange = parseInt(dateSeparatedSecondRange[0], 10);
200200

201-
if ((firstYearRange != NaN || firstDateRange != NaN || firstMonthRange != NaN) && (secondYearRange != NaN || secondDateRange != NaN || secondMonthRange != NaN) &&
201+
if ((!isNaN(firstYearRange) || !isNaN(firstDateRange) || !isNaN(firstMonthRange)) && (!isNaN(secondYearRange) || !isNaN(secondDateRange) || !isNaN(secondMonthRange)) &&
202202
(1 <= firstDateRange && firstDateRange <= 31) && (1<firstMonthRange && firstMonthRange <= 12) && (firstYearRange <= 3000) && (1 <= secondDateRange && secondDateRange <= 31) && (1<secondMonthRange && secondMonthRange <= 12)&&
203203
(secondYearRange <= 3000) && dateRange[0].search(regex) === -1 && dateRange[1].search(regex) === -1) {
204204

@@ -232,7 +232,7 @@ export class DatePicker extends Component {
232232
}
233233
else {
234234

235-
if (this.state.formattedDate.search(regex) != -1) {
235+
if (this.state.formattedDate.search(regex) !== -1) {
236236
this.setState({formattedDate: this.formatDate(this.state.selectedDate), selectedDate: "undefined"})
237237
}
238238
else {
@@ -242,7 +242,7 @@ export class DatePicker extends Component {
242242
let date = parseInt(dateSeparated[1], 10);
243243
let month = parseInt(dateSeparated[0], 10);
244244

245-
if ((year != NaN || date != NaN || month != NaN) && (1 <= date && date <= 31) && (1<month && month <= 12) && (year <= 3000)) {
245+
if ((!isNaN(year) || !isNaN(date) || !isNaN(month)) && (1 <= date && date <= 31) && (1<month && month <= 12) && (year <= 3000)) {
246246
this.setState({
247247
selectedDate: new Date(year, month - 1, date)
248248
});
@@ -262,7 +262,7 @@ export class DatePicker extends Component {
262262

263263
if (this.props.enableRangeSelection) {
264264

265-
if (date.length == 2) {
265+
if (date.length === 2) {
266266
let firstDateMonth = date[0].getMonth() + 1;
267267
let firstDateDay = date[0].getDate();
268268
let firstDateYear = date[0].getFullYear();

‎src/Forms/Forms.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export class FormRadio extends Component {
129129
}
130130

131131
render() {
132-
const { inputs, disabled, isInline, defaultChecked } = this.props;
132+
const { inputs, disabled, isInline } = this.props;
133133
let result;
134134

135135
if (isInline) {

‎src/InputGroup/InputGroup.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ export class InputGroup extends Component {
125125
</span>
126126
</div>
127127
);
128+
default:
129+
break;
128130
}
129131
}
130132
}

0 commit comments

Comments
 (0)