Merge pull request #5192 from topcoder-platform/new-forums

Hotfix 2 - Smoke Testing 2020/11/12 - New forums

Author: luizrrodrigues

src/shared/components/challenge-detail/Header/TabSelector/index.jsx

@@ -178,7 +178,21 @@ export default function ChallengeViewSelector(props) {
         }
         { (() => {
           if (hasRegistered || Boolean(roles.length)) {
-            if (_.isEmpty(discuss)) {
+            if (!_.isEmpty(discuss)) {
+              return (
+                discuss.map(d => (
+                  <a
+                    href={d.url}
+                    styleName={getSelectorStyle(selectedView, DETAIL_TABS.CHALLENGE_FORUM)}
+                    target="_blank"
+                    rel="oopener noreferrer"
+                  >
+                    CHALLENGE DISCUSSION
+                  </a>
+                ))
+              );
+            }
+            if (forumId > 0) {
               return (
                 <a
                   href={`${config.URL.FORUMS}${forumEndpoint}`}
@@ -190,18 +204,6 @@ export default function ChallengeViewSelector(props) {
                 </a>
               );
             }
-            return (
-              discuss.map(d => (
-                <a
-                  href={d.url}
-                  styleName={getSelectorStyle(selectedView, DETAIL_TABS.CHALLENGE_FORUM)}
-                  target="_blank"
-                  rel="oopener noreferrer"
-                >
-                  CHALLENGE DISCUSSION
-                </a>
-              ))
-            );
           }
           return '';
         })()}

src/shared/components/challenge-detail/Specification/SideBar/index.jsx

@@ -322,19 +322,21 @@ export default function SideBar({
                 pass screening.
               </a>
             </p>
-            <p styleName="link-like-paragraph">
-              Questions?
-              &zwnj;
-              {_.isEmpty(discuss) && (
-                <a
-                  href={forumLink}
-                  target="_blank"
-                  rel="oopener noreferrer"
-                >
-                  Ask in the Challenge Discussion Forums.
-                </a>
-              )}
-            </p>
+            {(forumLink || !_.isEmpty(discuss)) && (
+              <p styleName="link-like-paragraph">
+                Questions?
+                &zwnj;
+                {_.isEmpty(discuss) && (
+                  <a
+                    href={forumLink}
+                    target="_blank"
+                    rel="oopener noreferrer"
+                  >
+                    Ask in the Challenge Discussion Forums.
+                  </a>
+                )}
+              </p>
+            )}
             {!_.isEmpty(discuss) && (
               <ul>
                 { discuss.map(d => (

src/shared/components/challenge-detail/Specification/index.jsx

@@ -80,10 +80,12 @@ export default function ChallengeDetailsView(props) {
     d.type === 'challenge' && !_.isEmpty(d.url)
   ));
 
-  let forumLink = track.toLowerCase() === 'design'
-    ? `/?module=ThreadList&forumID=${forumId}`
-    : `/?module=Category&categoryID=${forumId}`;
-  forumLink = `${config.URL.FORUMS}${forumLink}`;
+  let forumLink = '';
+  if (forumId > 0) {
+    forumLink = track.toLowerCase() === 'design'
+      ? `/?module=ThreadList&forumID=${forumId}`
+      : `/?module=Category&categoryID=${forumId}`;
+  }
 
   let isWipro = false;
   const wiproCommunity = communitiesList.find(x => x.communityId === 'wipro');