Merge branch 'release' of https://github.com/appsmithorg/appsmith into fix/upgrade-tinymce-latest-MIT-version

Author: riodeuno

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

@@ -162,5 +162,17 @@ describe(
         false,
       );
     });
+
+    it("7. For the empty list, there should be no errors in appsmith console(as empty meta widgets are generated)", () => {
+      cy.openPropertyPane("listwidgetv2");
+
+      _.propPane.UpdatePropertyFieldValue("Items", "[]");
+
+      _.agHelper.AssertElementVisibility(
+        _.locators._visibleTextDiv("No data to display"),
+      );
+
+      _.debuggerHelper.AssertErrorCount(0);
+    });
   },
 );

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

@@ -1213,6 +1213,10 @@ const AIChatIcon = importSvg(
   async () => import("../__assets__/icons/ads/ai-chat.svg"),
 );
 
+const LightningLineIcon = importSvg(
+  async () => import("../__assets__/icons/ads/lightning-line.svg"),
+);
+
 import PlayIconPNG from "../__assets__/icons/control/play-icon.png";
 
 function PlayIconPNGWrapper() {
@@ -1636,6 +1640,7 @@ const ICON_LOOKUP = {
   intercom: IntercomIcon,
   onedrive: OnedriveIcon,
   sharepoint: SharepointIcon,
+  "lightning-line": LightningLineIcon,
 };
 
 export const IconCollection = Object.keys(ICON_LOOKUP);

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

@@ -135,6 +135,7 @@ const Input = forwardRef<HTMLInputElement, InputProps>(
               readOnly={isReadOnly}
               ref={inputRef}
               renderer={renderAs}
+              size="1"
               value={value}
               {...rest}
             />

app/client/packages/design-system/ads/src/__assets__/icons/ads/lightning-line.svg

@@ -6,6 +6,7 @@ const SidebarButtonTitles = {
   DATA: "Datasources",
   SETTINGS: "Settings",
   LIBRARIES: "Libraries",
+  TRIGGER_SETTINGS: "Trigger Settings",
 };
 
 export const EditorButton = (urlSuffix: string): IDESidebarButton => ({
@@ -39,3 +40,11 @@ export const SettingsButton = (urlSuffix: string): IDESidebarButton => ({
   testId: SidebarButtonTitles.SETTINGS,
   urlSuffix,
 });
+
+export const TriggerSettingsButton = (urlSuffix: string): IDESidebarButton => ({
+  state: EditorState.TRIGGER_SETTINGS,
+  icon: "lightning-line",
+  tooltip: SidebarButtonTitles.TRIGGER_SETTINGS,
+  testId: SidebarButtonTitles.TRIGGER_SETTINGS,
+  urlSuffix,
+});

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

@@ -9,4 +9,5 @@ export enum EditorState {
   EDITOR = "EDITOR",
   SETTINGS = "SETTINGS",
   LIBRARIES = "LIBRARIES",
+  TRIGGER_SETTINGS = "TRIGGER_SETTINGS",
 }

app/client/src/IDE/enums.ts

@@ -116,6 +116,18 @@ class TemplatesAPI extends Api {
       body,
     );
   }
+
+  // This endpoint imports the application from a template and creates a workflow,
+  // and attaches the workflow to the application.
+  static async importAgentTemplate(
+    templateId: string,
+    workspaceId: string,
+  ): Promise<AxiosPromise<ImportTemplateResponse>> {
+    return Api.post(TemplatesAPI.baseUrl + `/applications/agents`, {
+      templateId,
+      workspaceId,
+    });
+  }
 }
 
 export default TemplatesAPI;

app/client/src/api/TemplatesApi.ts

@@ -19,3 +19,9 @@ export const updateOrganizationConfig = (
   type: ReduxActionTypes.UPDATE_ORGANIZATION_CONFIG,
   payload,
 });
+
+export const fetchMyOrganizations = () => {
+  return {
+    type: ReduxActionTypes.FETCH_MY_ORGANIZATIONS_INIT,
+  };
+};

app/client/src/ce/actions/organizationActions.ts

@@ -64,6 +64,7 @@ export interface ApplicationResponsePayload {
   slug: string;
   applicationVersion: ApplicationVersion;
   isPublic?: boolean;
+  connectedWorkflowId?: string;
 }
 
 export interface FetchApplicationPayload {

app/client/src/ce/api/ApplicationApi.tsx

@@ -20,8 +20,20 @@ export interface UpdateOrganizationConfigRequest {
   apiConfig?: AxiosRequestConfig;
 }
 
+export type FetchMyOrganizationsResponse = ApiResponse<{
+  organizations: Organization[];
+}>;
+
+export interface Organization {
+  organizationId: string;
+  organizationName: string;
+  organizationUrl: string;
+  state: string;
+}
+
 export class OrganizationApi extends Api {
   static tenantsUrl = "v1/tenants";
+  static meUrl = "v1/users/me";
 
   static async fetchCurrentOrganizationConfig(): Promise<
     AxiosPromise<FetchCurrentOrganizationConfigResponse>
@@ -41,6 +53,12 @@ export class OrganizationApi extends Api {
       },
     );
   }
+
+  static async fetchMyOrganizations(): Promise<
+    AxiosPromise<FetchMyOrganizationsResponse>
+  > {
+    return Api.get(`${OrganizationApi.meUrl}/organizations`);
+  }
 }
 
 export default OrganizationApi;