From 20122b3f8b7328a9c7fcb2c3ab8f949b39f4a0db Mon Sep 17 00:00:00 2001 From: Akash N Date: Wed, 18 Aug 2021 12:32:43 +0530 Subject: [PATCH 1/7] Expand all errors by default --- .../editorComponents/Debugger/DebuggerLogs.tsx | 10 +++++++--- .../components/editorComponents/Debugger/Errors.tsx | 11 ++--------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx b/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx index b43afffc2578..5d94eb412f55 100644 --- a/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx +++ b/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx @@ -94,14 +94,18 @@ function DebbuggerLogs(props: Props) { placeholderText={createMessage(NO_LOGS)} /> ) : ( - paginatedData.map((e, index: number) => { - const logItemProps = getLogItemProps(e); + paginatedData.map((log, index: number) => { + const logItemProps = getLogItemProps(log); + // Expand the last log and errors by default + const expand = + index === paginatedData.length - 1 || + log.severity === Severity.ERROR; return ( ); }) diff --git a/app/client/src/components/editorComponents/Debugger/Errors.tsx b/app/client/src/components/editorComponents/Debugger/Errors.tsx index 9464249ff48a..fac7a489b3eb 100644 --- a/app/client/src/components/editorComponents/Debugger/Errors.tsx +++ b/app/client/src/components/editorComponents/Debugger/Errors.tsx @@ -6,7 +6,6 @@ import LogItem, { getLogItemProps } from "./LogItem"; import { BlankState } from "./helpers"; import { createMessage, NO_ERRORS } from "constants/messages"; import { getCurrentUser } from "selectors/usersSelectors"; -import { AppState } from "reducers"; import { bootIntercom } from "utils/helpers"; const ContainerWrapper = styled.div` @@ -21,7 +20,6 @@ const ListWrapper = styled.div` function Errors(props: { hasShortCut?: boolean }) { const errors = useSelector(getDebuggerErrors); - const expandId = useSelector((state: AppState) => state.ui.debugger.expandId); const currentUser = useSelector(getCurrentUser); useEffect(() => { @@ -39,14 +37,9 @@ function Errors(props: { hasShortCut?: boolean }) { ) : ( Object.values(errors).map((e, index) => { const logItemProps = getLogItemProps(e); - const id = Object.keys(errors)[index]; - + // Expand all errors by default return ( - + ); }) )} From 87fe08e41e89ae35888ff44cf0d3283f932237ef Mon Sep 17 00:00:00 2001 From: Akash N Date: Wed, 18 Aug 2021 12:49:10 +0530 Subject: [PATCH 2/7] Hide error count when there are no errors --- app/client/src/components/editorComponents/Debugger/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/client/src/components/editorComponents/Debugger/index.tsx b/app/client/src/components/editorComponents/Debugger/index.tsx index 86d987f91418..862c5928bf6e 100644 --- a/app/client/src/components/editorComponents/Debugger/index.tsx +++ b/app/client/src/components/editorComponents/Debugger/index.tsx @@ -78,7 +78,7 @@ function Debugger() { onClick={onClick} > -
{errorCount}
+ {!!errorCount &&
{errorCount}
} ); return ; From 63f09155337592ba295c66c89f5e62db0cc842e9 Mon Sep 17 00:00:00 2001 From: Akash N Date: Wed, 18 Aug 2021 13:04:18 +0530 Subject: [PATCH 3/7] No need to expand errors in logs --- .../components/editorComponents/Debugger/DebuggerLogs.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx b/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx index 5d94eb412f55..f1675fa4b6a7 100644 --- a/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx +++ b/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx @@ -96,16 +96,12 @@ function DebbuggerLogs(props: Props) { ) : ( paginatedData.map((log, index: number) => { const logItemProps = getLogItemProps(log); - // Expand the last log and errors by default - const expand = - index === paginatedData.length - 1 || - log.severity === Severity.ERROR; return ( ); }) From b1b7ff1e2592f9573ba2c0a4312b6dad084ac8ff Mon Sep 17 00:00:00 2001 From: Akash N Date: Wed, 18 Aug 2021 13:11:01 +0530 Subject: [PATCH 4/7] Undo unnecessary change --- .../src/components/editorComponents/Debugger/DebuggerLogs.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx b/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx index f1675fa4b6a7..b43afffc2578 100644 --- a/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx +++ b/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx @@ -94,8 +94,8 @@ function DebbuggerLogs(props: Props) { placeholderText={createMessage(NO_LOGS)} /> ) : ( - paginatedData.map((log, index: number) => { - const logItemProps = getLogItemProps(log); + paginatedData.map((e, index: number) => { + const logItemProps = getLogItemProps(e); return ( Date: Wed, 18 Aug 2021 14:05:32 +0530 Subject: [PATCH 5/7] Add test for to check if all errors are expanded - Add some placeholder tests --- .../Smoke_TestSuite/ClientSideTests/Debugger/Logs_spec.js | 8 ++++++++ .../ClientSideTests/Debugger/Widget_Error_spec.js | 8 ++++++++ .../src/components/editorComponents/Debugger/LogItem.tsx | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Logs_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Logs_spec.js index d71d5f3fbbb2..c14374e26701 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Logs_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Logs_spec.js @@ -27,4 +27,12 @@ describe("Debugger logs", function() { cy.contains(debuggerLocators.debuggerIcon, 0); }); }); + + it("Api headers need to be shown as headers in logs", function() { + // TODO + }); + + it("Api body needs to be shown as JSON when possible", function() { + // TODO + }); }); diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Widget_Error_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Widget_Error_spec.js index b90c506c6f94..cb72156dfab2 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Widget_Error_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Widget_Error_spec.js @@ -22,4 +22,12 @@ describe("Widget error state", function() { cy.get(debuggerLocators.debuggerLogState).contains("Test"); }); + + it("All errors should be expanded by default", function() { + cy.testJsontext("label", "{{[]}}"); + + cy.get(".t--debugger-message") + .should("be.visible") + .should("have.length", 2); + }); }); diff --git a/app/client/src/components/editorComponents/Debugger/LogItem.tsx b/app/client/src/components/editorComponents/Debugger/LogItem.tsx index 2f4ef5c5b977..fdc2bb722424 100644 --- a/app/client/src/components/editorComponents/Debugger/LogItem.tsx +++ b/app/client/src/components/editorComponents/Debugger/LogItem.tsx @@ -290,7 +290,7 @@ function LogItem(props: LogItemProps) { return ( onLogClick(event, e)} > {e.message} From 0e000f50919bc4d1e5868ba71f744e8261df60e4 Mon Sep 17 00:00:00 2001 From: Akash N Date: Wed, 18 Aug 2021 14:59:18 +0530 Subject: [PATCH 6/7] Fix test --- .../ClientSideTests/Debugger/PageOnLoad_spec.js | 2 +- app/client/src/components/editorComponents/Debugger/index.tsx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/PageOnLoad_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/PageOnLoad_spec.js index 2fd3a73d96a1..405dd7547b41 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/PageOnLoad_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/PageOnLoad_spec.js @@ -18,6 +18,6 @@ describe("Check debugger logs state when there are onPageLoad actions", function cy.get(explorer.addWidget).click(); cy.reload(); - cy.contains(debuggerLocators.debuggerIcon, 0); + cy.get(".t--debugger-count").should("not.be.visible"); }); }); diff --git a/app/client/src/components/editorComponents/Debugger/index.tsx b/app/client/src/components/editorComponents/Debugger/index.tsx index 862c5928bf6e..31625b2fb4e6 100644 --- a/app/client/src/components/editorComponents/Debugger/index.tsx +++ b/app/client/src/components/editorComponents/Debugger/index.tsx @@ -78,7 +78,9 @@ function Debugger() { onClick={onClick} > - {!!errorCount &&
{errorCount}
} + {!!errorCount && ( +
{errorCount}
+ )} ); return ; From 02bb9619f70367428c57b04db5939279c7dc6ee4 Mon Sep 17 00:00:00 2001 From: Akash N Date: Thu, 19 Aug 2021 14:43:51 +0530 Subject: [PATCH 7/7] Fix debugger tests --- .../Smoke_TestSuite/ClientSideTests/Debugger/Logs_spec.js | 2 +- .../ClientSideTests/Debugger/PageOnLoad_spec.js | 2 +- app/client/cypress/locators/Debugger.json | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Logs_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Logs_spec.js index c14374e26701..6bdca0227184 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Logs_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/Logs_spec.js @@ -24,7 +24,7 @@ describe("Debugger logs", function() { cy.get(commonlocators.homeIcon).click({ force: true }); cy.generateUUID().then((id) => { cy.CreateAppInFirstListedOrg(id); - cy.contains(debuggerLocators.debuggerIcon, 0); + cy.get(debuggerLocators.errorCount).should("not.exist"); }); }); diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/PageOnLoad_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/PageOnLoad_spec.js index 405dd7547b41..8ac71402ade0 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/PageOnLoad_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Debugger/PageOnLoad_spec.js @@ -18,6 +18,6 @@ describe("Check debugger logs state when there are onPageLoad actions", function cy.get(explorer.addWidget).click(); cy.reload(); - cy.get(".t--debugger-count").should("not.be.visible"); + cy.get(debuggerLocators.errorCount).should("not.exist"); }); }); diff --git a/app/client/cypress/locators/Debugger.json b/app/client/cypress/locators/Debugger.json index 9e5cda0e4c90..4a3a4c2829b6 100644 --- a/app/client/cypress/locators/Debugger.json +++ b/app/client/cypress/locators/Debugger.json @@ -1,4 +1,5 @@ { "debuggerIcon": ".t--debugger", - "debuggerLogState": ".t--debugger-log-state" + "debuggerLogState": ".t--debugger-log-state", + "errorCount": ".t--debugger-count" } \ No newline at end of file