]> source.dussan.org Git - sonarqube.git/commitdiff
SONAR-10713 Fix for front-end
authorPascal Mugnier <pascal.mugnier@sonarsource.com>
Thu, 24 May 2018 09:59:05 +0000 (11:59 +0200)
committerSonarTech <sonartech@sonarsource.com>
Mon, 28 May 2018 18:20:45 +0000 (20:20 +0200)
server/sonar-web/src/main/js/apps/overview/components/OverviewApp.tsx
server/sonar-web/src/main/js/apps/overview/meta/Meta.tsx

index 097e642860fec08af7b62e887a353c91a8a37f7e..8ef2e87550916df97d1c4e44a2e28a5e7b24ca38 100644 (file)
@@ -176,15 +176,15 @@ export class OverviewApp extends React.PureComponent<Props, State> {
 
   renderEmpty() {
     const { component } = this.props;
-    const isProject = component.qualifier === 'TRK';
+    const isApp = component.qualifier === 'APP';
     return (
       <div className="overview-main page-main">
         <h3>
           {!this.state.measures ||
           !this.state.measures.find(measure => measure.metric.key === 'projects')
-            ? translate(isProject ? 'overview.project.empty' : 'portfolio.app.empty')
+            ? translate(isApp ? 'portfolio.app.empty' : 'overview.project.empty')
             : translate(
-                isProject ? 'overview.project.no_lines_of_code' : 'portfolio.app.no_lines_of_code'
+                isApp ? 'portfolio.app.no_lines_of_code' : 'overview.project.no_lines_of_code'
               )}
         </h3>
       </div>
index 631c258e268cec86f3a64249f2377bcede5216f4..37d1618f37d50a36aa44545c3987f685862ec94f 100644 (file)
@@ -54,6 +54,7 @@ export default class Meta extends React.PureComponent<Props> {
     const { qualifier, description, qualityProfiles, qualityGate, visibility } = component;
 
     const isProject = qualifier === 'TRK';
+    const isApp = qualifier === 'APP';
     const isPrivate = visibility === Visibility.Private;
 
     return (
@@ -104,15 +105,16 @@ export default class Meta extends React.PureComponent<Props> {
           {organizationsEnabled && <MetaOrganizationKey organization={component.organization} />}
         </div>
 
-        {!isPrivate && (
-          <BadgesModal
-            branchLike={branchLike}
-            metrics={metrics}
-            onSonarCloud={onSonarCloud}
-            project={component.key}
-            qualifier={component.qualifier}
-          />
-        )}
+        {!isPrivate &&
+          (isProject || isApp) && (
+            <BadgesModal
+              branchLike={branchLike}
+              metrics={metrics}
+              onSonarCloud={onSonarCloud}
+              project={component.key}
+              qualifier={component.qualifier}
+            />
+          )}
       </div>
     );
   }