-
Notifications
You must be signed in to change notification settings - Fork 4
Delete service account bug fixes(TS-2756) #1597
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
Merged
+115
−76
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
f4ee1cc
Refactor delete service account modal
Roffenlund 9bc1a9f
Hide remove service account button
Roffenlund e696403
Update remove service account URL
Roffenlund db5ba3f
Move key to map from component
Roffenlund b43f4e1
Remove team_name from schema
Roffenlund 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
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
104 changes: 104 additions & 0 deletions
104
...berstorm-remix/app/settings/teams/team/tabs/ServiceAccounts/ServiceAccountRemoveModal.tsx
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 |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| import "./ServiceAccounts.css"; | ||
| import { NewAlert, NewButton, Modal, NewIcon } from "@thunderstore/cyberstorm"; | ||
| import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; | ||
| import { faTrash } from "@fortawesome/free-solid-svg-icons"; | ||
| import { useToast } from "@thunderstore/cyberstorm"; | ||
| import { teamServiceAccountRemove } from "@thunderstore/thunderstore-api"; | ||
| import { ApiAction } from "@thunderstore/ts-api-react-actions"; | ||
| import { type OutletContextShape } from "~/root"; | ||
| import { type TeamServiceAccount } from "@thunderstore/thunderstore-api"; | ||
|
|
||
| interface ServiceAccountRemoveModalProps { | ||
| serviceAccount: TeamServiceAccount; | ||
| teamName: string; | ||
| outletContext: OutletContextShape; | ||
| revalidate: () => void; | ||
| } | ||
|
|
||
| export function ServiceAccountRemoveModal({ | ||
| serviceAccount, | ||
| teamName, | ||
| outletContext, | ||
| revalidate, | ||
| }: ServiceAccountRemoveModalProps) { | ||
| const toast = useToast(); | ||
|
|
||
| const canDelete = () => { | ||
| const teams = outletContext.currentUser?.teams_full || []; | ||
| const belongingTeam = teams.find((team) => team.name === teamName); | ||
| if (!belongingTeam) { | ||
| return false; | ||
| } | ||
| return belongingTeam.role === "owner"; | ||
| }; | ||
|
|
||
| const removeServiceAccountAction = ApiAction({ | ||
| endpoint: teamServiceAccountRemove, | ||
| onSubmitSuccess: () => { | ||
| toast.addToast({ | ||
| csVariant: "success", | ||
| children: "Service account removed", | ||
| duration: 4000, | ||
| }); | ||
| revalidate(); | ||
| }, | ||
| onSubmitError: (error) => { | ||
| toast.addToast({ | ||
| csVariant: "danger", | ||
| children: `Error occurred: ${error.message || "Unknown error"}`, | ||
| duration: 8000, | ||
| }); | ||
| }, | ||
| }); | ||
|
|
||
| return ( | ||
| <Modal | ||
| titleContent="Confirm service account removal" | ||
| trigger={ | ||
| canDelete() && ( // Only show trigger if user can delete | ||
| <NewButton csVariant="danger" csSize="xsmall"> | ||
| <NewIcon csMode="inline" noWrapper> | ||
| <FontAwesomeIcon icon={faTrash} /> | ||
| </NewIcon> | ||
| Remove | ||
| </NewButton> | ||
| ) | ||
| } | ||
| csSize="small" | ||
| > | ||
| <Modal.Body> | ||
| <NewAlert csVariant="warning"> | ||
| This cannot be undone! Related API token will stop working immediately | ||
| if the service account is removed. | ||
| </NewAlert> | ||
| <div> | ||
| You are about to remove service account{" "} | ||
| <span className="team-service-accounts__highlight"> | ||
| {serviceAccount.name} | ||
| </span> | ||
| . | ||
| </div> | ||
| </Modal.Body> | ||
| <Modal.Footer> | ||
| <NewButton | ||
| onClick={() => { | ||
| removeServiceAccountAction({ | ||
| config: outletContext.requestConfig, | ||
| params: { | ||
| uuid: serviceAccount.identifier, | ||
| }, | ||
| queryParams: {}, | ||
| data: {}, | ||
| }); | ||
| }} | ||
| csVariant="danger" | ||
| > | ||
| <NewIcon csMode="inline" noWrapper> | ||
| <FontAwesomeIcon icon={faTrash} /> | ||
| </NewIcon> | ||
| Remove service account | ||
| </NewButton> | ||
| </Modal.Footer> | ||
| </Modal> | ||
| ); | ||
| } |
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
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.
The sibling PR for creating a service account still uses this URL structure. Do you think it should also be also updated to not reside under the team path? It feels a bit odd that the URLs now differ in this regard. Not asking it to be done within this PR.