Skip to content

Commit

Permalink
Merge pull request #4798 from FlowFuse/global_search_ui
Browse files Browse the repository at this point in the history
Global search UI
  • Loading branch information
cstns authored Nov 20, 2024
2 parents 4e32fe8 + 3ac03ef commit 8ea4910
Show file tree
Hide file tree
Showing 9 changed files with 674 additions and 2 deletions.
13 changes: 13 additions & 0 deletions frontend/src/api/global.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import paginateUrl from '../utils/paginateUrl.js'

import client from './client.js'

const search = (teamSlug, query) => {
const url = paginateUrl('/api/v1/search', null, null, query, { team: teamSlug })
return client.get(url)
.then(res => res.data)
}

export default {
search
}
7 changes: 7 additions & 0 deletions frontend/src/components/PageHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
</i>
<!-- FlowFuse Logo -->
<img class="ff-logo" src="/ff-logo--wordmark-caps--dark.png" @click="home()">
<global-search v-if="hasAMinimumTeamRoleOf(Roles.Viewer)" />
<!-- Mobile: Toggle(User Options) -->
<div class="flex ff-mobile-navigation-right" data-el="mobile-nav-right">
<NotificationsButton class="ff-header--mobile-notificationstoggle" :class="{'active': mobileTeamSelectionOpen}" />
Expand Down Expand Up @@ -79,16 +80,21 @@ import { mapActions, mapGetters, mapState } from 'vuex'
import navigationMixin from '../mixins/Navigation.js'
import permissionsMixin from '../mixins/Permissions.js'
import product from '../services/product.js'
import { Roles } from '../utils/roles.js'
import NavItem from './NavItem.vue'
import NotificationsButton from './NotificationsButton.vue'
import TeamSelection from './TeamSelection.vue'
import GlobalSearch from './global-search/GlobalSearch.vue'
export default {
name: 'NavBar',
mixins: [navigationMixin, permissionsMixin],
computed: {
Roles () {
return Roles
},
...mapState('account', ['user', 'team', 'teams']),
...mapState('ux', ['leftDrawer']),
...mapGetters('account', ['notifications', 'hasAvailableTeams', 'defaultUserTeam', 'canCreateTeam', 'isTrialAccount']),
Expand Down Expand Up @@ -147,6 +153,7 @@ export default {
}
},
components: {
GlobalSearch,
NavItem,
'ff-team-selection': TeamSelection,
MenuIcon,
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/drawers/RightDrawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default {
height: calc(100% - 60px);
top: 60px;
right: -1000px;
z-index: 500;
z-index: 110;
width: 100%;
max-width: 0;
min-width: 0;
Expand Down
Loading

0 comments on commit 8ea4910

Please sign in to comment.