SONAR-19398 Remove NewCode toggle for Applications

diff --git a/server/sonar-web/src/main/js/apps/code/components/Search.tsx b/server/sonar-web/src/main/js/apps/code/components/Search.tsx
index 69980d82774f8546d97c66da9c47851867909552..3c1323fe81b204093be4a30b8dc83796e8d8dd7e 100644 (file)
--- a/server/sonar-web/src/main/js/apps/code/components/Search.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/Search.tsx
@@ -28,7 +28,7 @@ import { getBranchLikeQuery } from '../../../helpers/branch-like';
 import { KeyboardKeys } from '../../../helpers/keycodes';
 import { translate } from '../../../helpers/l10n';
 import { BranchLike } from '../../../types/branch-like';
-import { ComponentQualifier, isView } from '../../../types/component';
+import { ComponentQualifier, isPortfolioLike, isView } from '../../../types/component';
 import { ComponentMeasure } from '../../../types/types';
 
 interface Props {
@@ -141,11 +141,13 @@ class Search extends React.PureComponent<Props, State> {
   render() {
     const { className, component, newCodeSelected } = this.props;
     const { loading, query } = this.state;
-    const isViewLike = isView(component.qualifier);
+    const isPortfolio = isPortfolioLike(component.qualifier);
+
+    const searchPlaceholder = getSearchPlaceholderLabel(component.qualifier as ComponentQualifier);
 
     return (
       <div className={classNames('sw-flex sw-items-center', className)} id="code-search">
-        {isViewLike && (
+        {isPortfolio && (
           <div className="sw-mr-4">
             <ToggleButton
               disabled={!isEmpty(query)}
@@ -166,15 +168,11 @@ class Search extends React.PureComponent<Props, State> {
         )}
         <InputSearch
           clearIconAriaLabel={translate('clear')}
-          searchInputAriaLabel={translate(
-            isViewLike ? 'code.search_placeholder.portfolio' : 'code.search_placeholder'
-          )}
+          searchInputAriaLabel={searchPlaceholder}
           minLength={3}
           onChange={this.handleQueryChange}
           onKeyDown={this.handleKeyDown}
-          placeholder={translate(
-            isViewLike ? 'code.search_placeholder.portfolio' : 'code.search_placeholder'
-          )}
+          placeholder={searchPlaceholder}
           size="large"
           value={this.state.query}
         />
@@ -185,3 +183,17 @@ class Search extends React.PureComponent<Props, State> {
 }
 
 export default withRouter(Search);
+
+function getSearchPlaceholderLabel(qualifier: ComponentQualifier) {
+  switch (qualifier) {
+    case ComponentQualifier.Portfolio:
+    case ComponentQualifier.SubPortfolio:
+      return translate('code.search_placeholder.portfolio');
+
+    case ComponentQualifier.Application:
+      return translate('code.search_placeholder.application');
+
+    default:
+      return translate('code.search_placeholder.portfolio');
+  }
+}

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 33146f4fe1f249bc20324949ba970a8156ab98a4..33576fdad2b93b40dfc16bbb293b6b3e1863a3de 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -3648,6 +3648,7 @@ api_documentation.search=Search by name...
 #------------------------------------------------------------------------------
 code.open_component_page=Open Component's Page
 code.search_placeholder=Search for files...
+code.search_placeholder.application=Search for projects...
 code.search_placeholder.portfolio=Search for projects and sub-portfolios...
 code.parent_folder=Parent folder
 code.last_analysis_date=Last analysis