Merge pull request #1563 from topcoder-platform/develop

Prod deploy Aug 18 2023 - v20.12

Author: jmgasper

src/actions/users.js

@@ -0,0 +1,35 @@
+/**
+ * Sidebar related redux actions
+ */
+import { fetchMemberProjects } from '../services/projects'
+import {
+  LOAD_ALL_USER_PROJECTS_PENDING,
+  LOAD_ALL_USER_PROJECTS_SUCCESS,
+  LOAD_ALL_USER_PROJECTS_FAILURE
+} from '../config/constants'
+
+/**
+ * Loads projects of the authenticated user
+ */
+export function loadAllUserProjects (isAdmin = true) {
+  return (dispatch) => {
+    dispatch({
+      type: LOAD_ALL_USER_PROJECTS_PENDING
+    })
+
+    const filters = {
+      status: 'active',
+      sort: 'lastActivityAt desc'
+    }
+    if (!isAdmin) {
+      filters['memberOnly'] = true
+    }
+
+    fetchMemberProjects(filters).then(projects => dispatch({
+      type: LOAD_ALL_USER_PROJECTS_SUCCESS,
+      projects
+    })).catch(() => dispatch({
+      type: LOAD_ALL_USER_PROJECTS_FAILURE
+    }))
+  }
+}

src/components/ChallengeEditor/ChallengeView/index.js

@@ -207,6 +207,12 @@ const ChallengeView = ({
                 )}
               </>
             )}
+            <div className={styles.row}>
+              <div className={styles.col}>
+                <span className={styles.fieldTitle}>Timezone:</span>
+                {Intl.DateTimeFormat().resolvedOptions().timeZone}
+              </div>
+            </div>
             {
               challenge.legacy.subTrack === 'WEB_DESIGNS' && challenge.phases.length === 8 ? phases.map((phase, index) => (
                 <PhaseInput

src/components/ChallengeEditor/Resources/index.js

@@ -161,8 +161,6 @@ export default class Resources extends React.Component {
     const currentPhase = getCurrentPhase(challenge).toLowerCase()
     const isCurrentPhasesNotSubmissionOrRegistration = _.every(['submission', 'registration'], (phase) => currentPhase.indexOf(phase) < 0)
     const exceptionHandlesDeleteList = {}
-    // The creator of the challenge can't be deleted
-    exceptionHandlesDeleteList[challenge.createdBy] = true
     _.forEach(submissions, (s) => {
       // do not allow to delete submitters who submitted
       exceptionHandlesDeleteList[s.createdBy] = true
@@ -182,13 +180,26 @@ export default class Resources extends React.Component {
         ], (status) => challenge.status.toUpperCase() === status)
       ) {
         if (
+          // The creator of the challenge can't be deleted
+          resourceItem.memberHandle === challenge.createdBy
+        ) {
+          // where the copilot has multiple roles, we should allow the additional roles to be deleted, but not the copilot role
+          if (`${resourceItem.role}`.toLowerCase().indexOf('copilot') >= 0) {
+            exceptionResourceIdDeleteList[resourceItem.id] = true
+          }
+        } else if (
           // Copilots can't delete themselves from the challenge
           loggedInUserResource &&
           _.some(loggedInUserResource.roles, (role) => `${role}`.toLowerCase().indexOf('copilot') >= 0) &&
           loggedInUserResource.memberHandle === resourceItem.memberHandle
         ) {
           exceptionResourceIdDeleteList[resourceItem.id] = true
         }
+      } else if (
+        // The creator of the challenge can't be deleted
+        resourceItem.memberHandle === challenge.createdBy
+      ) {
+        exceptionResourceIdDeleteList[resourceItem.id] = true
       } else if (
         // If the current phase is not submission or registration
         // then we will disable removing reviewers and copilots.

src/components/ChallengeEditor/index.js

@@ -1749,6 +1749,12 @@ class ChallengeEditor extends Component {
             )}
             {!isTask && (
                 <>
+                  <div className={styles.row}>
+                    <div className={styles.col}>
+                      <span className={styles.fieldTitle}>Timezone:</span>
+                      {Intl.DateTimeFormat().resolvedOptions().timeZone}
+                    </div>
+                  </div>
                   {
                     phases.map((phase, index) => (
                       <PhaseInput

src/components/Sidebar/Sidebar.module.scss

@@ -57,6 +57,10 @@ export const LOAD_PROJECTS_PENDING = 'LOAD_PROJECTS_PENDING'
 export const LOAD_PROJECTS_FAILURE = 'LOAD_PROJECTS_FAILURE'
 export const UNLOAD_PROJECTS_SUCCESS = 'UNLOAD_PROJECTS_SUCCESS'
 
+export const LOAD_ALL_USER_PROJECTS_SUCCESS = 'LOAD_ALL_USER_PROJECTS_SUCCESS'
+export const LOAD_ALL_USER_PROJECTS_PENDING = 'LOAD_ALL_USER_PROJECTS_PENDING'
+export const LOAD_ALL_USER_PROJECTS_FAILURE = 'LOAD_ALL_USER_PROJECTS_FAILURE'
+
 // project billingAccount
 export const LOAD_PROJECT_BILLING_ACCOUNT = 'LOAD_PROJECT_BILLING_ACCOUNT'
 export const LOAD_PROJECT_BILLING_ACCOUNT_PENDING = 'LOAD_PROJECT_BILLING_ACCOUNT_PENDING'