Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Jul 7, 2024. It is now read-only.

Fix interrupted activities clearlog #200

Merged
koalalorenzo merged 6 commits into from
Sep 21, 2018
Merged

Fix interrupted activities clearlog #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
27a59aa
adds a test for clear activities that are interrupted
koalalorenzo Sep 20, 2018
fce0bf6
filters out interrupted activities
koalalorenzo Sep 20, 2018
ddea03c
fewer lines
koalalorenzo Sep 20, 2018
9b2fb8e
uses default name Orion when electron is not available
koalalorenzo Sep 20, 2018
46d57ff
adds explaination to the activities
koalalorenzo Sep 20, 2018
1c4a2a6
uses filter and iterates over ongoing activities
koalalorenzo Sep 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,18 +381,16 @@ ipcMain.on('update-activities', () => {
* @param {Object} activities
*/
export const filterUnfinishedActivities = (activitiesById, activities) => {
const ongoingActivitiesById = []
const ongoingActivities = {}
let ongoingActivitiesById = []
let ongoingActivities = {}

activitiesById.forEach(uuid => {
ongoingActivitiesById = activitiesById.filter(uuid => {
const activity = activities[uuid]

if (!activity.finished) {
ongoingActivitiesById.push(activity.uuid)
ongoingActivities[activity.uuid] = activity
}
return !activity.interrupted && !activity.finished
})

ongoingActivitiesById.forEach(uuid => { ongoingActivities[uuid] = activities[uuid] })

return {
activitiesById: ongoingActivitiesById,
activities: ongoingActivities
Expand Down
41 changes: 40 additions & 1 deletion app/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jest.mock('electron', () => ({

describe('index.js', () => {
describe('clear-activities', () => {
it('should only clear unfinished activities', () => {
it('should only clear finished activities', () => {
// arrange
const activitiesById = [1, 2, 3]
const activities = {
Expand Down Expand Up @@ -55,5 +55,44 @@ describe('index.js', () => {
}
})
})
it('should clear interrupted activities', () => {
// arrange
const activitiesById = [1, 2, 3]
const activities = {
// Going on activity:
'1': {
uuid: 1,
finished: false,
interrupted: false,
foo: 'b'
},
// Finished activity
'2': {
uuid: 2,
finished: true,
interrupted: false,
foo: 'a'
},
// Interrupted activity
'3': {
uuid: 3,
finished: false,
interrupted: true,
foo: 'r'
}
}
// act
const result = AppIndex.filterUnfinishedActivities(activitiesById, activities)
// assert
expect(result.activitiesById).toEqual([1])
expect(result.activities).toEqual({
'1': {
uuid: 1,
finished: false,
interrupted: false,
foo: 'b'
}
})
})
})
})
6 changes: 5 additions & 1 deletion app/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,11 @@ const aboutOrion = {
}

if (process.platform === 'darwin') {
const name = electron.app.getName()
let name = 'Orion'
if (electron.app.getName) {
name = electron.app.getName()
}

template.unshift({
label: name,
submenu: [aboutOrion, {
Expand Down