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

Corrected Error Rendering #853

Merged
merged 6 commits into from
Aug 29, 2024
Merged

Corrected Error Rendering #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
96157b2
Added Service Instance Id
ralikio Aug 29, 2024
243319c
Added Service Instance Id to Error Message
ralikio Aug 29, 2024
b211874
Introduce Separate UnableToLoad Error
ralikio Aug 29, 2024
428b9ec
Introduce Separate UnableToLoad Error
ralikio Aug 29, 2024
3e0793c
Hide Details on Successful Instance Removal
ralikio Aug 29, 2024
9e33426
Update 09-10-ui.md
ralikio Aug 29, 2024
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
4 changes: 2 additions & 2 deletions docs/contributor/09-10-ui.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Follow the steps below to run BTP Manager with UI:
```
3. Set the **IMG** environment variable to the image of BTP Manager with UI.
```shell
export IMG=europe-docker.pkg.dev/kyma-project/dev/btp-manager:PR-850
export IMG=europe-docker.pkg.dev/kyma-project/dev/btp-manager:PR-853
```
4. Run `deploy` makefile rule to deploy BTP Manager with UI.
```shell
Expand All @@ -42,7 +42,7 @@ Follow the steps below to run BTP Manager with UI:
```
If you encounter the following error during Pod creation due to Warden's admission webhook:
```
Error creating: admission webhook "validation.webhook.warden.kyma-project.io" denied the request: Pod images europe-docker.pkg.dev/kyma-project/dev/btp-manager:PR-850 validation failed
Error creating: admission webhook "validation.webhook.warden.kyma-project.io" denied the request: Pod images europe-docker.pkg.dev/kyma-project/dev/btp-manager:PR-853 validation failed
```
you must scale the BTP Manager deployment to 0 replicas, delete the webhook, and then scale the deployment back to 1 replica.
```shell
Expand Down
5 changes: 5 additions & 0 deletions ui/src/components/ServiceInstancesDetailsView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ const ServiceInstancesDetailsView = forwardRef((props: any, ref) => {
<>
<ui5.Panel headerLevel="H2" headerText="Service Details">
<ui5.Form>

<ui5.FormItem label="ID">
<ui5.Text>{instance?.id}</ui5.Text>
</ui5.FormItem>

<ui5.FormItem label="Name">
<ui5.Text>{instance?.name}</ui5.Text>
</ui5.FormItem>
Expand Down
35 changes: 25 additions & 10 deletions ui/src/components/ServiceInstancesView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ function ServiceInstancesView(props: any) {
const [secret, setSecret] = useState<Secret>(new Secret());
const [loading, setLoading] = useState(true);
const [error, setError] = useState(null);
const [unableToLoadError, setUnableToLoadError] = useState(null);
const [selectedInstance, setSelectedInstance] = useState<ServiceInstance>(new ServiceInstance());
const [success, setSuccess] = useState("");
const [layout, setLayout] = useState(FCLLayout.OneColumn);
Expand All @@ -31,6 +32,9 @@ function ServiceInstancesView(props: any) {
// close side panel
setLayout(FCLLayout.OneColumn)

setError(null);
setUnableToLoadError(null);

if (!Ok(props.setTitle)) {
return;
}
Expand All @@ -55,6 +59,7 @@ function ServiceInstancesView(props: any) {
.then((response) => {
setServiceInstances(response.data);
setError(null);
setUnableToLoadError(null);
if (id) {
const instance = response.data.items.find((instance) => instance.id === id);
if (instance) {
Expand All @@ -67,7 +72,7 @@ function ServiceInstancesView(props: any) {
.catch((error) => {
setServiceInstances(undefined);
setLoading(false);
setError(error);
setUnableToLoadError(error);
});
}
} else {
Expand All @@ -86,6 +91,8 @@ function ServiceInstancesView(props: any) {
}

function deleteInstance(id: string): boolean {
setError(null);
setUnableToLoadError(null);
setLoading(true);
axios
.delete(api("service-instances") + "/" + id, {
Expand All @@ -97,9 +104,9 @@ function ServiceInstancesView(props: any) {
.then((response) => {
serviceInstances!!.items = serviceInstances!!.items.filter(instance => instance.id !== id)
setServiceInstances(serviceInstances);
setSuccess("Service instance deleted successfully")
setError(null)
setSuccess("Service instance " + id + " deleted successfully");
setLoading(false);
setLayout(FCLLayout.OneColumn);
})
.catch((error) => {
setLoading(false);
Expand Down Expand Up @@ -129,6 +136,10 @@ function ServiceInstancesView(props: any) {
}}
>

<ui5.TableCell>
<ui5.Label>{instance.id}</ui5.Label>
</ui5.TableCell>

<ui5.TableCell>
<ui5.Label>{instance.name}</ui5.Label>
</ui5.TableCell>
Expand Down Expand Up @@ -169,15 +180,16 @@ function ServiceInstancesView(props: any) {
/>
}

if (error) {
if (unableToLoadError) {

return <>
<div className="margin-wrapper">
<StatusMessage error={error ?? undefined} success={undefined} />
<ui5.IllustratedMessage name="UnableToLoad" />
</div>
<div className="margin-wrapper">
<StatusMessage error={unableToLoadError ?? undefined} success={undefined} />
<ui5.IllustratedMessage name="UnableToLoad" />
</div>
</>
}
}

return (
<>
<FlexibleColumnLayout id="fcl" layout={layout}>
Expand All @@ -191,6 +203,10 @@ function ServiceInstancesView(props: any) {
<ui5.Table
columns={
<>
<ui5.TableColumn>
<ui5.Label>ID</ui5.Label>
</ui5.TableColumn>

<ui5.TableColumn>
<ui5.Label>Service Instance</ui5.Label>
</ui5.TableColumn>
Expand Down Expand Up @@ -231,7 +247,6 @@ function ServiceInstancesView(props: any) {
</div>

</FlexibleColumnLayout>

</>
);

Expand Down
Loading