Merge pull request #1219 from nextcloud/dependabot/npm_and_yarn/nextc…

…loud/router-2.1.2

__mocks__/@nextcloud/axios.js

@@ -4,11 +4,10 @@ const wsData = require('./activity_ws.json')
 
 axios.get = function(url) {
 	return new Promise((resolve, reject) => {
-		if (url === 'http://localhostundefined/ocs/v2.php/apps/activity/api/v2/activity/filter') {
+		if (url === 'http://localhost/ocs/v2.php/apps/activity/api/v2/activity/filter') {
 			resolve({ data: wsData })
 		} else {
-			// eslint-disable-next-line no-console
-			console.log(url)
+			reject(new Error(`URL not defined ${url}`))
 		}
 	})
 }

js/activity-206.js.LICENSE.txt

@@ -0,0 +1,22 @@
+/*!
+ * Determine if an object is a Buffer
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+/*!
+* focus-trap 7.2.0
+* @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE
+*/
+
+/*!
+* tabbable 6.0.1
+* @license MIT, https://github.com/focus-trap/tabbable/blob/master/LICENSE
+*/
+
+/*! @license DOMPurify 2.4.5 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.4.5/LICENSE */
+
+/*! For license information please see NcAvatar.js.LICENSE.txt */
+
+/*! For license information please see NcUserBubble.js.LICENSE.txt */

js/activity-425.js.LICENSE.txt

@@ -0,0 +1,22 @@
+/*!
+ * Determine if an object is a Buffer
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+/*!
+* focus-trap 7.2.0
+* @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE
+*/
+
+/*!
+* tabbable 6.0.1
+* @license MIT, https://github.com/focus-trap/tabbable/blob/master/LICENSE
+*/
+
+/*! @license DOMPurify 2.4.5 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.4.5/LICENSE */
+
+/*! For license information please see NcAvatar.js.LICENSE.txt */
+
+/*! For license information please see NcUserBubble.js.LICENSE.txt */

js/activity-499.js.LICENSE.txt

@@ -0,0 +1,63 @@
+/*!
+ * Determine if an object is a Buffer
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+/*!
+ * Vue.js v2.7.14
+ * (c) 2014-2022 Evan You
+ * Released under the MIT License.
+ */
+
+/*!
+ * escape-html
+ * Copyright(c) 2012-2013 TJ Holowaychuk
+ * Copyright(c) 2015 Andreas Lubbe
+ * Copyright(c) 2015 Tiancheng "Timothy" Gu
+ * MIT Licensed
+ */
+
+/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
+
+/**
+ * @copyright Copyright (c) 2021 Louis Chemineau <louis@chmn.me>
+ *
+ * @author Louis Chemineau <louis@chmn.me>
+ *
+ * @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/>.
+ *
+ */
+
+//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+
+//! license : MIT
+
+//! moment.js
+
+//! moment.js locale configuration
+
+//! momentjs.com
+
+//! version : 2.29.4

package.json

@@ -85,7 +85,7 @@
     "@nextcloud/logger": "^2.5.0",
     "@nextcloud/moment": "^1.2.1",
     "@nextcloud/paths": "^2.1.0",
-    "@nextcloud/router": "^2.0.0",
+    "@nextcloud/router": "^2.1.2",
     "@nextcloud/vue": "^7.12.0",
     "@nextcloud/vue-dashboard": "^2.0.1",
     "@nextcloud/vue-richtext": "^2.0.4",

src/views/ActivityTab.vue

@@ -25,7 +25,7 @@
 		<!-- error message -->
 		<NcEmptyContent v-if="error" :title="error">
 			<template #icon>
-				<span class="icon-error"></span>
+				<span class="icon-error" />
 			</template>
 		</NcEmptyContent>
 		<template v-else>
@@ -39,7 +39,7 @@
 			<NcEmptyContent v-if="activities.length === 0 && !loading"
 				:title="t('activity', 'No activity yet')">
 				<template #icon>
-					<span class="icon-activity"></span>
+					<span class="icon-activity" />
 				</template>
 			</NcEmptyContent>
 		</template>
@@ -48,6 +48,7 @@
 
 <script>
 import { generateOcsUrl } from '@nextcloud/router'
+import { translate } from '@nextcloud/l10n'
 import axios from '@nextcloud/axios'
 import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 
@@ -107,7 +108,7 @@ export default {
 					this.loading = false
 					return
 				}
-				this.error = t('activity', 'Unable to load the activity list')
+				this.error = translate('activity', 'Unable to load the activity list')
 				this.loading = false
 				console.error('Error loading the activity list', error)
 			}
@@ -137,6 +138,8 @@ export default {
 				logger.debug(`Processed ${this.activities.length} activity(ies)`, { activities: this.activities, fileInfo: this.fileInfo })
 			}
 		},
+
+		t: translate,
 	},
 }
 </script>