-
Notifications
You must be signed in to change notification settings - Fork 30
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(lib-classifier): record classification times between the first and last annotation #6449
Closed
eatyourgreens
wants to merge
5
commits into
zooniverse:master
from
eatyourgreens:test-classification-timestamps
Closed
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
f6e7aa3
test(lib-classifier): test classification timestamps
eatyourgreens 8e1a3d3
Update startedAt when the first annotation is made
eatyourgreens 9783e54
test the length of the mock classification
eatyourgreens f0177f7
Set started_at when annotation._inProgress changes
eatyourgreens 5637ca1
support the survey task's _choiceInProgress flag
eatyourgreens File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,10 @@ | ||
import cuid from 'cuid' | ||
import { types, getSnapshot, getType } from 'mobx-state-tree' | ||
import { types, getSnapshot, getType, addDisposer } from 'mobx-state-tree' | ||
import * as tasks from '@plugins/tasks' | ||
import AnnotationsStore from '@store/AnnotationsStore' | ||
import Resource from '@store/Resource' | ||
import ClassificationMetadata from './ClassificationMetadata' | ||
import { autorun } from 'mobx' | ||
|
||
const annotationModels = Object.values(tasks).map(task => task.AnnotationModel) | ||
|
||
|
@@ -19,6 +20,17 @@ const Classification = types | |
metadata: types.maybe(ClassificationMetadata) | ||
}) | ||
.views(self => ({ | ||
/** | ||
* Returns false until we start updating task annotations. | ||
*/ | ||
get inProgress() { | ||
let inProgress = false | ||
self.annotations.forEach(annotation => { | ||
inProgress ||= annotation._inProgress || annotation._choiceInProgress | ||
}) | ||
return inProgress | ||
}, | ||
|
||
toSnapshot () { | ||
let snapshot = getSnapshot(self) | ||
let annotations = [] | ||
|
@@ -58,5 +70,23 @@ const Classification = types | |
newSnapshot.annotations = Object.values(snapshot.annotations) | ||
return newSnapshot | ||
}) | ||
.actions(self => { | ||
function _onAnnotationsChange () { | ||
// set started at when inProgress changes from false to true | ||
if (self.inProgress) { | ||
self.setStartedAt() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If you comment this out, the tests should fail. |
||
} | ||
} | ||
|
||
return ({ | ||
afterAttach () { | ||
addDisposer(self, autorun(_onAnnotationsChange)) | ||
}, | ||
|
||
setStartedAt () { | ||
self.metadata.startedAt = new Date().toISOString() | ||
} | ||
}) | ||
}) | ||
|
||
export default types.compose('ClassificationResource', Resource, AnnotationsStore, Classification) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,9 +36,10 @@ const ClassificationMetadata = types.model('ClassificationMetadata', { | |
.actions(self => ({ | ||
afterAttach() { | ||
function _onLocaleChange() { | ||
self.update({ | ||
userLanguage: getRoot(self)?.locale | ||
}) | ||
const userLanguage = getRoot(self)?.locale | ||
if (userLanguage) { | ||
self.update({ userLanguage }) | ||
} | ||
Comment on lines
+39
to
+42
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This isn't related to the timestamps bug but fixes the store error in #6448. |
||
} | ||
addDisposer(self, autorun(_onLocaleChange)) | ||
}, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
_choiceInProgress
is used by the survey task. All other tasks use_inProgress
.