Feat: Complete Kubectl Dialog Across Project,Workspace,Delete #15
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| import { DeleteWorkspaceDialog } from '../KubectlDeleteWorkspaceDialog'; | ||
| import { KubectlInfoButton } from '../KubectlInfoButton'; | ||
| import { useState } from 'react'; | ||
|
|
||
| interface KubectlDeleteWorkspaceProps { | ||
| projectName?: string; | ||
|
There was a problem hiding this comment. Also here: Can’t we just assume that there’s always a |
||
| resourceName: string; | ||
| } | ||
|
|
||
| export const KubectlDeleteWorkspace = ({ | ||
| projectName, | ||
| resourceName, | ||
| }: KubectlDeleteWorkspaceProps) => { | ||
| const [isDialogOpen, setIsDialogOpen] = useState(false); | ||
|
|
||
| const closeDialog = () => { | ||
| setIsDialogOpen(false); | ||
| }; | ||
|
|
||
| return ( | ||
| <> | ||
| <KubectlInfoButton | ||
| onClick={() => setIsDialogOpen(true)} | ||
| ></KubectlInfoButton> | ||
|
|
||
| {isDialogOpen && ( | ||
| <DeleteWorkspaceDialog | ||
| onClose={closeDialog} | ||
| projectName={projectName} | ||
| resourceName={resourceName} | ||
| ></DeleteWorkspaceDialog> | ||
| )} | ||
| </> | ||
| ); | ||
| }; | ||
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,155 @@ | ||
| import { | ||
| FlexBox, | ||
| MessageStrip, | ||
| Text, | ||
| Link, | ||
| Input, | ||
| Panel, | ||
| } from '@ui5/webcomponents-react'; | ||
| import { KubectlDialog } from './KubectlDialog'; | ||
| import { KubectlTerminal } from './KubectlTerminal'; | ||
| import { useState, useEffect, ReactNode } from 'react'; | ||
| import { InputDomRef } from '@ui5/webcomponents-react'; | ||
| import { Ui5CustomEvent } from '@ui5/webcomponents-react'; | ||
|
|
||
| export interface FormField { | ||
| id: string; | ||
| label: string; | ||
| placeholder: string; | ||
| defaultValue: string; | ||
| } | ||
|
|
||
| export interface CustomCommand { | ||
| command: string; | ||
| description: string; | ||
| isMainCommand?: boolean; | ||
| } | ||
|
|
||
| interface KubectlBaseDialogProps { | ||
| onClose: () => void; | ||
| title: string; | ||
| introSection: ReactNode[]; | ||
| formFields?: FormField[]; | ||
| customCommands: CustomCommand[]; | ||
| } | ||
|
|
||
| export const KubectlBaseDialog = ({ | ||
| onClose, | ||
| title, | ||
| introSection, | ||
| formFields = [], | ||
| customCommands, | ||
| }: KubectlBaseDialogProps) => { | ||
| const [formValues, setFormValues] = useState<Record<string, string>>({}); | ||
|
|
||
| useEffect(() => { | ||
| const initialValues: Record<string, string> = {}; | ||
| formFields?.forEach((field) => { | ||
| initialValues[field.id] = field.defaultValue; | ||
| }); | ||
| setFormValues(initialValues); | ||
| }, []); | ||
|
|
||
| const handleFieldChange = | ||
| (fieldId: string) => (event: Ui5CustomEvent<InputDomRef>) => { | ||
| setFormValues((prev) => ({ | ||
| ...prev, | ||
| [fieldId]: event.target.value, | ||
| })); | ||
| }; | ||
|
|
||
| const getFormattedCommand = (template: string) => { | ||
| let result = template; | ||
|
|
||
| Object.entries(formValues).forEach(([key, value]) => { | ||
| const placeholder = new RegExp(`\\$\\{${key}\\}`, 'g'); | ||
| result = result.replace(placeholder, value); | ||
| }); | ||
|
|
||
| return result; | ||
| }; | ||
|
|
||
| const showFormFields = formFields && formFields.length > 0; | ||
|
|
||
| return ( | ||
| <KubectlDialog onClose={onClose} headerText={title}> | ||
| <FlexBox direction="Column" style={{ gap: '16px' }}> | ||
| <Panel headerText="Prerequisites" collapsed> | ||
| <Text> | ||
| Make sure you have installed <b>kubectl</b> and the <b>kubelogin</b>{' '} | ||
| plugin. We recommend using <b>krew</b> which is a plugin manager for | ||
| kubectl. | ||
andreaskienle marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| </Text> | ||
| </Panel> | ||
|
|
||
| {introSection} | ||
|
|
||
| {customCommands | ||
| .filter((template) => template.isMainCommand) | ||
| .map((template, index) => ( | ||
| <div key={`main-command-${index}`}> | ||
| <Text>{template.description}</Text> | ||
| <KubectlTerminal | ||
| command={getFormattedCommand(template.command)} | ||
| /> | ||
| </div> | ||
| ))} | ||
|
|
||
| {showFormFields && ( | ||
| <> | ||
| <Text> | ||
| <b>Important:</b> Before executing, modify the commands below: | ||
| </Text> | ||
|
|
||
| <div | ||
| style={{ | ||
| display: 'grid', | ||
| gridTemplateColumns: '1fr 1fr', | ||
| gap: '16px', | ||
| }} | ||
| > | ||
| {formFields.map((field) => ( | ||
| <div key={field.id}> | ||
| <Text style={{ fontWeight: 'bold', marginBottom: '8px' }}> | ||
| {field.label} | ||
| </Text> | ||
| <Input | ||
| placeholder={field.placeholder} | ||
| value={formValues[field.id] || ''} | ||
| onChange={handleFieldChange(field.id)} | ||
| onInput={handleFieldChange(field.id)} | ||
| style={{ width: '100%' }} | ||
| /> | ||
| </div> | ||
| ))} | ||
| </div> | ||
| </> | ||
| )} | ||
|
|
||
| {customCommands | ||
| .filter((template) => !template.isMainCommand) | ||
| .map((template, index) => ( | ||
| <div key={`additional-command-${index}`}> | ||
| <Text>{template.description}</Text> | ||
| <KubectlTerminal | ||
| command={getFormattedCommand(template.command)} | ||
| /> | ||
| </div> | ||
| ))} | ||
|
|
||
| <MessageStrip design="Information" hideCloseButton={true}> | ||
| <Text> | ||
| You can also use our{' '} | ||
| <Link | ||
| href="https://pages.github.tools.sap/cloud-orchestration/docs/managed-control-planes/get-started/get-started-mcp#before-you-begin" | ||
| target="_blank" | ||
| > | ||
| Onboarding Guide | ||
| </Link>{' '} | ||
| for more information. | ||
| </Text> | ||
| </MessageStrip> | ||
| </FlexBox> | ||
| </KubectlDialog> | ||
| ); | ||
| }; | ||
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,51 @@ | ||
| import { KubectlBaseDialog, CustomCommand } from './KubectlBaseDialog'; | ||
| import { Text } from '@ui5/webcomponents-react'; | ||
|
|
||
| interface DeleteWorkspaceDialogProps { | ||
| onClose: () => void; | ||
| resourceName?: string; | ||
| projectName?: string; | ||
| } | ||
|
|
||
| export const DeleteWorkspaceDialog = ({ | ||
| onClose, | ||
| resourceName, | ||
| projectName, | ||
| }: DeleteWorkspaceDialogProps) => { | ||
| const projectNamespace = projectName | ||
| ? `project-${projectName}` | ||
| : '<project-namespace>"'; | ||
| const workspaceName = resourceName || '<workspace-name>'; | ||
|
|
||
| const customCommands: CustomCommand[] = [ | ||
| { | ||
| command: `kubectl delete workspace ${resourceName} -n ${projectNamespace}`, | ||
| description: 'Run this command to delete the workspace:', | ||
| isMainCommand: true, | ||
| }, | ||
| { | ||
| command: `kubectl get workspace -n ${projectNamespace}`, | ||
| description: 'To verify the workspace has been deleted, run:', | ||
| }, | ||
| ]; | ||
|
|
||
| const introSection = [ | ||
| <Text> | ||
| The below instructions will help you delete the workspace "{workspaceName} | ||
| " from project namespace "{projectNamespace}" using kubectl. | ||
| </Text>, | ||
| <Text> | ||
| Remember that this action is <b>irreversible</b> and all resources within | ||
| the workspace will be <b>permanently deleted</b>. | ||
| </Text>, | ||
| ]; | ||
|
|
||
| return ( | ||
| <KubectlBaseDialog | ||
| onClose={onClose} | ||
| title="Delete a Workspace" | ||
| introSection={introSection} | ||
| customCommands={customCommands} | ||
| /> | ||
| ); | ||
| }; |
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.
Delete unused code
(Also further down)