Skip to content

Commit bb4e495

Browse files
committed
chore: fix team users ids approach in all files
1 parent 395615f commit bb4e495

4 files changed

Lines changed: 18 additions & 22 deletions

File tree

frontend/src/config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const defaultConfig = {
6060
},
6161
},
6262
permissions: {
63-
teamUserIds: import.meta.env.VUE_APP_TEAM_USER_IDS?.split(',').map((id) => id.trim()),
63+
teamUserIds: import.meta.env.VUE_APP_TEAM_USER_IDS,
6464
},
6565
};
6666

@@ -114,7 +114,7 @@ const composedConfig = {
114114
},
115115
},
116116
permissions: {
117-
teamUserIds: 'CROWD_VUE_APP_TEAM_USER_IDS'?.split(',').map((id) => id.trim()),
117+
teamUserIds: 'CROWD_VUE_APP_TEAM_USER_IDS',
118118
},
119119
};
120120

frontend/src/modules/admin/modules/integration/pages/integration-list.page.vue

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<template #default="{ progress, progressError }">
7373
<div v-if="platformsByStatus.length > 0" class="flex flex-col gap-6">
7474
<lf-tooltip
75-
v-if="isTeamUser()"
75+
v-if="isTeamUser"
7676
class="ml-auto"
7777
placement="top"
7878
content-class="!max-w-76 !p-3 !text-start"
@@ -182,6 +182,13 @@ const getIntegrationCountPerStatus = computed<Record<string, number>>(() => {
182182
return statusCount;
183183
});
184184
185+
const authStore = useAuthStore();
186+
const userId = computed(() => authStore.user?.id);
187+
const teamUserIds = computed(() => config.permissions.teamUserIds);
188+
const env = computed(() => config.env);
189+
190+
const isTeamUser = computed(() => env.value !== 'production' || teamUserIds.value?.includes(userId.value));
191+
185192
onMounted(() => {
186193
localStorage.setItem('segmentId', id);
187194
localStorage.setItem('segmentGrandparentId', grandparentId);
@@ -201,15 +208,7 @@ const updateGithubVersion = () => {
201208
if (githubIntegration) {
202209
return !!githubIntegration.isNango;
203210
}
204-
return !!isTeamUser();
205-
};
206-
207-
const isTeamUser = () => {
208-
const authStore = useAuthStore();
209-
const userId = authStore.user?.id;
210-
return (
211-
config.permissions.teamUserIds?.includes(userId) || config.env === 'local'
212-
);
211+
return !!isTeamUser.value;
213212
};
214213
</script>
215214

frontend/src/modules/admin/modules/projects/components/view/lf-projects-table.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,11 @@ const props = defineProps({
130130
const { hasPermission, hasAccessToSegmentId } = usePermissions();
131131
132132
const authStore = useAuthStore();
133-
const isTeamUser = computed(() => config.env !== 'production' || config.permissions.teamUserIds?.includes(authStore.user?.id));
133+
const userId = computed(() => authStore.user?.id);
134+
const teamUserIds = computed(() => config.permissions.teamUserIds);
135+
const env = computed(() => config.env);
136+
137+
const isTeamUser = computed(() => env.value !== 'production' || teamUserIds.value?.includes(userId.value));
134138
135139
</script>
136140

frontend/src/modules/admin/pages/admin-panel.page.vue

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,18 +125,11 @@ const changeView = (view: string) => {
125125
126126
const isAdminUser = computed(() => roles.value.includes(LfRole.admin));
127127
128-
const user = computed(() => authStore.user);
128+
const userId = computed(() => authStore.user?.id);
129129
const teamUserIds = computed(() => config.permissions.teamUserIds);
130130
const env = computed(() => config.env);
131131
132-
const isTeamUser = computed(() => {
133-
const userId = user.value?.id;
134-
const teamIds = teamUserIds.value;
135-
const includesCheck = teamIds?.includes(userId);
136-
const result = env.value !== 'production' || includesCheck;
137-
138-
return result;
139-
});
132+
const isTeamUser = computed(() => env.value !== 'production' || teamUserIds.value?.includes(userId.value));
140133
141134
const changeAdminPanelView = (view: string) => {
142135
switch (view) {

0 commit comments

Comments
 (0)