Add challenge phase detail edit feature for more fields #3491

gautamjajoo · 2021-06-20T18:54:01Z

Add challenge phase detail edit feature for following fields:

codecov-commenter · 2021-06-24T09:59:16Z

Codecov Report

Merging #3491 (82d28e3) into master (96968d6) will decrease coverage by 0.82%.
The diff coverage is 34.17%.

@@            Coverage Diff             @@
##           master    #3491      +/-   ##
==========================================
- Coverage   72.93%   72.10%   -0.83%     
==========================================
  Files          83       20      -63     
  Lines        5368     3194    -2174     
==========================================
- Hits         3915     2303    -1612     
+ Misses       1453      891     -562

Impacted Files	Coverage Δ
frontend/src/js/controllers/authCtrl.js	`53.91% <6.38%> (-12.95%)`	⬇️
frontend/src/js/controllers/profileCtrl.js	`79.76% <20.00%> (-13.10%)`	⬇️
frontend/src/js/controllers/permissionCtrl.js	`36.36% <22.22%> (-63.64%)`	⬇️
frontend/src/js/controllers/challengeCtrl.js	`64.55% <32.84%> (-9.15%)`	⬇️
frontend/src/js/controllers/updateProfileCtrl.js	`82.55% <44.44%> (-10.30%)`	⬇️
frontend/src/js/controllers/challengeListCtrl.js	`95.74% <50.00%> (+1.06%)`	⬆️
...ntend/src/js/controllers/challengeHostTeamsCtrl.js	`70.50% <66.66%> (-1.18%)`	⬇️
frontend/src/js/controllers/teamsCtrl.js	`71.17% <75.00%> (ø)`
frontend/src/js/controllers/ChallengeInviteCtrl.js	`100.00% <100.00%> (ø)`
frontend/src/js/controllers/SubmissionFilesCtrl.js	`95.45% <100.00%> (ø)`
... and 30 more

Impacted Files	Coverage Δ
frontend/src/js/controllers/authCtrl.js	`53.91% <6.38%> (-12.95%)`	⬇️
frontend/src/js/controllers/profileCtrl.js	`79.76% <20.00%> (-13.10%)`	⬇️
frontend/src/js/controllers/permissionCtrl.js	`36.36% <22.22%> (-63.64%)`	⬇️
frontend/src/js/controllers/challengeCtrl.js	`64.55% <32.84%> (-9.15%)`	⬇️
frontend/src/js/controllers/updateProfileCtrl.js	`82.55% <44.44%> (-10.30%)`	⬇️
frontend/src/js/controllers/challengeListCtrl.js	`95.74% <50.00%> (+1.06%)`	⬆️
...ntend/src/js/controllers/challengeHostTeamsCtrl.js	`70.50% <66.66%> (-1.18%)`	⬇️
frontend/src/js/controllers/teamsCtrl.js	`71.17% <75.00%> (ø)`
frontend/src/js/controllers/ChallengeInviteCtrl.js	`100.00% <100.00%> (ø)`
frontend/src/js/controllers/SubmissionFilesCtrl.js	`95.45% <100.00%> (ø)`
... and 30 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9d0e043...82d28e3. Read the comment docs.

Kajol-Kumari

@gautamjajoo The phase and submission visiblity change makes the modal to close adrupty ignoring the rest of the changes. Instead, we can make it either -

The visibility should change only after we click on submit button of the edit phase modal
or
After we select the phase, we can show three option -
a. Edit Detail - It will make the edit phase modal allowing users to edit phase details except submission and phase visibility.
b. Phase Visibility - It will allow to change only the phase visibility
c. Submission Visibility - It will allow users to change only the submission visibility

Kajol-Kumari · 2021-06-27T06:46:57Z

...v2/src/app/components/challenge/challengephases/editphasemodal/editphasemodal.component.html

@@ -76,6 +100,7 @@
        </div>
      </div>

+      <div class="row row-lr-margin">


Formatting seems a bit off in this file, please fix it.

Kajol-Kumari · 2021-06-27T06:54:31Z

...v2/src/app/components/challenge/challengephases/editphasemodal/editphasemodal.component.html

@@ -135,6 +160,43 @@
        </div>
      </div>

+      <div class="col-lg-4 col-md-4 col-sm-12 col-lr-pad">


please keep this div outside the submissions div i.e after [this] line. Moreover make a separate div and add the Max Concurrent Submissions Allowed and Allowed Submission File Types in a single row of class col-lg-6 col-md-6 col-sm-6 col-lr-pad each

Kajol-Kumari · 2021-06-27T06:54:45Z

...d_v2/src/app/components/challenge/challengephases/editphasemodal/editphasemodal.component.ts

@@ -1,6 +1,12 @@
 import { ViewChildren, QueryList, Component, Input, OnInit } from '@angular/core';
 import { GlobalService } from '../../../../services/global.service';
 import { InputComponent } from '../../../utility/input/input.component';
+import { NGXLogger } from 'ngx-logger';
+


please remove this extra line gap

Kajol-Kumari · 2021-06-27T06:55:48Z

...d_v2/src/app/components/challenge/challengephases/editphasemodal/editphasemodal.component.ts

@@ -113,6 +149,22 @@ export class EditphasemodalComponent implements OnInit {
   */
  editPhaseDetails = true;

+  /**
+   * publish challenge state and it's icon


it should be phase visibility state and it's icon instead of publish challenge state and it's icon

Kajol-Kumari · 2021-06-27T06:56:18Z

...d_v2/src/app/components/challenge/challengephases/editphasemodal/editphasemodal.component.ts

+  };
+
+  /**
+   * publish challenge state and it's icon


it should be submission visibility state and it's icon here.

Kajol-Kumari · 2021-06-27T06:57:22Z

...d_v2/src/app/components/challenge/challengephases/editphasemodal/editphasemodal.component.ts

@@ -188,6 +269,124 @@ export class EditphasemodalComponent implements OnInit {
    this.todayDateTime = new Date();
  }

+  /**
+   * Phase Visibility click function


it should be phase visibility toggle function

Kajol-Kumari · 2021-06-27T06:57:49Z

...d_v2/src/app/components/challenge/challengephases/editphasemodal/editphasemodal.component.ts

+  }
+
+  /**
+   * Submission Visibility click function


please change it to Submission Visibility toggle function

gautamjajoo · 2021-06-28T16:08:39Z

@Kajol-Kumari Done the required changes!

Kajol-Kumari

@gautamjajoo The condition for the the edit, phase visibiiity change and submission visibility change needs to be modified as after we change the visibility, the selected phase value becomes undefined but still those buttons are visible.

Ref -

Screen.Recording.2021-06-29.at.9.07.03.PM.mov

Kajol-Kumari · 2021-06-29T15:33:36Z

frontend_v2/src/app/components/challenge/challengesettings/challengesettings.component.html

+              class="btn ev-btn-dark waves-effect waves-dark grad-btn grad-btn-dark fs-12"
+              (click)="togglePhaseVisibility()"
+            >
+              <i class="{{ phaseVisibility.icon }}"></i> Phase Visibility


We need to bind the icon with the selected phase's phase visibility otherwise, it will show the ambiguous behaviour. Please see the recording below to see the ambiguity -

Screen.Recording.2021-06-29.at.8.58.45.PM.mov

Kajol-Kumari · 2021-06-29T15:34:04Z

frontend_v2/src/app/components/challenge/challengesettings/challengesettings.component.html

+              class="btn ev-btn-dark waves-effect waves-dark grad-btn grad-btn-dark fs-12"
+              (click)="toggleSubmissionVisibility()"
+            >
+              <i class="{{ submissionVisibility.icon }}"></i> Submission Visibility


Same here! Please bind it with the selected phases's submission visibility.

I believe we don't need to bind it to the particular phase, it's just that I missed the else statement.

Kajol-Kumari · 2021-06-29T15:35:48Z

...v2/src/app/components/challenge/challengephases/editphasemodal/editphasemodal.component.html

+      <div class="row row-lr-margin">
+        <div class="col-lg-6 col-md-6 col-sm-6 col-lr-pad">
+          <div class="input-field align-left">
+            <div class="fs-16 fw-regular text-med-black">Allowed Submission File Types</div>


Can we please keep Max Concurrent Submissions Allowed and Allowed Submission File Types in the same row as there is a lot of empty space on the right side. Please see the ss below -

Kajol-Kumari · 2021-06-29T15:36:07Z

...d_v2/src/app/components/challenge/challengephases/editphasemodal/editphasemodal.component.ts

@@ -2,6 +2,7 @@ import { ViewChildren, QueryList, Component, Input, OnInit } from '@angular/core
 import { GlobalService } from '../../../../services/global.service';
 import { InputComponent } from '../../../utility/input/input.component';

+


please revert this change

gautamjajoo · 2021-06-30T15:38:49Z

@gautamjajoo The condition for the the edit, phase visibiiity change and submission visibility change needs to be modified as after we change the visibility, the selected phase value becomes undefined but still those buttons are visible.

@Kajol-Kumari This error is encountered because we are fetching the phase details again after they are updated. I will look for a different method from which we can update the details.

gautamjajoo · 2021-07-01T09:02:57Z

@Kajol-Kumari @Ram81 I have updated the PR, fixing the above issues.

The error which was mentioned that the phase are not visible on the drop-down menu after phase details are updated, was becuase we were using hide-label when any phaseName was not selected. But after the details are updated, ideally the phaseName variable retained the previous phase name value. Hence, using the challenge.service whenever the phase details are updated we change the phaseName to '', which makes the label work perfectly.

Kajol-Kumari

LGTM 👍

Ram81

@gautamjajoo the Phase details button after selecting the phase should also show a edit icon. It's not clear what the Phase details button is for. Also the Phase visibility and Submission visibility toggle button can go in the Phase details pop up or they should look like toggle buttons.

gautamjajoo · 2021-07-08T11:31:39Z

@Ram81 Is this fine?

…phase-details

Ram81 · 2021-07-10T16:56:48Z

@gautamjajoo can we move the toggle bottons slightly down. They are misaligned from the labels. Also, rename Phase Visibility to Is Public

Ram81 · 2021-07-11T09:31:09Z

@gautamjajoo can you share the updated screenshot?

gautamjajoo · 2021-07-11T09:34:43Z

@Ram81 The toggle buttons are now slightly down

Ram81

LGTM

gautamjajoo added 2 commits June 21, 2021 00:20

add max_concurrent_submissions and allowed_file_types

8dd6922

add phase visibility edit option

4dc1a19

gautamjajoo added 4 commits June 24, 2021 21:31

add submission visibility edit feature

8cf98c9

edit submit page for submission visibility

76461cc

fix tests

e431540

fix typo

b3908ed

gautamjajoo requested review from Ram81 and Kajol-Kumari June 26, 2021 10:25

Kajol-Kumari suggested changes Jun 27, 2021

View reviewed changes

move buttons to settings tab

3c37494

Kajol-Kumari suggested changes Jun 29, 2021

View reviewed changes

gautamjajoo added 3 commits July 1, 2021 14:14

change phaseName after details are updated

f880797

remove unnecessary variable

87d2d08

remove the challenge and phase id from editphase modal

ef49376

Kajol-Kumari approved these changes Jul 1, 2021

View reviewed changes

Ram81 requested changes Jul 7, 2021

View reviewed changes

gautamjajoo added 2 commits July 9, 2021 12:47

add toggle feature

e054b68

Merge branch 'master' of https://github.com/Cloud-CV/EvalAI into add-…

6c29522

…phase-details

fix toggle buttons

82d28e3

Ram81 approved these changes Jul 11, 2021

View reviewed changes

Ram81 added the can-be-merged label Jul 11, 2021

Ram81 merged commit 2bc8762 into Cloud-CV:master Jul 11, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add challenge phase detail edit feature for more fields #3491

Add challenge phase detail edit feature for more fields #3491

gautamjajoo commented Jun 20, 2021 •

edited

Loading

codecov-commenter commented Jun 24, 2021 •

edited

Loading

Kajol-Kumari left a comment

Kajol-Kumari Jun 27, 2021

Kajol-Kumari Jun 27, 2021

Kajol-Kumari Jun 27, 2021

Kajol-Kumari Jun 27, 2021

Kajol-Kumari Jun 27, 2021

Kajol-Kumari Jun 27, 2021

Kajol-Kumari Jun 27, 2021

gautamjajoo commented Jun 28, 2021 •

edited

Loading

Kajol-Kumari left a comment

Kajol-Kumari Jun 29, 2021

Kajol-Kumari Jun 29, 2021

gautamjajoo Jul 1, 2021

Kajol-Kumari Jun 29, 2021

gautamjajoo Jul 1, 2021

Kajol-Kumari Jun 29, 2021

gautamjajoo commented Jun 30, 2021

gautamjajoo commented Jul 1, 2021

Kajol-Kumari left a comment

Ram81 left a comment

gautamjajoo commented Jul 8, 2021

Ram81 commented Jul 10, 2021

Ram81 commented Jul 11, 2021

gautamjajoo commented Jul 11, 2021 •

edited

Loading

Ram81 left a comment

		@@ -2,6 +2,7 @@ import { ViewChildren, QueryList, Component, Input, OnInit } from '@angular/core
		import { GlobalService } from '../../../../services/global.service';
		import { InputComponent } from '../../../utility/input/input.component';

Add challenge phase detail edit feature for more fields #3491

Add challenge phase detail edit feature for more fields #3491

Conversation

gautamjajoo commented Jun 20, 2021 • edited Loading

codecov-commenter commented Jun 24, 2021 • edited Loading

Codecov Report

Kajol-Kumari left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gautamjajoo commented Jun 28, 2021 • edited Loading

Kajol-Kumari left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gautamjajoo commented Jun 30, 2021

gautamjajoo commented Jul 1, 2021

Kajol-Kumari left a comment

Choose a reason for hiding this comment

Ram81 left a comment

Choose a reason for hiding this comment

gautamjajoo commented Jul 8, 2021

Ram81 commented Jul 10, 2021

Ram81 commented Jul 11, 2021

gautamjajoo commented Jul 11, 2021 • edited Loading

Ram81 left a comment

Choose a reason for hiding this comment

gautamjajoo commented Jun 20, 2021 •

edited

Loading

codecov-commenter commented Jun 24, 2021 •

edited

Loading

gautamjajoo commented Jun 28, 2021 •

edited

Loading

gautamjajoo commented Jul 11, 2021 •

edited

Loading