Merge pull request #14127 from grafana/team_members_fix

Remove react warning in team members page

public/app/features/teams/TeamMembers.tsx

@@ -74,7 +74,7 @@ export class TeamMembers extends PureComponent<Props, State> {
         </td>
         </td>
         <td>{member.login}</td>
         <td>{member.login}</td>
         <td>{member.email}</td>
         <td>{member.email}</td>
-        {syncEnabled ? this.renderLabels(member.labels) : null}
+        {syncEnabled && this.renderLabels(member.labels)}
         <td className="text-right">
         <td className="text-right">
           <DeleteButton onConfirmDelete={() => this.onRemoveMember(member)} />
           <DeleteButton onConfirmDelete={() => this.onRemoveMember(member)} />
         </td>
         </td>
@@ -132,7 +132,7 @@ export class TeamMembers extends PureComponent<Props, State> {
                 <th />
                 <th />
                 <th>Name</th>
                 <th>Name</th>
                 <th>Email</th>
                 <th>Email</th>
-                {syncEnabled ? <th /> : ''}
+                {syncEnabled && <th />}
                 <th style={{ width: '1%' }} />
                 <th style={{ width: '1%' }} />
               </tr>
               </tr>
             </thead>
             </thead>