Skip to content

Commit f618cff

Browse files
trishaanandabhvsnjacquesikotjsartisanrahulbarwal
authored
23/06 Daily Promotion (#41018)
## Description > [!TIP] > _Add a TL;DR when the description is longer than 500 words or extremely technical (helps the content, marketing, and DevRel team)._ > > _Please also include relevant motivation and context. List any dependencies that are required for this change. Add links to Notion, Figma or any other documents that might be relevant to the PR._ Fixes #`Issue Number` _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!CAUTION] > If you modify the content in this section, you are likely to disrupt the CI result for your PR. <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Laveena Enid <[email protected]> Co-authored-by: Abhijeet <[email protected]> Co-authored-by: Jacques Ikot <[email protected]> Co-authored-by: Pawan Kumar <[email protected]> Co-authored-by: Rahul Barwal <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Laveena Enid <[email protected]> Co-authored-by: Abhinav Jha <[email protected]> Co-authored-by: Trisha Anand <[email protected]> Co-authored-by: Apeksha Bhosale <[email protected]>
2 parents 5469b9f + 14ab9e7 commit f618cff

File tree

66 files changed

+1127
-150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1127
-150
lines changed

app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_BasicClientSideData_spec.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,5 +162,17 @@ describe(
162162
false,
163163
);
164164
});
165+
166+
it("7. For the empty list, there should be no errors in appsmith console(as empty meta widgets are generated)", () => {
167+
cy.openPropertyPane("listwidgetv2");
168+
169+
_.propPane.UpdatePropertyFieldValue("Items", "[]");
170+
171+
_.agHelper.AssertElementVisibility(
172+
_.locators._visibleTextDiv("No data to display"),
173+
);
174+
175+
_.debuggerHelper.AssertErrorCount(0);
176+
});
165177
},
166178
);

app/client/cypress/e2e/Sanity/Datasources/Airtable_Basic_Spec.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ let dsName: any, jsonSpecies: any, offset: any, insertedRecordId: any;
1818
describe(
1919
"Validate Airtable Ds",
2020
{
21-
tags: ["@tag.Airtable", "@tag.Datasource", "@tag.Sanity"],
21+
tags: [
22+
"@tag.Airtable",
23+
"@tag.Datasource",
24+
"@tag.Sanity",
25+
"@tag.excludeForAirgap",
26+
],
2227
},
2328
() => {
2429
before("Create a new Airtable DS", () => {

app/client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
"tailwindcss": "^3.3.3",
227227
"tern": "^0.21.0",
228228
"tinycolor2": "^1.4.2",
229-
"tinymce": "6.8.3",
229+
"tinymce": "6.8.5",
230230
"toposort": "^2.0.2",
231231
"tslib": "^2.3.1",
232232
"typescript": "^5.5.4",

app/client/packages/design-system/ads/src/Icon/Icon.provider.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,6 +1213,10 @@ const AIChatIcon = importSvg(
12131213
async () => import("../__assets__/icons/ads/ai-chat.svg"),
12141214
);
12151215

1216+
const LightningLineIcon = importSvg(
1217+
async () => import("../__assets__/icons/ads/lightning-line.svg"),
1218+
);
1219+
12161220
import PlayIconPNG from "../__assets__/icons/control/play-icon.png";
12171221

12181222
function PlayIconPNGWrapper() {
@@ -1636,6 +1640,7 @@ const ICON_LOOKUP = {
16361640
intercom: IntercomIcon,
16371641
onedrive: OnedriveIcon,
16381642
sharepoint: SharepointIcon,
1643+
"lightning-line": LightningLineIcon,
16391644
};
16401645

16411646
export const IconCollection = Object.keys(ICON_LOOKUP);

app/client/packages/design-system/ads/src/Input/Input.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ const Input = forwardRef<HTMLInputElement, InputProps>(
135135
readOnly={isReadOnly}
136136
ref={inputRef}
137137
renderer={renderAs}
138+
size="1"
138139
value={value}
139140
{...rest}
140141
/>
Lines changed: 3 additions & 0 deletions
Loading

app/client/src/IDE/constants/SidebarButtons.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const SidebarButtonTitles = {
66
DATA: "Datasources",
77
SETTINGS: "Settings",
88
LIBRARIES: "Libraries",
9+
TRIGGER_SETTINGS: "Trigger Settings",
910
};
1011

1112
export const EditorButton = (urlSuffix: string): IDESidebarButton => ({
@@ -39,3 +40,11 @@ export const SettingsButton = (urlSuffix: string): IDESidebarButton => ({
3940
testId: SidebarButtonTitles.SETTINGS,
4041
urlSuffix,
4142
});
43+
44+
export const TriggerSettingsButton = (urlSuffix: string): IDESidebarButton => ({
45+
state: EditorState.TRIGGER_SETTINGS,
46+
icon: "lightning-line",
47+
tooltip: SidebarButtonTitles.TRIGGER_SETTINGS,
48+
testId: SidebarButtonTitles.TRIGGER_SETTINGS,
49+
urlSuffix,
50+
});

app/client/src/IDE/enums.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ export enum EditorState {
99
EDITOR = "EDITOR",
1010
SETTINGS = "SETTINGS",
1111
LIBRARIES = "LIBRARIES",
12+
TRIGGER_SETTINGS = "TRIGGER_SETTINGS",
1213
}

app/client/src/PluginActionEditor/types/PluginActionTypes.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export enum ActionRunBehaviour {
66
ON_PAGE_LOAD = "ON_PAGE_LOAD",
77
MANUAL = "MANUAL",
88
AUTOMATIC = "AUTOMATIC",
9+
ON_PAGE_UNLOAD = "ON_PAGE_UNLOAD",
910
}
1011

1112
export type ActionRunBehaviourType = `${ActionRunBehaviour}`;

app/client/src/api/TemplatesApi.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,18 @@ class TemplatesAPI extends Api {
116116
body,
117117
);
118118
}
119+
120+
// This endpoint imports the application from a template and creates a workflow,
121+
// and attaches the workflow to the application.
122+
static async importAgentTemplate(
123+
templateId: string,
124+
workspaceId: string,
125+
): Promise<AxiosPromise<ImportTemplateResponse>> {
126+
return Api.post(TemplatesAPI.baseUrl + `/applications/agents`, {
127+
templateId,
128+
workspaceId,
129+
});
130+
}
119131
}
120132

121133
export default TemplatesAPI;

0 commit comments

Comments
 (0)