Move select component to management component

Author: d-rita

frontend/src/components/teamsAndOrgs/management.js

@@ -8,6 +8,7 @@ import { useFetch } from '../../hooks/UseFetch';
 import { CustomButton } from '../button';
 import { PlusIcon, WasteIcon } from '../svgIcons';
 import { ProjectFilterSelect } from '../projects/filterSelectFields';
+import ClearFilters from '../projects/clearFilters';
 
 export const ViewAllLink = ({ link }: Object) => (
   <Link to={link} className="dib mt2 fr red link">
@@ -115,6 +116,14 @@ export function Management(props) {
             </CustomButton>
           </div>
         )}
+        {props.section === 'teams' ? (
+          <div>
+            <TeamFilter query={props.query} setQuery={props.setQuery} />
+            <ClearFilters url={'/manage/teams/'} className="v-top mh1 mt1 mt2-ns dib" />
+          </div>
+        ) : (
+          ''
+        )}
       </div>
       <div className="w-100 cf dib">{props.children}</div>
     </div>

frontend/src/components/teamsAndOrgs/teams.js

@@ -9,17 +9,9 @@ import { useQueryParams, StringParam } from 'use-query-params';
 import messages from './messages';
 import { useEditTeamAllowed } from '../../hooks/UsePermissions';
 import { UserAvatar, UserAvatarList } from '../user/avatar';
-import {
-  AddButton,
-  ViewAllLink,
-  Management,
-  VisibilityBox,
-  InviteOnlyBox,
-  TeamFilter,
-} from './management';
+import { AddButton, ViewAllLink, Management, VisibilityBox, InviteOnlyBox } from './management';
 import { SwitchToggle, RadioField, OrganisationSelectInput } from '../formInputs';
 import { Button, EditButton } from '../button';
-import ClearFilters from '../projects/clearFilters';
 
 export function TeamsManagement({
   teams,
@@ -56,12 +48,10 @@ export function TeamsManagement({
       userOnly={userTeamsOnly}
       setUserOnly={setUserTeamsOnly}
       userOnlyLabel={<FormattedMessage {...messages.myTeams} />}
+      section={'teams'}
+      query={query}
+      setQuery={setQuery}
     >
-      <div>
-        <TeamFilter query={query} setQuery={setQuery} />
-        <ClearFilters url={'/manage/teams/'} className="v-top mh1 mt1 mt2-ns dib" />
-      </div>
-
       {filteredTeams.length ? (
         filteredTeams.map((team, n) => (
           <TeamCard team={team} key={n} managementView={managementView} />