diff --git a/packages/yii-dev-panel-sdk/src/Helper/collectors.ts b/packages/yii-dev-panel-sdk/src/Helper/collectors.ts
index e45c4bc..6d71049 100644
--- a/packages/yii-dev-panel-sdk/src/Helper/collectors.ts
+++ b/packages/yii-dev-panel-sdk/src/Helper/collectors.ts
@@ -14,7 +14,7 @@ export enum CollectorsMap {
ConsoleAppInfoCollector = 'Yiisoft\\Yii\\Debug\\Collector\\Console\\ConsoleAppInfoCollector',
WebAppInfoCollector = 'Yiisoft\\Yii\\Debug\\Collector\\Web\\WebAppInfoCollector',
CommandCollector = 'Yiisoft\\Yii\\Debug\\Collector\\Console\\CommandCollector',
- MiddlewareCollector = 'Yiisoft\\Yii\\Debug\\Collector\\Web\\MiddlewareCollector',
+ MiddlewareCollector = 'Yiisoft\\Middleware\\Dispatcher\\Debug\\MiddlewareCollector ',
RequestCollector = 'Yiisoft\\Yii\\Debug\\Collector\\Web\\RequestCollector',
MailerCollector = 'Yiisoft\\Mailer\\Debug\\MailerCollector',
VarDumperCollector = 'Yiisoft\\Yii\\Debug\\Collector\\VarDumperCollector',
diff --git a/packages/yii-dev-panel-sdk/src/Helper/collectorsTotal.ts b/packages/yii-dev-panel-sdk/src/Helper/collectorsTotal.ts
index cae2e62..70a26ca 100644
--- a/packages/yii-dev-panel-sdk/src/Helper/collectorsTotal.ts
+++ b/packages/yii-dev-panel-sdk/src/Helper/collectorsTotal.ts
@@ -4,41 +4,41 @@ import {CollectorsMap} from '@yiisoft/yii-dev-panel-sdk/Helper/collectors';
export const getCollectedCountByCollector = (collector: CollectorsMap, data: DebugEntry): number | undefined => {
switch (collector) {
case CollectorsMap.AssetCollector:
- return Number(data.asset?.bundles?.total);
+ return Number(data.summary[CollectorsMap.AssetCollector]?.asset?.bundles?.total);
case CollectorsMap.DatabaseCollector:
- return Number(data.db?.queries?.total) + Number(data.db?.transactions?.total);
+ return Number(data.summary[CollectorsMap.DatabaseCollector]?.db?.queries?.total) + Number(data.summary[CollectorsMap.DatabaseCollector]?.db?.transactions?.total);
case CollectorsMap.ExceptionCollector:
- return Object.values(data.exception ?? []).length > 0 ? 1 : 0;
+ return Object.values(data.summary[CollectorsMap.ExceptionCollector] ?? []).length > 0 ? 1 : 0;
case CollectorsMap.EventCollector:
- return Number(data.event?.total);
+ return Number(data.summary[CollectorsMap.EventCollector]?.total);
case CollectorsMap.LogCollector:
- return Number(data.logger?.total);
+ return Number(data.summary[CollectorsMap.LogCollector]?.total);
case CollectorsMap.ServiceCollector:
- return Number(data.service?.total);
+ return Number(data.summary[CollectorsMap.ServiceCollector]?.total);
case CollectorsMap.VarDumperCollector:
- return Number(data['var-dumper']?.total);
+ return Number(data.summary[CollectorsMap.VarDumperCollector]?.total);
case CollectorsMap.ValidatorCollector:
- return Number(data.validator?.total);
+ return Number(data.summary[CollectorsMap.ValidatorCollector]?.validator?.total);
case CollectorsMap.MiddlewareCollector:
- return Number(data.middleware?.total);
+ return Number(data.summary[CollectorsMap.MiddlewareCollector]?.middleware?.total);
case CollectorsMap.QueueCollector:
return (
- Number(data.queue?.countPushes) +
- Number(data.queue?.countStatuses) +
- Number(data.queue?.countProcessingMessages)
+ Number(data.summary[CollectorsMap.QueueCollector]?.queue?.countPushes) +
+ Number(data.summary[CollectorsMap.QueueCollector]?.queue?.countStatuses) +
+ Number(data.summary[CollectorsMap.QueueCollector]?.queue?.countProcessingMessages)
);
case CollectorsMap.HttpClientCollector:
- return Number(data.http?.count);
+ return Number(data.summary[CollectorsMap.HttpClientCollector]?.count);
case CollectorsMap.HttpStreamCollector:
- return Number(data.http_stream?.length);
+ return Number(data.summary[CollectorsMap.HttpStreamCollector]?.streams.length);
case CollectorsMap.MailerCollector:
- return Number(data.mailer?.total);
+ return Number(data.summary[CollectorsMap.MailerCollector]?.mailer?.total);
case CollectorsMap.FilesystemStreamCollector:
- return Object.values(data.fs_stream ?? []).reduce((acc, value) => acc + value, 0);
+ return Object.values(data.summary[CollectorsMap.FilesystemStreamCollector]?.streams ?? []).reduce((acc, value) => acc + value, 0);
case CollectorsMap.ConsoleAppInfoCollector:
return 0;
case CollectorsMap.TimelineCollector:
- return Number(data.timeline?.total);
+ return Number(data.summary[CollectorsMap.TimelineCollector]?.total);
default:
return undefined;
}
diff --git a/packages/yii-dev-panel-sdk/src/Helper/debugEntry.ts b/packages/yii-dev-panel-sdk/src/Helper/debugEntry.ts
index a9ccccb..7875d16 100644
--- a/packages/yii-dev-panel-sdk/src/Helper/debugEntry.ts
+++ b/packages/yii-dev-panel-sdk/src/Helper/debugEntry.ts
@@ -1,9 +1,10 @@
import {DebugEntry} from '@yiisoft/yii-dev-panel-sdk/API/Debug/Debug';
+import {CollectorsMap} from "@yiisoft/yii-dev-panel-sdk/Helper/collectors";
export function isDebugEntryAboutConsole(entry: DebugEntry): boolean {
- return entry && 'console' in entry;
+ return entry && CollectorsMap.CommandCollector in entry.summary;
}
export function isDebugEntryAboutWeb(entry: DebugEntry): boolean {
- return entry && 'web' in entry;
+ return entry && CollectorsMap.WebAppInfoCollector in entry.summary;
}
diff --git a/packages/yii-dev-panel/src/Module/Debug/Pages/Layout.tsx b/packages/yii-dev-panel/src/Module/Debug/Pages/Layout.tsx
index 722829c..905e7f7 100644
--- a/packages/yii-dev-panel/src/Module/Debug/Pages/Layout.tsx
+++ b/packages/yii-dev-panel/src/Module/Debug/Pages/Layout.tsx
@@ -154,10 +154,10 @@ const DebugEntryAutocomplete = ({data, onChange}: DebugEntryAutocompleteProps) =
const renderLabel = useCallback((entry: DebugEntry): string => {
if (isDebugEntryAboutConsole(entry)) {
- return [entry.command?.exitCode === 0 ? '[OK]' : '[ERROR]', entry.command?.input].filter(Boolean).join(' ');
+ return [entry.summary[CollectorsMap.CommandCollector]?.exitCode === 0 ? '[OK]' : '[ERROR]', entry.summary[CollectorsMap.CommandCollector]?.input].filter(Boolean).join(' ');
}
if (isDebugEntryAboutWeb(entry)) {
- return ['[' + entry.response.statusCode + ']', entry.request.method, entry.request.path].join(' ');
+ return ['[' + entry.summary[CollectorsMap.RequestCollector]?.response.statusCode + ']', entry.summary[CollectorsMap.RequestCollector]?.request.method, entry.summary[CollectorsMap.RequestCollector]?.request.path].join(' ');
}
return entry.id;
}, []);
@@ -176,13 +176,13 @@ const DebugEntryAutocomplete = ({data, onChange}: DebugEntryAutocompleteProps) =
- {entry.request.path}
+ {entry.summary[CollectorsMap.RequestCollector]?.request.path}
- {formatDate(entry.web.request.startTime)}
+ {formatDate(entry.summary[CollectorsMap.WebAppInfoCollector]?.request.startTime)}
>
)}