-
Notifications
You must be signed in to change notification settings - Fork 1
fix: Revoke token and General Settings should be editable only by admins #830
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
quangtuanitmo18
wants to merge
4
commits into
master
Choose a base branch
from
fix/admin-revoke-token-and-general-settings
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
09d297d
fix: Revoke token and General Settings should be editable only by admins
quangtuanitmo18 8f887df
fix: Revoke token and General Settings should be editable only by admins
quangtuanitmo18 16d3e79
Merge branch 'master' into fix/admin-revoke-token-and-general-settings
quangtuanitmo18 e3397d6
Merge branch 'fix/admin-revoke-token-and-general-settings' of github.…
quangtuanitmo18 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,7 @@ | |
| /> | ||
|
|
||
| <div | ||
| v-if="userCanEdit" | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same thing: API is first, UI is the next phase check |
||
| class="projects-integrations-settings-page__revoke-container" | ||
| @click="revokeIntegrationToken()" | ||
| v-html="$t('projects.settings.integrations.revokeText')" | ||
|
|
@@ -47,6 +48,7 @@ import { ActionType } from '../../utils/ConfirmationWindow/types'; | |
| import { GENERATE_NEW_INTEGRATION_TOKEN } from '@/store/modules/projects/actionTypes'; | ||
| import notifier from 'codex-notifier'; | ||
| import { getSentryDSN } from '../../../utils'; | ||
| import { ConfirmedMember, Member, Workspace } from '@/types/workspaces'; | ||
|
|
||
| export default defineComponent({ | ||
| name: 'ProjectIntegrationsSettings', | ||
|
|
@@ -66,6 +68,15 @@ export default defineComponent({ | |
| sentryDSN(): string { | ||
| return getSentryDSN(this.project.token); | ||
| }, | ||
| workspace(): Workspace { | ||
| return this.$store.getters.getWorkspaceByProjectId(this.project.id); | ||
| }, | ||
| currentMembership(): Member | undefined { | ||
| return this.$store.getters.getCurrentUserInWorkspace(this.workspace); | ||
| }, | ||
| userCanEdit(): boolean { | ||
| return this.currentMembership ? (this.currentMembership as ConfirmedMember).isAdmin : false; | ||
| }, | ||
| }, | ||
| methods: { | ||
| /** | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For regular team members the page will be empty, it's not the best UI. It would be better to make inputs "disabled"
But first of all, the ability to change general settings on the API side. Could you check it? maybe it is already disabled.