diff --git a/frontend_v2/src/app/components/challenge/challengephases/editphasemodal/editphasemodal.component.html b/frontend_v2/src/app/components/challenge/challengephases/editphasemodal/editphasemodal.component.html index 924da573c7..8ac4ec51fb 100644 --- a/frontend_v2/src/app/components/challenge/challengephases/editphasemodal/editphasemodal.component.html +++ b/frontend_v2/src/app/components/challenge/challengephases/editphasemodal/editphasemodal.component.html @@ -172,23 +172,7 @@ - -
-
- -
-
- -
- +
diff --git a/frontend_v2/src/app/components/challenge/challengesettings/challengesettings.component.html b/frontend_v2/src/app/components/challenge/challengesettings/challengesettings.component.html index 3087f6dc6b..5e77dc921f 100644 --- a/frontend_v2/src/app/components/challenge/challengesettings/challengesettings.component.html +++ b/frontend_v2/src/app/components/challenge/challengesettings/challengesettings.component.html @@ -17,10 +17,10 @@
Challenge Settings
- + Upload New Image
@@ -28,7 +28,12 @@
Challenge Settings
{{ challenge['title'] }} - + @@ -44,7 +49,7 @@
Challenge Settings
- +
@@ -78,10 +83,10 @@
Challenge Settings
- - {{ publishChallenge.state }} - - + + {{ publishChallenge.state }} + +
Challenge Settings
- - + +
@@ -135,7 +140,7 @@
Challenge Settings
- +
Edit Phase @@ -151,29 +156,48 @@
Challenge Settings
#phaseselect >
- -
+ +
Phase Details - -      +      Is Public - -      +      Submission Visibility +

+ + Test Annotations + + + +
- -
+
+
+
+

+ Note: For test annotations > 100MB, please use + evalai-cli + to update the test annotations. + View Instructions +

+
+
+
@@ -199,8 +223,8 @@
Challenge Settings
Leaderboard Visibility - -      +     
@@ -232,11 +256,10 @@
Challenge Settings
- - +
@@ -251,8 +274,8 @@
Evaluation script
Evaluation Criteria - -    +    Evaluation Script @@ -303,7 +326,6 @@
Submission worker logs
-
diff --git a/frontend_v2/src/app/components/challenge/challengesettings/challengesettings.component.scss b/frontend_v2/src/app/components/challenge/challengesettings/challengesettings.component.scss index 1683fabdf0..a9a94dc65d 100644 --- a/frontend_v2/src/app/components/challenge/challengesettings/challengesettings.component.scss +++ b/frontend_v2/src/app/components/challenge/challengesettings/challengesettings.component.scss @@ -50,6 +50,10 @@ input { border-bottom: none; } +p { + margin:0px 0px 25px 0px; +} + :host ::ng-deep .mat-tab-label .mat-tab-label-content{ font-weight: $fw-light !important; font-size: $fs-16 !important; diff --git a/frontend_v2/src/app/components/challenge/challengesettings/challengesettings.component.ts b/frontend_v2/src/app/components/challenge/challengesettings/challengesettings.component.ts index ad99ad7f5d..c246aae9ff 100644 --- a/frontend_v2/src/app/components/challenge/challengesettings/challengesettings.component.ts +++ b/frontend_v2/src/app/components/challenge/challengesettings/challengesettings.component.ts @@ -111,26 +111,6 @@ export class ChallengesettingsComponent implements OnInit, OnDestroy { * 3 -> public */ isPhaseSplitLeaderboardPublic: number = 1; - - /** - * Leaderboard precision value - */ - leaderboardPrecisionValue = 2; - - /** - * Set leaderboard precision value - */ - setLeaderboardPrecisionValue = '1.2-2'; - - /** - * If leaderboard precision value is equal to 0 - */ - minusDisabled = false; - - /** - * If leaderboard precision value is equal to 20 - */ - plusDisabled = false; /** * store worker logs @@ -750,6 +730,19 @@ export class ChallengesettingsComponent implements OnInit, OnDestroy { }; } + showCliInstructions() { + const SELF = this; + /** + * Parameters of the modal + */ + const PARAMS = { + title: 'Instructions', + label: 'evaluation_details', + isCliInstructions: true + }; + SELF.globalService.showModal(PARAMS); + } + /** * Edit Phase Details function */ @@ -934,6 +927,52 @@ export class ChallengesettingsComponent implements OnInit, OnDestroy { } } + /** + * Edit test annotations of the phase + */ + editTestAnnotations() { + const SELF = this; + SELF.apiCall = (params) => { + const FORM_DATA: FormData = new FormData(); + FORM_DATA.append('test_annotation', params['test_annotation']); + SELF.apiService + .patchFileUrl( + SELF.endpointsService.updateChallengePhaseDetailsURL(SELF.selectedPhase['challenge'], SELF.selectedPhase['id']), + FORM_DATA + ) + .subscribe( + (data) => { + SELF.globalService.showToast('success', 'The test annotations are successfully updated!'); + }, + (err) => { + SELF.globalService.showToast('error', err); + }, + () => this.logger.info('EDIT-TEST-ANNOTATION-FINISHED') + ); + }; + + /** + * Parameters of the modal + */ + const PARAMS = { + title: 'Edit Test Annotations', + confirm: 'Submit', + deny: 'Cancel', + form: [ + { + name: 'testAnnotation', + isRequired: true, + label: 'test_annotation', + placeholder: '', + type: 'file', + value: '', + }, + ], + confirmCallback: SELF.apiCall, + }; + SELF.globalService.showModal(PARAMS); + } + // Edit Leaderboard Details -> /** @@ -952,17 +991,6 @@ export class ChallengesettingsComponent implements OnInit, OnDestroy { SELF.leaderboardVisibility.state = 'Private'; SELF.leaderboardVisibility.icon = 'fa fa fa-toggle-off grey-text text-darken-1'; } - const API_PATH = SELF.endpointsService.particularChallengePhaseSplitUrl(this.selectedPhaseSplit['id']); - SELF.apiService.getUrl(API_PATH).subscribe( - (data) => { - SELF.leaderboardPrecisionValue = data.leaderboard_decimal_precision; - SELF.setLeaderboardPrecisionValue = `1.${ SELF.leaderboardPrecisionValue }-${ SELF.leaderboardPrecisionValue }`; - }, - (err) => { - SELF.globalService.handleApiError(err); - }, - () => {} - ); } } @@ -1031,30 +1059,6 @@ export class ChallengesettingsComponent implements OnInit, OnDestroy { } } - /** - * Update leaderboard decimal precision value - * @param updatedLeaderboardPrecisionValue new leaderboard precision value - */ - updateLeaderboardDecimalPrecision(updatedLeaderboardPrecisionValue) { - const API_PATH = this.endpointsService.particularChallengePhaseSplitUrl(this.selectedPhaseSplit['id']); - const SELF = this; - SELF.leaderboardPrecisionValue = updatedLeaderboardPrecisionValue; - SELF.setLeaderboardPrecisionValue = '1.' + SELF.leaderboardPrecisionValue + '-' + SELF.leaderboardPrecisionValue; - const BODY = JSON.stringify({ - leaderboard_decimal_precision: SELF.leaderboardPrecisionValue, - }); - SELF.apiService.patchUrl(API_PATH, BODY).subscribe( - (data) => { - this.minusDisabled = SELF.leaderboardPrecisionValue === 0 ? true : false; - this.plusDisabled = SELF.leaderboardPrecisionValue === 20 ? true : false; - }, - (err) => { - SELF.globalService.handleApiError(err, true); - }, - () => this.logger.info('EDIT-LEADERBOARD-PRECISION-VALUE-FINISHED') - ); - } - // Edit Evaluation Script and Criteria -> /** diff --git a/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.html b/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.html index b2afdd5a5f..71599b8c14 100644 --- a/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.html +++ b/frontend_v2/src/app/components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component.html @@ -7,7 +7,7 @@

Note: Results are greater than 5k, please use the get_all_submissions API to download results. -

+

diff --git a/frontend_v2/src/app/components/utility/modal/modal.component.html b/frontend_v2/src/app/components/utility/modal/modal.component.html index 1fbafcaff5..28f390116c 100644 --- a/frontend_v2/src/app/components/utility/modal/modal.component.html +++ b/frontend_v2/src/app/components/utility/modal/modal.component.html @@ -1,10 +1,13 @@
+
+ +
{{ title }}
-
+
{{ content }}
@@ -46,7 +49,7 @@ >
-
+
+
+
+
    +
  1. + Install evalai-cli
    + $ pip install evalai{{ cliVersion }} + +
    2. +
  2. + Add your EvalAI account token to evalai-cli
    + $ evalai set_token {{ authToken }} + +
    3. +
  3. + Upload challenge phase annotations
    + $ evalai challenge <challenge_id> phase <phase_id> submit --file annotation.json --annotation + +
    4. +
  4. + Upload challenge phase annotations > 400MB
    + $ evalai challenge <challenge_id> phase <phase_id> submit --file annotation.json --large --annotation + +
    5. +
+
+
diff --git a/frontend_v2/src/app/components/utility/modal/modal.component.scss b/frontend_v2/src/app/components/utility/modal/modal.component.scss index 813a177be3..19d3fa593f 100644 --- a/frontend_v2/src/app/components/utility/modal/modal.component.scss +++ b/frontend_v2/src/app/components/utility/modal/modal.component.scss @@ -1,4 +1,5 @@ @import './variables.scss'; +@import './mixins.scss'; .editor-validation-message { color: $highlight; @@ -10,3 +11,11 @@ margin-right: 20px; } } + +code { + max-width: 700px; +} + +.content { + width: 770px; +} diff --git a/frontend_v2/src/app/components/utility/modal/modal.component.ts b/frontend_v2/src/app/components/utility/modal/modal.component.ts index 89639303c0..319f404914 100644 --- a/frontend_v2/src/app/components/utility/modal/modal.component.ts +++ b/frontend_v2/src/app/components/utility/modal/modal.component.ts @@ -50,6 +50,11 @@ export class ModalComponent implements OnInit { */ isEditorRequired = false; + /** + * Is Cli instructions modal + */ + isCliInstructions = false; + /** * Modal edit content */ @@ -123,6 +128,16 @@ export class ModalComponent implements OnInit { width: '720px', }; + /** + * Cli version + */ + cliVersion = ''; + + /** + * Auth token + */ + authToken = ''; + /** * Modal form items */ @@ -187,6 +202,9 @@ export class ModalComponent implements OnInit { if (this.params['form'] && this.params['form'].length > 0) { this.form = this.params['form']; } + if (this.params['isCliInstructions']) { + this.isCliInstructions = this.params['isCliInstructions']; + } } this.authService.change.subscribe((details) => { @@ -196,7 +214,13 @@ export class ModalComponent implements OnInit { if (this.isEditorRequired || this.isButtonDisabled) { this.isDisabled = false; } - this.challengeService.currentChallenge.subscribe((challenge) => (this.challenge = challenge)); + this.challengeService.currentChallenge.subscribe((challenge) => { + this.challenge = challenge; + if (this.challenge.cli_version !== null) { + this.cliVersion = this.challenge.cli_version; + } + }); + this.authToken = this.globalService.getData('refreshJWT'); } /** @@ -237,6 +261,25 @@ export class ModalComponent implements OnInit { self.confirmCallback(PARAMS); } + /** + * Copy text to clipboard + */ + copyTextToClipboard(ref: HTMLElement) { + const textBox = document.createElement('textarea'); + textBox.style.position = 'fixed'; + textBox.style.left = '0'; + textBox.style.top = '0'; + textBox.style.opacity = '0'; + textBox.value = ref.innerText.split('$ ')[1]; + document.body.appendChild(textBox); + textBox.focus(); + textBox.select(); + document.execCommand('copy'); + document.body.removeChild(textBox); + + this.globalService.showToast('success', 'Command copied to clipboard'); + } + /** * Modal Denied. */