Commit 67be8c0

committed

refactored with immutable.js

1 parent 3e404e7 commit 67be8c0Copy full SHA for 67be8c0

File tree

1 file changed

+18

-12

lines changed

source/app/components/Scheduler
- index.js

1 file changed

+18

-12

lines changed

`‎source/app/components/Scheduler/index.js‎`

Lines changed: 18 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,13 @@ import React, { Component } from 'react';`
`3`	`3`	`import Move from 'react-flip-move';`
`4`	`4`	`import { hot } from 'react-hot-loader';`
`5`	`5`	`import { v4 } from 'uuid';`
	`6`	`+import { fromJS, Map } from "immutable";`
`6`	`7`
`7`	`8`	`// Instruments`
`8`	`9`	`import Styles from './styles.m.css';`
`9`	`10`	`import Checkbox from '../../theme/assets/Checkbox';`
`10`	`11`	`import initialTasksData from './tasks.json';`
	`12`	`+import { sortTasksByGroup } from "../../instruments";`
`11`	`13`
`12`	`14`	`// Components`
`13`	`15`	`import { Task } from '../Task';`
`@@ -17,7 +19,7 @@ export class Scheduler extends Component {`
`17`	`19`	`state = {`
`18`	`20`	`newTaskMessage: '',`
`19`	`21`	`tasksFilter: '',`
`20`		`- tasks: initialTasksData,`
	`22`	`+ tasks: fromJS(initialTasksData),`
`21`	`23`	`};`
`22`	`24`
`23`	`25`	`_updateTasksFilter = (event) => {`
`@@ -32,7 +34,7 @@ export class Scheduler extends Component {`
`32`	`34`	`});`
`33`	`35`	`};`
`34`	`36`
`35`		`- _getAllCompleted = () => this.state.tasks.every((task) => task.completed);`
	`37`	`+ _getAllCompleted = () => this.state.tasks.every((task) => task.get("completed"));`
`36`	`38`
`37`	`39`	`_createTask = (event) => {`
`38`	`40`	`event.preventDefault();`
`@@ -42,38 +44,38 @@ export class Scheduler extends Component {`
`42`	`44`	`return null;`
`43`	`45`	`}`
`44`	`46`
`45`		`- const newTask = {`
	`47`	`+ const newTask = Map({`
`46`	`48`	`id: v4(),`
`47`	`49`	`completed: false,`
`48`	`50`	`favorite: false,`
`49`	`51`	`message: newTaskMessage,`
`50`		`- };`
	`52`	`+ });`
`51`	`53`
`52`	`54`	`this.setState(({ tasks }) => ({`
`53`		`- tasks: [newTask, ...tasks],`
	`55`	`+ tasks: sortTasksByGroup(tasks.unshift(newTask)),`
`54`	`56`	`newTaskMessage: '',`
`55`	`57`	`}));`
`56`	`58`	`};`
`57`	`59`
`58`	`60`	`_updateTask = (updatedTask) => {`
`59`	`61`	`this.setState(({ tasks }) => {`
`60`		`- const indexToReplace = tasks.indexOf(`
`61`		`- tasks.find((task) => task.id === updatedTask.id),`
	`62`	`+ const indexToReplace = tasks.findIndex(`
	`63`	`+ (task) => task.get("id") === updatedTask.id,`
`62`	`64`	`);`
`63`	`65`
`64`	`66`	`const newTasks = [ ...tasks.filter((task) => task.id !== updatedTask.id) ];`
`65`	`67`
`66`	`68`	`newTasks.splice(indexToReplace, 0, updatedTask);`
`67`	`69`
`68`	`70`	`return {`
`69`		`- tasks: newTasks,`
	`71`	`+ tasks: sortTasksByGroup(tasks.update(indexToReplace,()=>Map(updatedTask))),`
`70`	`72`	`};`
`71`	`73`	`});`
`72`	`74`	`};`
`73`	`75`
`74`	`76`	`_removeTask = (taskId) => {`
`75`	`77`	`this.setState(({ tasks }) => ({`
`76`		`- tasks: tasks.filter((task) => task.id !== taskId),`
	`78`	`+ tasks: tasks.filter((task) => task.get("id") !== taskId),`
`77`	`79`	`}));`
`78`	`80`	`};`
`79`	`81`
`@@ -83,7 +85,7 @@ export class Scheduler extends Component {`
`83`	`85`	`}`
`84`	`86`
`85`	`87`	`this.setState(({ tasks }) => ({`
`86`		`- tasks: tasks.map((task) => ({ ...task,completed: true})),`
	`88`	`+ tasks: tasks.map((task) => task.set("completed",true)),`
`87`	`89`	`}));`
`88`	`90`	`};`
`89`	`91`
`@@ -92,12 +94,16 @@ export class Scheduler extends Component {`
`92`	`94`
`93`	`95`	`const allCompleted = this._getAllCompleted();`
`94`	`96`	`const todoList = tasks`
`95`		`- .filter((task) => task.message.toLowerCase().includes(tasksFilter))`
	`97`	`+ .filter((task) => task.get("message").toLowerCase().includes(tasksFilter))`
`96`	`98`	`.map((task) => (`
`97`	`99`	`<Task`
`98`	`100`	`_removeTask = { this._removeTask }`
`99`	`101`	`_updateTask = { this._updateTask }`
`100`		`- key = { task.id }`
	`102`	`+ key = { task.get("id") }`
	`103`	`+ id = { task.get("id") }`
	`104`	`+ message = { task.get("message") }`
	`105`	`+ completed = { task.get("completed") }`
	`106`	`+ favorite = { task.get("favorite") }`
`101`	`107`	`{ ...task }`
`102`	`108`	`/>`
`103`	`109`	`));`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 67be8c0

File tree

1 file changed

1 file changed

`‎source/app/components/Scheduler/index.js‎`

0 commit comments