Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions apps/client/src/components/DeploymentResources.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<script setup lang="ts">
import type { Cluster, Deployment, Environment, Repo, Stage, Zone } from '@cpn-console/shared'
import type { Project } from '@/utils/project-utils.js'
import { ProjectAuthorized } from '@cpn-console/shared'
import { AdminAuthorized, ProjectAuthorized } from '@cpn-console/shared'
import { useSnackbarStore } from '@/stores/snackbar.js'
import { useUserStore } from '@/stores/user.js'

const props = defineProps<{
environments: (Environment & { cluster?: Cluster, zone?: Zone, stage?: Stage })[]
Expand All @@ -14,6 +15,7 @@ const props = defineProps<{
const emit = defineEmits<{ changed: [] }>()

const snackbarStore = useSnackbarStore()
const userStore = useUserStore()

const deployments = ref<Deployment[]>([])
const repoOptions = computed(() => props.repositories.map(repo => ({
Expand All @@ -29,7 +31,8 @@ const deploymentsWithStage = computed(() => deployments.value.map((deployment) =
}
}))

const canManageDeploy = computed(() => !props.project.locked && props.asProfile === 'user' && ProjectAuthorized.ManageDeployments({ projectPermissions: props.project.myPerms }))
const canManageDeploy = computed(() => (!props.project.locked && props.asProfile === 'user' && ProjectAuthorized.ManageDeployments({ projectPermissions: props.project.myPerms }))
|| (props.asProfile === 'admin' && AdminAuthorized.Manage(userStore.adminPerms)))

const isModalOpen = ref(false)
const selectedDeployment = ref<Deployment>()
Expand Down
2 changes: 1 addition & 1 deletion apps/client/src/components/ProjectResources.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const projectClusters = computed(() => ([

const canManageEnvs = computed(() => !props.project.locked && props.asProfile === 'user' && ProjectAuthorized.ManageEnvironments({ projectPermissions: props.project.myPerms }))
const canManageRepos = computed(() => !props.project.locked && props.asProfile === 'user' && ProjectAuthorized.ManageRepositories({ projectPermissions: props.project.myPerms }))
const canListDeploy = computed(() => ProjectAuthorized.ListDeployments({ projectPermissions: props.project.myPerms }))
const canListDeploy = computed(() => props.asProfile === 'admin' || ProjectAuthorized.ListDeployments({ projectPermissions: props.project.myPerms }))

watch(selectedRepo, async () => {
branchName.value = defaultBranchName
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/utils/permissions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ export const ProjectAuthorized = {
|| !!(toBigInt(perms.projectPermissions) & (PROJECT_PERMS.SEE_SECRETS | PROJECT_PERMS.MANAGE)),
ManageDeployments: (perms: ProjectAuthorizedParams) => AdminAuthorized.Manage(perms.adminPermissions)
|| !!(toBigInt(perms.projectPermissions) & (PROJECT_PERMS.MANAGE_DEPLOYMENTS | PROJECT_PERMS.MANAGE)),
ListDeployments: (perms: ProjectAuthorizedParams) => AdminAuthorized.Manage(perms.adminPermissions)
|| !!(toBigInt(perms.projectPermissions) & (PROJECT_PERMS.LIST_DEPLOYMENTS | PROJECT_PERMS.MANAGE)),
ListDeployments: (perms: ProjectAuthorizedParams) => AdminAuthorized.ListProjects(perms.adminPermissions)
|| !!(toBigInt(perms.projectPermissions) & (PROJECT_PERMS.LIST_DEPLOYMENTS | PROJECT_PERMS.MANAGE_DEPLOYMENTS | PROJECT_PERMS.MANAGE)),
} as const

interface ScopePerm<T extends string> {
Expand Down
Loading