Merge pull request #364 from heartexlabs/feature/dev-1094

DEV-1094

Author: chiganov

src/components/TopBar/Controls.js

@@ -40,7 +40,7 @@ export const Controls = controlsInjector(observer(({ store, history, annotation
   if (isReview) {
     buttons.push(
       <ButtonTooltip key="reject" title="Reject annotation: [ Ctrl+Space ]">
-        <Button  aria-label="reject-annotation" disabled={disabled} look="danger" onClick={store.rejectAnnotation}>
+        <Button aria-label="reject-annotation" disabled={disabled} look="danger" onClick={store.rejectAnnotation}>
           Reject
         </Button>
       </ButtonTooltip>,
@@ -56,8 +56,14 @@ export const Controls = controlsInjector(observer(({ store, history, annotation
   } else if (annotation.skipped) {
     buttons.push(
       <Elem name="skipped-info" key="skipped">
-        <IconBan color="#d00" /> Annotation skipped
-      </Elem>,
+        <IconBan color="#d00" /> Was skipped
+      </Elem>);
+    buttons.push(
+      <ButtonTooltip key="cancel-skip" title="Cancel skip: []">
+        <Button aria-label="cancel-skip" disabled={disabled} look="primary" onClick={store.cancelSkippingTask}>
+          Cancel skip
+        </Button>
+      </ButtonTooltip>,
     );
   } else {
     if (store.hasInterface("skip")) {

src/components/TopBar/Controls.styl

@@ -12,6 +12,12 @@
 
   &__skipped-info
     display flex
+    // background-color rgba(221, 0, 0, 0.18)
+    align-items center
+    justify-content center
+    font-weight 500
+    font-size 16px
+
     svg
       margin 0 8px 0 4px
 

src/core/External.js

@@ -21,6 +21,11 @@ function onDeleteAnnotation() {}
  */
 function onSkipTask() {}
 
+/**
+ * Callback on unskip task
+ */
+function onCancelSkippingTask() {}
+
 /**
  * Callback on task load
  */
@@ -79,6 +84,7 @@ export default {
   onGroundTruth,
   onLabelStudioLoad,
   onSkipTask,
+  onCancelSkippingTask,
   onSubmitAnnotation,
   onSubmitDraft,
   onTaskLoad,

src/env/development.js

@@ -138,6 +138,7 @@ function configureApplication(params) {
     onUpdateAnnotation: params.onUpdateAnnotation ? params.onUpdateAnnotation : External.onUpdateAnnotation,
     onDeleteAnnotation: params.onDeleteAnnotation ? params.onDeleteAnnotation : External.onDeleteAnnotation,
     onSkipTask: params.onSkipTask ? params.onSkipTask : External.onSkipTask,
+    onCancelSkippingTask: params.onCancelSkippingTask ? params.onCancelSkippingTask : External.onCancelSkippingTask,
     onSubmitDraft: params.onSubmitDraft,
     onTaskLoad: params.onTaskLoad ? params.onTaskLoad : External.onTaskLoad,
     onLabelStudioLoad: params.onLabelStudioLoad ? params.onLabelStudioLoad : External.onLabelStudioLoad,

src/env/production.js

@@ -63,6 +63,7 @@ function configureApplication(params) {
     onUpdateAnnotation: params.onUpdateAnnotation ? ouCB : External.onUpdateAnnotation,
     onDeleteAnnotation: params.onDeleteAnnotation ? odCB : External.onDeleteAnnotation,
     onSkipTask: params.onSkipTask ? params.onSkipTask : External.onSkipTask,
+    onCancelSkippingTask: params.onCancelSkippingTask ? params.onCancelSkippingTask : External.onCancelSkippingTask,
     onSubmitDraft: params.onSubmitDraft,
     onTaskLoad: params.onTaskLoad || External.onTaskLoad,
     onLabelStudioLoad: params.onLabelStudioLoad || External.onLabelStudioLoad,

src/stores/AppStore.js

@@ -479,6 +479,12 @@ export default types
       }, "Error during skip, try again");
     }
 
+    function cancelSkippingTask() {
+      handleSubmittingFlag(() => {
+        getEnv(self).events.invoke('cancelSkippingTask', self);
+      }, "Error during cancel skipping task, try again");
+    }
+
     function acceptAnnotation() {
       if (self.isSubmitting) return;
 
@@ -660,6 +666,7 @@ export default types
       attachHotkeys,
 
       skipTask,
+      cancelSkippingTask,
       submitDraft,
       submitAnnotation,
       updateAnnotation,