Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d09966f
fixing the switch UI for JS objects function popover & updating query…
ankitakinger Dec 4, 2024
ff52c5f
updating the schema tab to datasource tab
ankitakinger Dec 4, 2024
1ddf9ca
adding background to query status bar in response pane to avoid text …
ankitakinger Dec 4, 2024
cb3688f
updating locators
ankitakinger Dec 4, 2024
12bc4fc
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
ankitakinger Dec 5, 2024
0baa8af
removing the edit datasource button for saved APIs next to the URL
ankitakinger Dec 6, 2024
a6f06fd
adding the datasource selector and datasource tab for APIs
ankitakinger Dec 6, 2024
059cd8f
Migration to add documentation link to rest api plugin
trishaanand Dec 6, 2024
aeebee2
Merge branch 'chore/actions-redesign-fixes' of github.com:appsmithorg…
trishaanand Dec 6, 2024
5c0d7cb
hiding the edit config icon button when schema is loading
ankitakinger Dec 6, 2024
9b15718
Merge branch 'chore/actions-redesign-fixes' of https://github.com/app…
ankitakinger Dec 6, 2024
077835c
updating icon
ankitakinger Dec 6, 2024
cd89c1f
adding no access state for datasource tab
ankitakinger Dec 6, 2024
e2f4937
addressing review comments
ankitakinger Dec 6, 2024
3ac69bf
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
ankitakinger Dec 6, 2024
adc124b
Merge branch 'release' into chore/actions-redesign-fixes
hetunandu Dec 9, 2024
b295ed9
fixing tests
ankitakinger Dec 9, 2024
1b0c9db
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
ankitakinger Dec 9, 2024
925369c
fixing unit test
ankitakinger Dec 9, 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
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export const StyledSwitchLabel = styled(Text)<{
justify-content: space-between;
min-width: 9rem;
cursor: pointer;
word-break: break-all;

${({ isDisabled }) =>
isDisabled &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function PluginActionResponse() {
dispatch(
setPluginActionEditorDebuggerState({
open: true,
selectedTab: DEBUGGER_TAB_KEYS.SCHEMA_TAB,
selectedTab: DEBUGGER_TAB_KEYS.DATASOURCE_TAB,
}),
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ export const StatusBar = styled.div`
display: flex;
justify-content: space-between;
height: ${TAB_BAR_HEIGHT}px;
padding: 8px;
padding: 8px 8px 8px 12px;
border-bottom: 1px solid var(--ads-v2-color-border);
z-index: var(--ads-v2-z-index-1);
background: var(--ads-v2-color-bg);
Comment thread
ankitakinger marked this conversation as resolved.
`;

export const StatusBarInfo = styled.div`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ function usePluginActionResponseTabs() {

if (showSchema) {
tabs.push({
key: DEBUGGER_TAB_KEYS.SCHEMA_TAB,
title: "Schema",
key: DEBUGGER_TAB_KEYS.DATASOURCE_TAB,
title: "Datasource",
panelComponent: (
<Schema
currentActionId={action.id}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function DebuggerTabs() {
const shouldRender = !(
selectedTab === DEBUGGER_TAB_KEYS.RESPONSE_TAB ||
selectedTab === DEBUGGER_TAB_KEYS.HEADER_TAB ||
selectedTab === DEBUGGER_TAB_KEYS.SCHEMA_TAB
selectedTab === DEBUGGER_TAB_KEYS.DATASOURCE_TAB
);

return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export enum DEBUGGER_TAB_KEYS {
SCHEMA_TAB = "SCHEMA_TAB",
DATASOURCE_TAB = "DATASOURCE_TAB",
Comment thread
ankitakinger marked this conversation as resolved.
RESPONSE_TAB = "RESPONSE_TAB",
HEADER_TAB = "HEADERS_TAB",
ERROR_TAB = "ERROR_TAB",
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/pages/Editor/DataSourceEditor/Debugger.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export default function Debugger() {
const shouldRender = !(
selectedResponseTab === DEBUGGER_TAB_KEYS.RESPONSE_TAB ||
selectedResponseTab === DEBUGGER_TAB_KEYS.HEADER_TAB ||
selectedResponseTab === DEBUGGER_TAB_KEYS.SCHEMA_TAB
selectedResponseTab === DEBUGGER_TAB_KEYS.DATASOURCE_TAB
);

return (
Expand Down
6 changes: 3 additions & 3 deletions app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ function QueryDebuggerTabs({
dispatch(
setPluginActionEditorDebuggerState({
open: true,
selectedTab: DEBUGGER_TAB_KEYS.SCHEMA_TAB,
selectedTab: DEBUGGER_TAB_KEYS.DATASOURCE_TAB,
}),
);
}
Expand Down Expand Up @@ -217,8 +217,8 @@ function QueryDebuggerTabs({

if (showSchema && currentActionConfig && currentActionConfig.datasource) {
responseTabs.unshift({
key: DEBUGGER_TAB_KEYS.SCHEMA_TAB,
title: "Schema",
key: DEBUGGER_TAB_KEYS.DATASOURCE_TAB,
title: "Datasource",
panelComponent: (
<Schema
currentActionId={currentActionConfig.id}
Expand Down