Skip to content

Fix resource manifest modal loading state #889

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

Open
anonymusk7 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix resource manifest modal loading state #889

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
95 changes: 65 additions & 30 deletions cyclops-ui/src/components/k8s-resources/ResourceList/ResourceList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ const ResourceList = ({
});
const [deleteResourceVerify, setDeleteResourceVerify] = useState("");

const [loadingResourceManifest, setLoadingResourceManifest] = useState(false);

const [showManagedFields, setShowManagedFields] = useState(false);

const [resourceFilter, setResourceFilter] = useState<string[]>([]);
Expand Down Expand Up @@ -181,6 +183,8 @@ const ResourceList = ({
name: string,
showManagedFields: boolean,
) => {
setLoadingResourceManifest(true);

fetchResourceManifest(
group,
version,
Expand All @@ -197,9 +201,65 @@ const ResourceList = ({
})
.catch((error) => {
setError(mapResponseError(error));
})
.finally(() => {
setLoadingResourceManifest(false);
});
};

const resourceManifestContent = (content: string, loading: boolean) => {
if (loading) {
return <Spin />;
}

return (
<div>
<Divider />
<div style={{ position: "relative" }}>
<ReactAce
mode={"sass"}
theme={mode === "light" ? "github" : "twilight"}
fontSize={12}
showPrintMargin={true}
showGutter={true}
highlightActiveLine={true}
readOnly={true}
setOptions={{
enableBasicAutocompletion: true,
enableLiveAutocompletion: true,
enableSnippets: false,
showLineNumbers: true,
tabSize: 4,
useWorker: false,
}}
style={{
width: "100%",
}}
value={content}
/>
<Tooltip title={"Copy Manifest"} trigger="hover">
<Button
onClick={() => {
navigator.clipboard.writeText(content);
}}
style={{
position: "absolute",
right: "20px",
top: "10px",
}}
>
<CopyOutlined
style={{
fontSize: "20px",
}}
/>
</Button>
</Tooltip>
</div>
</div>
);
};

const resourceFilterOptions = () => {
if (!loadResources) {
return <Spin />;
Expand Down Expand Up @@ -740,42 +800,17 @@ const ResourceList = ({
<Modal
title="Manifest"
open={manifestModal.on}
onOk={handleCancelManifest}
onCancel={handleCancelManifest}
cancelButtonProps={{ style: { display: "none" } }}
footer={null}
width={"70%"}
>
<Checkbox onChange={handleCheckboxChange} checked={showManagedFields}>
Include Managed Fields
</Checkbox>
<Divider style={{ marginTop: "12px", marginBottom: "12px" }} />
<div style={{ position: "relative" }}>
<ReactAce
style={{ width: "100%" }}
mode={"sass"}
theme={mode === "light" ? "github" : "twilight"}
value={manifestModal.manifest}
readOnly={true}
/>
<Tooltip title={"Copy Manifest"} trigger="hover">
<Button
onClick={() => {
navigator.clipboard.writeText(manifestModal.manifest);
}}
style={{
position: "absolute",
right: "20px",
top: "10px",
}}
>
<CopyOutlined
style={{
fontSize: "20px",
}}
/>
</Button>
</Tooltip>
</div>
{resourceManifestContent(
manifestModal.manifest,
loadingResourceManifest,
)}
</Modal>
<Modal
title={
Expand Down