Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

…o chore/entity-list-item
appsmithorg · Dec 25, 2024 · 924ae26 · 924ae26
2 parents 31de395 + f078ec0
commit 924ae26
Show file tree

Hide file tree

Showing 90 changed files with 2,629 additions and 1,494 deletions.
diff --git a/app/client/packages/design-system/widgets/src/components/Select/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Select/src/styles.module.css
@@ -23,3 +23,7 @@ button.selectTriggerButton {
   align-items: center;
   flex: 1;
 }
+
+.selectTriggerButton [data-select-text][data-placeholder] {
+  color: var(--color-fg-neutral-subtle);
+}
diff --git a/app/client/src/constants/PremiumDatasourcesConstants.ts b/app/client/src/constants/PremiumDatasourcesConstants.ts
@@ -15,7 +15,18 @@ export const PREMIUM_INTEGRATIONS: PremiumIntegration[] = [
     name: "Salesforce",
     icon: getAssetUrl(`${ASSETS_CDN_URL}/salesforce-icon.png`),
   },
+  {
+    name: "Slack",
+    icon: getAssetUrl(`${ASSETS_CDN_URL}/slack.png`),
+  },
+  {
+    name: "Jira",
+    icon: getAssetUrl(`${ASSETS_CDN_URL}/jira.png`),
+  },
 ];
 
 export const PREMIUM_INTEGRATION_CONTACT_FORM =
   "PREMIUM_INTEGRATION_CONTACT_FORM";
+
+export const SCHEDULE_CALL_URL =
+  "https://calendly.com/carina-neves-fonseca/appsmith";
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/anvilConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/anvilConfig.ts
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/autocompleteConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/autocompleteConfig.ts
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/defaultsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/defaultsConfig.ts
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/index.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/index.ts
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/metaConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/metaConfig.ts
diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/methodsConfig.ts b/app/client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/methodsConfig.ts
diff --git a/...dules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.test.ts b/...dules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.test.ts
diff --git a/...rc/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.ts b/...rc/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/contentConfig.ts
diff --git a/...client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/index.ts b/...client/src/modules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/index.ts
diff --git a/...odules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/index.ts b/...odules/ui-builder/ui/wds/WDSComboBoxWidget/config/propertyPaneConfig/validations/index.ts