Skip to content

Provide error handling for route "/check-class-has-data-quality/{id}" #9

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
bas-denisdi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Provide error handling for route "/check-class-has-data-quality/{id}" #9

Show file tree
Hide file tree
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
19 changes: 17 additions & 2 deletions src/Controller/DataQualityController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,24 @@ public function checkClassHasDataQuality(int $id): JsonResponse
throw new DataQualityException('class has no data quality.');
}

return new JsonResponse(['message' => 'ok'], 200);
return new JsonResponse([
'result' => ['message' => 'ok'],
'error' => null,
], 200);

} catch (Exception $exception) {
return new JsonResponse(['message' => $exception->getMessage()], 400);

if ($exception instanceof DataQualityException) {
return new JsonResponse([
'result' => null,
'error' => [
'message' => $exception->getMessage(),
'code' => $exception->getCode()
],
], 200);
}

return new JsonResponse(['message' => $exception->getMessage()], 500);
}
}
}
77 changes: 43 additions & 34 deletions src/Resources/public/js/DataQualityBundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,41 +23,50 @@ pimcore.plugin.DataQualityBundle = Class.create(pimcore.plugin.admin, {
if (object.data.general.o_classId !== 'DQC' && object.data.general.o_type === 'object') {
fetch('/admin/data-quality/check-class-has-data-quality/' + object.id)
.then((response) => {
if (response.status === 200) {
var path = '/admin/data-quality/index/' + object.id;
var html = '<iframe src="' + path + '" style="width: 100%; height: 100%; border: 0;"></iframe>';

this.tab = Ext.create('Ext.panel.Panel', {
border: false,
autoScroll: true,
closable: false,
iconCls: 'pimcore_icon_charty',
bodyCls: 'pimcore_overflow_scrolling',
html: html,
tbar: {
items: [
'->', // Fill
{
xtype: 'button',
text: t('refresh'),
iconCls: 'pimcore_icon_reload',
handler: function () {
var key = "object_" + object.id;
if (pimcore.globalmanager.exists(key)) {
var objectTab = pimcore.globalmanager.get(key);
objectTab.saveToSession(function () {
this.tab.setHtml(html);
}.bind(this));
}
}.bind(this)
}
]
}
});
// this adds the pimcore tab
object.tabbar.add([this.tab]);
pimcore.layout.refresh();
if (response.ok) {
return response.json();
} else {
throw new Error(response.statusText);
}
})
.then((json) => {
if (json.error) {
throw new Error(json.error.message);
}

var path = '/admin/data-quality/index/' + object.id;
var html = '<iframe src="' + path + '" style="width: 100%; height: 100%; border: 0;"></iframe>';

this.tab = Ext.create('Ext.panel.Panel', {
border: false,
autoScroll: true,
closable: false,
iconCls: 'pimcore_icon_charty',
bodyCls: 'pimcore_overflow_scrolling',
html: html,
tbar: {
items: [
'->', // Fill
{
xtype: 'button',
text: t('refresh'),
iconCls: 'pimcore_icon_reload',
handler: function () {
var key = "object_" + object.id;
if (pimcore.globalmanager.exists(key)) {
var objectTab = pimcore.globalmanager.get(key);
objectTab.saveToSession(function () {
this.tab.setHtml(html);
}.bind(this));
}
}.bind(this)
}
]
}
});
// this adds the pimcore tab
object.tabbar.add([this.tab]);
pimcore.layout.refresh();
})
.catch(() => {
// do nothing and show nothing
Expand Down