From 93bc0537dcb06d08d4f4ecf4f55d0539caa12268 Mon Sep 17 00:00:00 2001
From: Grégoire Aubert <gregoire.aubert@sonarsource.com>
Date: Thu, 27 Sep 2018 15:51:22 +0200
Subject: SONAR-11270 Allow to set default template to APP

---
 .../src/main/js/app/components/nav/global/GlobalNavPlus.tsx          | 2 +-
 .../src/main/js/apps/permission-templates/components/AppContainer.js | 5 +----
 .../src/main/js/apps/permissions/shared/components/HoldersList.tsx   | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'server')

diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavPlus.tsx b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavPlus.tsx
index e702ca72b3d..1f67682cdc8 100644
--- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavPlus.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavPlus.tsx
@@ -170,9 +170,9 @@ export class GlobalNavPlus extends React.PureComponent<Props & WithRouterProps,
         {this.state.governanceReady &&
           this.state.createPortfolio && (
             <CreateFormShim
+              defaultQualifier={defaultQualifier}
               onClose={this.closeCreatePortfolioForm}
               onCreate={this.handleCreatePortfolio}
-              defaultQualifier={defaultQualifier}
             />
           )}
       </>
diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/AppContainer.js b/server/sonar-web/src/main/js/apps/permission-templates/components/AppContainer.js
index 0b45197d190..c66f1f0b31e 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/AppContainer.js
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/AppContainer.js
@@ -22,9 +22,6 @@ import App from './App';
 import forSingleOrganization from '../../organizations/forSingleOrganization';
 import { getAppState } from '../../../store/rootReducer';
 
-const mapStateToProps = state => ({
-  // treat applications as portfolios
-  topQualifiers: getAppState(state).qualifiers.filter(q => q !== 'APP')
-});
+const mapStateToProps = state => ({ topQualifiers: getAppState(state).qualifiers });
 
 export default forSingleOrganization(connect(mapStateToProps)(App));
diff --git a/server/sonar-web/src/main/js/apps/permissions/shared/components/HoldersList.tsx b/server/sonar-web/src/main/js/apps/permissions/shared/components/HoldersList.tsx
index 5dd7cbd16da..ef234d81905 100644
--- a/server/sonar-web/src/main/js/apps/permissions/shared/components/HoldersList.tsx
+++ b/server/sonar-web/src/main/js/apps/permissions/shared/components/HoldersList.tsx
@@ -55,7 +55,7 @@ export default class HoldersList extends React.PureComponent<Props> {
   renderItem(item: PermissionUser | PermissionGroup, permissions: PermissionDefinitions) {
     return this.isPermissionUser(item) ? (
       <UserHolder
-        key={'user-' + item.login}
+        key={`user-${item.login}`}
         onToggle={this.props.onToggleUser}
         permissions={permissions}
         selectedPermission={this.props.selectedPermission}
@@ -64,7 +64,7 @@ export default class HoldersList extends React.PureComponent<Props> {
     ) : (
       <GroupHolder
         group={item}
-        key={'group-' + item.id}
+        key={`group-${item.id || item.name}`}
         onToggle={this.props.onToggleGroup}
         permissions={permissions}
         selectedPermission={this.props.selectedPermission}
-- 
cgit v1.2.3