From 0df96b3d8ae71aac2b02428b4f550764f68031cf Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Fri, 30 Apr 2021 18:56:21 -0400
Subject: [PATCH] Refresh permissions more eagerly in settings (#5404)

* Update package-lock (again?)

* Reload permissions close too

Fixes #5307
---
 .../item/components/permissions-overview.vue  |  6 ++--
 package-lock.json                             | 32 ++++++++++++++-----
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/app/src/modules/settings/routes/roles/item/components/permissions-overview.vue b/app/src/modules/settings/routes/roles/item/components/permissions-overview.vue
index 90aab5f685..fd3eac2036 100644
--- a/app/src/modules/settings/routes/roles/item/components/permissions-overview.vue
+++ b/app/src/modules/settings/routes/roles/item/components/permissions-overview.vue
@@ -44,7 +44,7 @@
 			</span>
 		</div>
 
-		<router-view name="permissionsDetail" :role-key="role" :permission-key="permission" @refresh="refreshPermission" />
+		<router-view name="permissionsDetail" :role-key="role" :permission-key="permission" />
 
 		<v-dialog @toggle="resetActive = false" :active="!!resetActive" @esc="resetActive = false">
 			<v-card>
@@ -63,7 +63,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, computed, ref, provide } from '@vue/composition-api';
+import { defineComponent, computed, ref, provide, watch } from '@vue/composition-api';
 import { useCollectionsStore } from '@/stores';
 import PermissionsOverviewHeader from './permissions-overview-header.vue';
 import PermissionsOverviewRow from './permissions-overview-row.vue';
@@ -108,6 +108,8 @@ export default defineComponent({
 
 		fetchPermissions();
 
+		watch(() => props.permission, fetchPermissions, { immediate: true });
+
 		provide('refresh-permissions', fetchPermissions);
 
 		return {
diff --git a/package-lock.json b/package-lock.json
index 93a15a9f8c..4ae56e3e3b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -74,7 +74,6 @@
 				"camelcase": "^6.2.0",
 				"chalk": "^4.1.1",
 				"commander": "^6.2.0",
-				"connect-memcached": "^1.0.0",
 				"cookie-parser": "^1.4.5",
 				"cors": "^2.8.5",
 				"date-fns": "^2.21.1",
@@ -153,6 +152,7 @@
 			},
 			"optionalDependencies": {
 				"@keyv/redis": "^2.1.2",
+				"connect-memcached": "^1.0.0",
 				"connect-redis": "^5.2.0",
 				"ioredis": "^4.19.2",
 				"keyv-memcache": "^1.0.1",
@@ -13267,6 +13267,7 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/connect-memcached/-/connect-memcached-1.0.0.tgz",
 			"integrity": "sha1-e+LfsI6g50bYe6a1HQHBYDslXtM=",
+			"optional": true,
 			"dependencies": {
 				"buffer-from": "1.1.0",
 				"memcached": "2.2.x"
@@ -13278,7 +13279,8 @@
 		"node_modules/connect-memcached/node_modules/buffer-from": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz",
-			"integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ=="
+			"integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==",
+			"optional": true
 		},
 		"node_modules/connect-redis": {
 			"version": "5.2.0",
@@ -13292,7 +13294,8 @@
 		"node_modules/connection-parse": {
 			"version": "0.0.7",
 			"resolved": "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz",
-			"integrity": "sha1-GOcxiqsGppkmc3KxDFIm0locmmk="
+			"integrity": "sha1-GOcxiqsGppkmc3KxDFIm0locmmk=",
+			"optional": true
 		},
 		"node_modules/consola": {
 			"version": "2.15.3",
@@ -22783,6 +22786,7 @@
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/hashring/-/hashring-3.2.0.tgz",
 			"integrity": "sha1-/aTv3oqiLNuX+x0qZeiEAeHBRM4=",
+			"optional": true,
 			"dependencies": {
 				"connection-parse": "0.0.x",
 				"simple-lru-cache": "0.0.x"
@@ -24694,6 +24698,7 @@
 			"version": "0.0.6",
 			"resolved": "https://registry.npmjs.org/jackpot/-/jackpot-0.0.6.tgz",
 			"integrity": "sha1-PP8GQoXL9m9OqyWTyQvOgWqCGEk=",
+			"optional": true,
 			"dependencies": {
 				"retry": "0.6.0"
 			}
@@ -24702,6 +24707,7 @@
 			"version": "0.6.0",
 			"resolved": "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz",
 			"integrity": "sha1-HAEHEyeab9Ho3vKK8MP/GHHKpTc=",
+			"optional": true,
 			"engines": {
 				"node": "*"
 			}
@@ -27694,6 +27700,7 @@
 			"version": "2.2.2",
 			"resolved": "https://registry.npmjs.org/memcached/-/memcached-2.2.2.tgz",
 			"integrity": "sha1-aPhsz9hLz5PMJe1G1tf8DHUhydU=",
+			"optional": true,
 			"dependencies": {
 				"hashring": "3.2.x",
 				"jackpot": ">=0.0.6"
@@ -36599,7 +36606,8 @@
 		"node_modules/simple-lru-cache": {
 			"version": "0.0.2",
 			"resolved": "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz",
-			"integrity": "sha1-1ZzDoZPBpdAyD4Tucy9uRxPlEd0="
+			"integrity": "sha1-1ZzDoZPBpdAyD4Tucy9uRxPlEd0=",
+			"optional": true
 		},
 		"node_modules/simple-swizzle": {
 			"version": "0.2.2",
@@ -61724,6 +61732,7 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/connect-memcached/-/connect-memcached-1.0.0.tgz",
 			"integrity": "sha1-e+LfsI6g50bYe6a1HQHBYDslXtM=",
+			"optional": true,
 			"requires": {
 				"buffer-from": "1.1.0",
 				"memcached": "2.2.x"
@@ -61732,7 +61741,8 @@
 				"buffer-from": {
 					"version": "1.1.0",
 					"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz",
-					"integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ=="
+					"integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==",
+					"optional": true
 				}
 			}
 		},
@@ -61745,7 +61755,8 @@
 		"connection-parse": {
 			"version": "0.0.7",
 			"resolved": "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz",
-			"integrity": "sha1-GOcxiqsGppkmc3KxDFIm0locmmk="
+			"integrity": "sha1-GOcxiqsGppkmc3KxDFIm0locmmk=",
+			"optional": true
 		},
 		"consola": {
 			"version": "2.15.3",
@@ -69446,6 +69457,7 @@
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/hashring/-/hashring-3.2.0.tgz",
 			"integrity": "sha1-/aTv3oqiLNuX+x0qZeiEAeHBRM4=",
+			"optional": true,
 			"requires": {
 				"connection-parse": "0.0.x",
 				"simple-lru-cache": "0.0.x"
@@ -70877,6 +70889,7 @@
 			"version": "0.0.6",
 			"resolved": "https://registry.npmjs.org/jackpot/-/jackpot-0.0.6.tgz",
 			"integrity": "sha1-PP8GQoXL9m9OqyWTyQvOgWqCGEk=",
+			"optional": true,
 			"requires": {
 				"retry": "0.6.0"
 			},
@@ -70884,7 +70897,8 @@
 				"retry": {
 					"version": "0.6.0",
 					"resolved": "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz",
-					"integrity": "sha1-HAEHEyeab9Ho3vKK8MP/GHHKpTc="
+					"integrity": "sha1-HAEHEyeab9Ho3vKK8MP/GHHKpTc=",
+					"optional": true
 				}
 			}
 		},
@@ -73260,6 +73274,7 @@
 			"version": "2.2.2",
 			"resolved": "https://registry.npmjs.org/memcached/-/memcached-2.2.2.tgz",
 			"integrity": "sha1-aPhsz9hLz5PMJe1G1tf8DHUhydU=",
+			"optional": true,
 			"requires": {
 				"hashring": "3.2.x",
 				"jackpot": ">=0.0.6"
@@ -80435,7 +80450,8 @@
 		"simple-lru-cache": {
 			"version": "0.0.2",
 			"resolved": "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz",
-			"integrity": "sha1-1ZzDoZPBpdAyD4Tucy9uRxPlEd0="
+			"integrity": "sha1-1ZzDoZPBpdAyD4Tucy9uRxPlEd0=",
+			"optional": true
 		},
 		"simple-swizzle": {
 			"version": "0.2.2",