Fix/unified search papercuts

apps/settings/src/components/UserList.vue

@@ -426,17 +426,17 @@ export default {
 		/**
 		 * Register search
 		 */
-		subscribe('nextcloud:unified-search:search', this.search)
-		subscribe('nextcloud:unified-search:reset', this.resetSearch)
+		subscribe('nextcloud:unified-search.search', this.search)
+		subscribe('nextcloud:unified-search.reset', this.resetSearch)
 
 		/**
 		 * If disabled group but empty, redirect
 		 */
 		this.redirectIfDisabled()
 	},
 	beforeDestroy() {
-		unsubscribe('nextcloud:unified-search:search', this.search)
-		unsubscribe('nextcloud:unified-search:reset', this.resetSearch)
+		unsubscribe('nextcloud:unified-search.search', this.search)
+		unsubscribe('nextcloud:unified-search.reset', this.resetSearch)
 	},
 
 	methods: {

apps/settings/src/views/Apps.vue

@@ -280,12 +280,12 @@ export default {
 	},
 
 	mounted() {
-		subscribe('nextcloud:unified-search:search', this.setSearch)
-		subscribe('nextcloud:unified-search:reset', this.resetSearch)
+		subscribe('nextcloud:unified-search.search', this.setSearch)
+		subscribe('nextcloud:unified-search.reset', this.resetSearch)
 	},
 	beforeDestroy() {
-		unsubscribe('nextcloud:unified-search:search', this.setSearch)
-		unsubscribe('nextcloud:unified-search:reset', this.resetSearch)
+		unsubscribe('nextcloud:unified-search.search', this.setSearch)
+		unsubscribe('nextcloud:unified-search.reset', this.resetSearch)
 	},
 
 	methods: {

core/src/logger.js

@@ -1,4 +1,4 @@
-/*
+/**
  * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
  *
  * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>

core/src/login.js

@@ -1,4 +1,4 @@
-/*
+/**
  * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
  *
  * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>

core/src/maintenance.js

@@ -1,4 +1,4 @@
-/*
+/**
  * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
  *
  * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>

core/src/recommendedapps.js

@@ -1,4 +1,4 @@
-/*
+/**
  * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
  *
  * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>

core/src/services/UnifiedSearchService.js

@@ -28,6 +28,12 @@ export const minSearchLength = 2
 export const regexFilterIn = /[^-]in:([a-z_-]+)/ig
 export const regexFilterNot = /-in:([a-z_-]+)/ig
 
+/**
+ * Create a cancel token
+ * @returns {CancelTokenSource}
+ */
+const createCancelToken = () => axios.CancelToken.source()
+
 /**
  * Get the list of available search providers
  *
@@ -54,18 +60,30 @@ export async function getTypes() {
 /**
  * Get the list of available search providers
  *
- * @param {string} type the type to search
- * @param {string} query the search
- * @param {int|string|undefined} cursor the offset for paginated searches
- * @returns {Promise}
+ * @param {Object} options destructuring object
+ * @param {string} options.type the type to search
+ * @param {string} options.query the search
+ * @param {int|string|undefined} options.cursor the offset for paginated searches
+ * @returns {Object} {request: Promise, cancel: Promise}
  */
-export function search(type, query, cursor) {
-	return axios.get(generateOcsUrl('search', 2) + `providers/${type}/search`, {
+export function search({ type, query, cursor }) {
+	/**
+	 * Generate an axios cancel token
+	 */
+	const cancelToken = createCancelToken()
+
+	const request = async() => axios.get(generateOcsUrl('search', 2) + `providers/${type}/search`, {
+		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,
+	}
 }

core/src/session-heartbeat.js

@@ -1,4 +1,4 @@
-/*
+/**
  * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
  *
  * @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>

core/src/unified-search.js

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { getRequestToken } from '@nextcloud/auth'
 import { generateFilePath } from '@nextcloud/router'
+import { getLoggerBuilder } from '@nextcloud/logger'
+import { getRequestToken } from '@nextcloud/auth'
 import { translate as t, translatePlural as n } from '@nextcloud/l10n'
 import Vue from 'vue'
 
@@ -32,7 +33,17 @@ __webpack_nonce__ = btoa(getRequestToken())
 // eslint-disable-next-line camelcase
 __webpack_public_path__ = generateFilePath('core', '', 'js/')
 
+const logger = getLoggerBuilder()
+	.setApp('unified-search')
+	.detectUser()
+	.build()
+
 Vue.mixin({
+	data() {
+		return {
+			logger,
+		}
+	},
 	methods: {
 		t,
 		n,