Skip to content

Commit

Permalink
WIP: New UI global search
Browse files Browse the repository at this point in the history
Resolves: #39162

Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
  • Loading branch information
nfebe committed Oct 24, 2023
1 parent c8f8a0c commit 1d78e71
Show file tree
Hide file tree
Showing 8 changed files with 572 additions and 0 deletions.
65 changes: 65 additions & 0 deletions core/src/components/GlobalSearch/SearchFilterChip.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<template>
<div class="chip">
<span class="icon">
<slot v-if="filter.type === 'app' || filter.type === 'person'" name="icon" />
<span v-if="filter.type == 'date'"> {{ filter.pretext }} : </span>
</span>
<span class="text">{{ filter.text }}</span>
<span class="close-icon" @click="removeChip">
<CloseIcon :size="16" />
</span>
</div>
</template>

<script>
import CloseIcon from 'vue-material-design-icons/CloseThick.vue'
export default {
name: 'SearchFilterChip',
components: {
CloseIcon,
},
props: {
filter: Object,
},
methods: {
removeChip() {
this.$emit('remove-filter', this.filter)
},
},
}
</script>

<style lang="scss" scoped>
.chip {
display: flex;
align-items: center;
padding: 2px 4px;
border: 1px solid var(--color-primary-element-light);
border-radius: 20px;
background-color: var(--color-primary-element-light);
margin: 2px;
font-size: 10px;
font-weight: bolder;
.icon {
display: flex;
align-items: center;
height: 20px;
padding-right: 5px;
}
.text {
margin: 0 2px;
}
.close-icon {
cursor: pointer;
:hover {
border-radius: 4px;
padding: 1px;
}
}
}
</style>
55 changes: 55 additions & 0 deletions core/src/global-search.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/**
* @copyright Copyright (c) 2020 Fon E. Noel NFEBE <fenn25.fn@gmail.com>
*
* @author Fon E. Noel NFEBE <fenn25.fn@gmail.com>
*
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

import { getLoggerBuilder } from '@nextcloud/logger'
import { getRequestToken } from '@nextcloud/auth'
import { translate as t, translatePlural as n } from '@nextcloud/l10n'
import Vue from 'vue'

import GlobalSearch from './views/GlobalSearch.vue'

// eslint-disable-next-line camelcase
__webpack_nonce__ = btoa(getRequestToken())

const logger = getLoggerBuilder()
.setApp('global-search')
.detectUser()
.build()

Vue.mixin({
data() {
return {
logger,
}
},
methods: {
t,
n,
},
})

export default new Vue({
el: '#global-search',
// eslint-disable-next-line vue/match-component-file-name
name: 'GlobalSearchRoot',
render: h => h(GlobalSearch),
})
93 changes: 93 additions & 0 deletions core/src/services/GlobalSearchService.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
/**
* @copyright 2023, Fon E. Noel NFEBE <fenn25.fn@gmail.com>
*
* @author Fon E. Noel NFEBE <fenn25.fn@gmail.com>
*
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

import { generateOcsUrl } from '@nextcloud/router'
import { loadState } from '@nextcloud/initial-state'
import axios from '@nextcloud/axios'

export const defaultLimit = loadState('unified-search', 'limit-default')
export const minSearchLength = loadState('unified-search', 'min-search-length', 1)
export const enableLiveSearch = loadState('unified-search', 'live-search', true)

export const regexFilterIn = /(^|\s)in:([a-z_-]+)/ig
export const regexFilterNot = /(^|\s)-in:([a-z_-]+)/ig

/**
* Create a cancel token
*
* @return {import('axios').CancelTokenSource}
*/
const createCancelToken = () => axios.CancelToken.source()

/**
* Get the list of available search providers
*
* @return {Promise<Array>}
*/
export async function getProviders() {
try {
const { data } = await axios.get(generateOcsUrl('search/providers'), {
params: {
// Sending which location we're currently at
from: window.location.pathname.replace('/index.php', '') + window.location.search,
},
})
if ('ocs' in data && 'data' in data.ocs && Array.isArray(data.ocs.data) && data.ocs.data.length > 0) {
// Providers are sorted by the api based on their order key
return data.ocs.data
}
} catch (error) {
console.error(error)
}
return []
}

/**
* Get the list of available search providers
*
* @param {object} options destructuring object
* @param {string} options.type the type to search
* @param {string} options.query the search
* @param {number|string|undefined} options.cursor the offset for paginated searches
* @return {object} {request: Promise, cancel: Promise}
*/
export function search({ type, query, cursor }) {
/**
* Generate an axios cancel token
*/
const cancelToken = createCancelToken()

const request = async () => axios.get(generateOcsUrl('search/providers/{type}/search', { type }), {
cancelToken: cancelToken.token,
params: {
term: query,
cursor,
// Sending which location we're currently at
from: window.location.pathname.replace('/index.php', '') + window.location.search,
},
})

return {
request,
cancel: cancelToken.cancel,
}
}
61 changes: 61 additions & 0 deletions core/src/views/GlobalSearch.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<!--
- @copyright Copyright (c) 2020 Fon E. Noel NFEBE <fenn25.fn@gmail.com>
-
- @author Fon E. Noel NFEBE <fenn25.fn@gmail.com>
-
- @license GNU AGPL version 3 or any later version
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-->
<template>
<div>

Check failure on line 23 in core/src/views/GlobalSearch.vue

View workflow job for this annotation

GitHub Actions / eslint

Expected "\t" character, but found " " character
<NcButton aria-label="Global search" @click="toggleGlobalSearch">

Check failure on line 24 in core/src/views/GlobalSearch.vue

View workflow job for this annotation

GitHub Actions / eslint

Expected "\t" character, but found " " character
<template #icon>

Check failure on line 25 in core/src/views/GlobalSearch.vue

View workflow job for this annotation

GitHub Actions / eslint

Expected "\t" character, but found " " character
<Magnify class="unified-search__trigger" :size="22" />

Check failure on line 26 in core/src/views/GlobalSearch.vue

View workflow job for this annotation

GitHub Actions / eslint

Expected "\t" character, but found " " character
</template>

Check failure on line 27 in core/src/views/GlobalSearch.vue

View workflow job for this annotation

GitHub Actions / eslint

Expected "\t" character, but found " " character
</NcButton>

Check failure on line 28 in core/src/views/GlobalSearch.vue

View workflow job for this annotation

GitHub Actions / eslint

Expected "\t" character, but found " " character
<GlobalSearchModal :isVisible="showGlobalSearch" />

Check failure on line 29 in core/src/views/GlobalSearch.vue

View workflow job for this annotation

GitHub Actions / eslint

Expected "\t" character, but found " " character
</div>

Check failure on line 30 in core/src/views/GlobalSearch.vue

View workflow job for this annotation

GitHub Actions / eslint

Expected "\t" character, but found " " character
</template>

<script>
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import Magnify from 'vue-material-design-icons/Magnify.vue'
import GlobalSearchModal from './GlobalSearchModal.vue';

Check failure on line 36 in core/src/views/GlobalSearch.vue

View workflow job for this annotation

GitHub Actions / eslint

Extra semicolon

export default {
name: 'GlobalSearch',

Check failure on line 39 in core/src/views/GlobalSearch.vue

View workflow job for this annotation

GitHub Actions / eslint

Expected indentation of 1 tab but found 4 spaces
components: {
NcButton,
Magnify,
GlobalSearchModal,
},
data() {
return {
showGlobalSearch: false,
};
},
mounted() {
console.debug("Global search initialized!")
},
methods: {
toggleGlobalSearch() {
this.showGlobalSearch = !this.showGlobalSearch
}
}
};
</script>

<style lang="scss" scoped></style>
Loading

0 comments on commit 1d78e71

Please sign in to comment.