Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: add portal for generate token request #2697

Closed
wants to merge 3 commits into from
Closed

fix: add portal for generate token request #2697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68c2b38
add portal for generate token request
mrCherry97 Dec 18, 2023
eed7951
bump
mrCherry97 Dec 18, 2023
5eef3c9
Merge branch 'main' into fix-generate-token
akucharska Dec 18, 2023
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
2 changes: 1 addition & 1 deletion resources/web/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: busola
image: europe-docker.pkg.dev/kyma-project/dev/busola-web:PR-2694
image: europe-docker.pkg.dev/kyma-project/dev/busola-web:PR-2697
imagePullPolicy: Always
resources:
requests:
Expand Down
160 changes: 83 additions & 77 deletions src/resources/ServiceAccounts/TokenRequestModal/TokenRequestModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { CopiableText } from 'shared/components/CopiableText/CopiableText';
import { Editor } from 'shared/components/MonacoEditorESM/Editor';

import { spacing } from '@ui5/webcomponents-react-base';
import { createPortal } from 'react-dom';

const expirationSecondsOptions = [
{
Expand Down Expand Up @@ -87,86 +88,91 @@ export function TokenRequestModal({
useEventListener('keydown', handleCloseWithEscape);

return (
<Dialog
open
onAfterClose={handleCloseModal}
headerText={t('service-accounts.token-request.generate')}
footer={
<Bar
design="Footer"
endContent={
<>
<Button onClick={handleCloseModal}>
{t('common.buttons.close')}
</Button>
</>
<>
{createPortal(
<Dialog
open
onAfterClose={handleCloseModal}
headerText={t('service-accounts.token-request.generate')}
footer={
<Bar
design="Footer"
endContent={
<>
<Button onClick={handleCloseModal}>
{t('common.buttons.close')}
</Button>
</>
}
/>
}
/>
}
>
{/*@ts-ignore*/}
<ResourceForm.Single
resource={tokenRequest}
setResource={setTokenRequest}
>
{/*@ts-ignore*/}
<ResourceForm.FormField
simple
required
propertyPath="$.spec.expirationSeconds"
inputInfo={t('service-accounts.token-request.input-info')}
label={t('service-accounts.token-request.expiration-seconds')}
input={ComboboxInputWithSeconds}
/>
<div style={spacing.sapUiSmallMarginTop}>
<MessageStrip design="Warning" hideCloseButton>
{t('service-accounts.token-request.warning')}
</MessageStrip>
<div
className="bsl-display-flex"
style={{
justifyContent: 'flex-end',
marginTop: spacing.sapUiSmallMarginTop.marginTop,
marginBottom: spacing.sapUiSmallMarginBottom.marginBottom,
}}
>
{/*@ts-ignore*/}
<ResourceForm.Single
resource={tokenRequest}
setResource={setTokenRequest}
>
{/*@ts-ignore*/}
<CopiableText
iconOnly
buttonText={t('common.buttons.copy')}
style={spacing.sapUiTinyMarginEnd}
textToCopy={kubeconfigYaml}
disabled={token === ''}
<ResourceForm.FormField
simple
required
propertyPath="$.spec.expirationSeconds"
inputInfo={t('service-accounts.token-request.input-info')}
label={t('service-accounts.token-request.expiration-seconds')}
input={ComboboxInputWithSeconds}
/>
<Button
onClick={() => downloadKubeconfig(serviceAccountName, token)}
disabled={token === ''}
design="Transparent"
style={spacing.sapUiTinyMarginEnd}
icon="download"
iconEnd
>
{t('service-accounts.headers.download-kubeconfig')}
</Button>
<Button
onClick={generateTokenRequest}
disabled={isExpirationSecondsValueANumber()}
>
{t('common.buttons.generate-name')}
</Button>
</div>
{/*@ts-ignore*/}
<Editor
value={kubeconfigYaml}
updateValueOnParentChange
readOnly
autocompletionDisabled
height="50vh"
language="yaml"
/>
</div>
{/*@ts-ignore*/}
</ResourceForm.Single>
</Dialog>
<div style={spacing.sapUiSmallMarginTop}>
<MessageStrip design="Warning" hideCloseButton>
{t('service-accounts.token-request.warning')}
</MessageStrip>
<div
className="bsl-display-flex"
style={{
justifyContent: 'flex-end',
marginTop: spacing.sapUiSmallMarginTop.marginTop,
marginBottom: spacing.sapUiSmallMarginBottom.marginBottom,
}}
>
{/*@ts-ignore*/}
<CopiableText
iconOnly
buttonText={t('common.buttons.copy')}
style={spacing.sapUiTinyMarginEnd}
textToCopy={kubeconfigYaml}
disabled={token === ''}
/>
<Button
onClick={() => downloadKubeconfig(serviceAccountName, token)}
disabled={token === ''}
design="Transparent"
style={spacing.sapUiTinyMarginEnd}
icon="download"
iconEnd
>
{t('service-accounts.headers.download-kubeconfig')}
</Button>
<Button
onClick={generateTokenRequest}
disabled={isExpirationSecondsValueANumber()}
>
{t('common.buttons.generate-name')}
</Button>
</div>
{/*@ts-ignore*/}
<Editor
value={kubeconfigYaml}
updateValueOnParentChange
readOnly
autocompletionDisabled
height="50vh"
language="yaml"
/>
</div>
{/*@ts-ignore*/}
</ResourceForm.Single>
</Dialog>,
document.body,
)}
</>
);
}
Loading