fix: control hub namesapce by user

apps/adminConsole/src/pages/ApplicationSpaces/Workloads/Detail.vue

@@ -17,7 +17,6 @@ import { ref } from 'vue';
 import { t } from 'src/boot/i18n';
 import EnvironmentVariables from 'src/containers/EnvironmentVariables.vue';
 import Yaml from 'src/pages/NamespacePods/Yaml.vue';
-import MyPage from '@packages/ui/src/containers/MyPage.vue';
 import MyContentPage from 'src/components/MyContentPage.vue';
 import DetailData from './DetailData.vue';
 import MoreSelection from '@packages/ui/src/components/MoreSelection.vue';

apps/server/server/cache/user.js

@@ -80,6 +80,29 @@ function podListFormat(ctx, data) {
 	};
 }
 
+function namespaceFormat(ctx, data) {
+	const user = getUserInfo(ctx);
+	console.log('user', user);
+	const newData = data.items.filter((item) => {
+		const namespace = get(item, 'metadata.name');
+		const userTarget = namespace
+			.split('-')
+			.find((item) => item === user.username);
+		const systemTarget = systemNamespaces.find(
+			(system_namespace) => namespace === system_namespace
+		);
+		return user.globalrole === ADMIN_ROLE
+			? true
+			: userTarget;
+	});
+	return {
+		...data,
+		totalItems: newData.length,
+		items: newData,
+		total: data.totalItems
+	};
+}
+
 function namespaceListFormat(ctx, data) {
 	const user = getUserInfo(ctx);
 	const newData = data.items.filter((item) => {
@@ -134,5 +157,6 @@ module.exports = {
 	systemNamespaces,
 	checkUrl,
 	isAdmin,
-	canModify
+	canModify,
+	namespaceFormat
 };

apps/server/server/controllers/view.js

@@ -35,7 +35,8 @@ const {
 	setUserInfo,
 	getUserInfo,
 	checkUrl,
-	isAdmin
+	isAdmin,
+	namespaceFormat
 } = require('../cache/user.js');
 
 const {
@@ -215,6 +216,12 @@ function endsWith(str, name) {
 const namespaceGroup = async (ctx) => {
 	const namespaces = await getNamespaces(ctx);
 	const users = await getUsers(ctx)
+
+	const originalData = namespaceFormat(
+		ctx.req,
+		namespaces,
+	);
+
 	const SYSTEM = 'System'
 	const usersData = users.items.map(item => ({ name: item.metadata.name, creation_timestamp: item.metadata.creationTimestamp }));
 
@@ -228,22 +235,22 @@ const namespaceGroup = async (ctx) => {
 
 	const result = list.map(item => {
 		if (item.name === SYSTEM) {
-			const data = namespaces.items.filter(namespace => !usersData.some(str => endsWith(namespace.metadata.name, str.name)))
+			const data = originalData.items.filter(namespace => !usersData.some(str => endsWith(namespace.metadata.name, str.name)))
 			return {
 				title: item.name,
 				data: data,
 			}
 		} else {
-			const data = namespaces.items.filter(namespace => endsWith(namespace.metadata.name, item.name))
+			const data = originalData.items.filter(namespace => endsWith(namespace.metadata.name, item.name))
 			return {
 				title: item.name,
 				data: data,
 			}
 		}
 
 	});
-
-	ctx.body = result;
+	const res = result.filter(item => item.data.length > 0)
+	ctx.body = res;
 }
 
 const cacheUser = async (ctx, next) => {

apps/server/server/routes.js

@@ -17,11 +17,11 @@ const router = new Router();
 router
 	.get('/capi/app/detail', userDetail)
 	.get('/capi/app/myapps', appList)
-	.get('/capi/namespaces/group', namespaceGroup)
 
 	.all('/(k)?api(s)?/(.*)', cacheUser)
 	.use(proxy('/(k)?api(s)?/(.*)', k8sResourceProxy))
 	.all('/(c)?api(s)?/(.*)', cacheUser)
-	.get('/capi/monitoring.kubesphere.io/v1alpha3/:type', monitoringMetric);
+	.get('/capi/monitoring.kubesphere.io/v1alpha3/:type', monitoringMetric)
+	.get('/capi/namespaces/group', namespaceGroup)
 
 module.exports = router;