Skip to content

fix(identity): improve error handling and loading states for prodel #2136

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
hgw77 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(identity): improve error handling and loading states for prodel #2136

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ba7c89
fix(identity): improve error handling and loading states for prodel
hgw77 Aug 19, 2026
ed23e95
Merge branch 'master' into hgw-fix-prodel-403
hgw77 Sep 1, 2026
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
36 changes: 15 additions & 21 deletions plugins/identity/app/javascript/widgets/prodel/ProjectResourceCheck.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,26 +48,23 @@ export default function ProjectResourceCheck({ opened, onClose }) {
}, [data, searchText])

const onConfirm = () => {
console.log("Deleting project...")
setLoading(true)
setApiError(null)
apiClient
.osApi("prodel")
.delete(`/api/v1/projects/${window.scopedProjectId}`)
.then(() => {
setLoading(false)
// after success
var scopedDomainName = window.location.pathname.split("/")[1]
var url = window.location.protocol + "//" + window.location.host + "/" + scopedDomainName
console.log("Redirecting to: " + url)
window.location.href = url
})
.catch((error) => {
setLoading(false)
setApiError(error.data)
console.error(error.data)
})
.finally(() => {
setLoading(false)
const errorData = error.data
// prodel returns flat {"message": "..."} wrapped in {"error": ...} by os_api_controller
const message =
errorData?.error?.message || errorData?.message || errorData?.error || error.message || "Unknown error"
setApiError(message)
})
}

Expand All @@ -88,8 +85,10 @@ export default function ProjectResourceCheck({ opened, onClose }) {
if (!mounted.current) return
setData(null)
setLoading(false)
setApiError(error.data)
console.error(error.data)
const errorData = error.data
const message =
errorData?.error?.message || errorData?.message || errorData?.error || error.message || "Unknown error"
setApiError(message)
})
.finally(() => {
setLoading(false)
Expand Down Expand Up @@ -219,15 +218,12 @@ export default function ProjectResourceCheck({ opened, onClose }) {
Help
</Button>
</ContentAreaToolbar>
{data && !loading ? (
{apiError && (
<Message onDismiss={() => setApiError(null)} text={apiError} variant="error" />
)}
{loading && <p>Loading...</p>}
{data && !loading && (
<>
{apiError && (
<Message
onDismiss={function noRefCheck() {}}
text={`An error occurred: ${apiError.error.message}`}
variant="error"
/>
)}
{filteredData.length === 0 ? (
<IntroBox text="No resources found. You can delete the Project." />
) : (
Expand Down Expand Up @@ -272,8 +268,6 @@ export default function ProjectResourceCheck({ opened, onClose }) {
</TabPanel>
</Tabs>
</>
) : (
<p>Loading...</p>
)}
</PanelBody>
</Panel>
Expand Down
Loading