From 65391ab2e025f5dedecb720343f0d6eb8cb91c48 Mon Sep 17 00:00:00 2001
From: Aman Agarwal <aman@appsmith.com>
Date: Wed, 25 Dec 2024 11:58:07 +0530
Subject: [PATCH 1/2] fix: calendly link on schedule a call click, jira and
 slack integration premium tag (#38331)

---
 .../src/constants/PremiumDatasourcesConstants.ts   | 11 +++++++++++
 .../IntegrationEditor/CreateNewDatasourceTab.tsx   | 14 ++++++--------
 .../Editor/IntegrationEditor/DatasourceHome.tsx    |  1 -
 .../src/pages/Editor/IntegrationEditor/NewApi.tsx  |  4 +++-
 .../pages/Editor/IntegrationEditor/NewQuery.tsx    |  4 +---
 .../PremiumDatasources/ContactForm.tsx             |  6 +++---
 app/client/src/utils/PremiumDatasourcesHelpers.ts  | 10 ++++++++++
 7 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/app/client/src/constants/PremiumDatasourcesConstants.ts b/app/client/src/constants/PremiumDatasourcesConstants.ts
index e659b55bbbef..dba0034d1a02 100644
--- 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/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx b/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx
index e23016fdfae5..8782924c38f8 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx
@@ -131,7 +131,6 @@ function CreateNewDatasource({
   active,
   isCreating,
   isOnboardingScreen,
-  isPremiumDatasourcesViewEnabled,
   pageId,
   showMostPopularPlugins,
   showUnsupportedPluginDialog, // TODO: Fix this the next time the file is edited
@@ -172,11 +171,7 @@ function CreateNewDatasource({
         parentEntityType={parentEntityType}
         showMostPopularPlugins={showMostPopularPlugins}
         showUnsupportedPluginDialog={showUnsupportedPluginDialog}
-      >
-        {showMostPopularPlugins && isPremiumDatasourcesViewEnabled && (
-          <PremiumDatasources />
-        )}
-      </NewQueryScreen>
+      />
     </div>
   );
 }
@@ -184,6 +179,7 @@ function CreateNewDatasource({
 function CreateNewSaasIntegration({
   active,
   isCreating,
+  isPremiumDatasourcesViewEnabled,
   pageId,
   showUnsupportedPluginDialog, // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -217,7 +213,9 @@ function CreateNewSaasIntegration({
           pageId={pageId}
           showSaasAPIs
           showUnsupportedPluginDialog={showUnsupportedPluginDialog}
-        />
+        >
+          {isPremiumDatasourcesViewEnabled && <PremiumDatasources />}
+        </NewApiScreen>
       </div>
     </>
   ) : null;
@@ -321,7 +319,6 @@ class CreateNewDatasourceTab extends React.Component<
             active={false}
             isCreating={isCreating}
             isOnboardingScreen={!!isOnboardingScreen}
-            isPremiumDatasourcesViewEnabled={isPremiumDatasourcesViewEnabled}
             location={location}
             pageId={pageId}
             showMostPopularPlugins
@@ -347,6 +344,7 @@ class CreateNewDatasourceTab extends React.Component<
           <CreateNewSaasIntegration
             active={false}
             isCreating={isCreating}
+            isPremiumDatasourcesViewEnabled={isPremiumDatasourcesViewEnabled}
             location={location}
             pageId={pageId}
             showUnsupportedPluginDialog={this.showUnsupportedPluginDialog}
diff --git a/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx b/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx
index adbb9d50963f..047450a270be 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx
@@ -295,7 +295,6 @@ class DatasourceHomeScreen extends React.Component<Props> {
               </DatasourceCard>
             );
           })}
-          {this.props.children}
         </DatasourceCardsContainer>
       </DatasourceHomePage>
     );
diff --git a/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx b/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx
index 4364bad281e3..a16ce56a84f0 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from "react";
+import React, { useCallback, useEffect, useState, type ReactNode } from "react";
 import { connect, useSelector } from "react-redux";
 import styled from "styled-components";
 import {
@@ -142,6 +142,7 @@ interface ApiHomeScreenProps {
     apiType: string,
   ) => void;
   isOnboardingScreen?: boolean;
+  children?: ReactNode;
 }
 
 type Props = ApiHomeScreenProps;
@@ -328,6 +329,7 @@ function NewApiScreen(props: Props) {
             </CardContentWrapper>
           </ApiCard>
         ))}
+        {props.children}
       </ApiCardsContainer>
     </StyledContainer>
   );
diff --git a/app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx b/app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx
index 78fec8f8a883..15ea740854db 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx
@@ -56,9 +56,7 @@ class QueryHomeScreen extends React.Component<QueryHomeScreenProps> {
           parentEntityType={parentEntityType}
           showMostPopularPlugins={showMostPopularPlugins}
           showUnsupportedPluginDialog={showUnsupportedPluginDialog}
-        >
-          {this.props.children}
-        </DataSourceHome>
+        />
       </QueryHomePage>
     );
   }
diff --git a/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/ContactForm.tsx b/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/ContactForm.tsx
index 369fb7c7b020..63f265df3fed 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/ContactForm.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/ContactForm.tsx
@@ -1,4 +1,4 @@
-import { Button, Flex, ModalHeader, Text, toast } from "@appsmith/ads";
+import { Button, ModalFooter, ModalHeader, Text, toast } from "@appsmith/ads";
 import { createMessage, PREMIUM_DATASOURCES } from "ee/constants/messages";
 import type { AppState } from "ee/reducers";
 import React, { useCallback } from "react";
@@ -97,7 +97,7 @@ const PremiumDatasourceContactForm = (
           size="md"
           type="email"
         />
-        <Flex gap="spaces-7" justifyContent="flex-end" marginTop="spaces-3">
+        <ModalFooter>
           {shouldLearnMoreButtonBeVisible(!isFreePlanInstance) && (
             <Button
               aria-label="Learn more"
@@ -114,7 +114,7 @@ const PremiumDatasourceContactForm = (
               !isFreePlanInstance,
             )}
           </Button>
-        </Flex>
+        </ModalFooter>
       </FormWrapper>
     </>
   );
diff --git a/app/client/src/utils/PremiumDatasourcesHelpers.ts b/app/client/src/utils/PremiumDatasourcesHelpers.ts
index 0ea5df550240..ef33d6db3e3f 100644
--- a/app/client/src/utils/PremiumDatasourcesHelpers.ts
+++ b/app/client/src/utils/PremiumDatasourcesHelpers.ts
@@ -1,3 +1,4 @@
+import { SCHEDULE_CALL_URL } from "constants/PremiumDatasourcesConstants";
 import { createMessage, PREMIUM_DATASOURCES } from "ee/constants/messages";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { isRelevantEmail } from "utils/formhelpers";
@@ -58,6 +59,15 @@ export const handleSubmitEvent = (
       email,
     },
   );
+
+  const scheduleACallUrl =
+    !isBusinessOrEnterprise && validRelevantEmail
+      ? `${SCHEDULE_CALL_URL}?email=${email}`
+      : "";
+
+  if (scheduleACallUrl) {
+    window.open(scheduleACallUrl, "_blank");
+  }
 };
 
 export const getContactFormModalTitle = (

From f078ec0b32774a02bf2a481a744e7382b7cf2fcc Mon Sep 17 00:00:00 2001
From: Trisha Anand <trisha@appsmith.com>
Date: Wed, 25 Dec 2024 13:12:45 +0530
Subject: [PATCH 2/2] chore: Minor code refactor for seat based pricing
 (#38359)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## 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

/test sanity

### :mag: Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/12490386991>
> Commit: a06c91677563b3b78d50f3a439ebb9b83196d130
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=12490386991&attempt=2"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.Sanity`
> Spec:
> <hr>Wed, 25 Dec 2024 07:41:48 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

- **New Features**
- Introduced methods for user retrieval and signup conditions, enhancing
user management capabilities.
	- Added functionality to retrieve system-generated user emails.

- **Bug Fixes**
- Improved user lookup process by centralizing logic into dedicated
methods.

- **Documentation**
- Updated method visibility for better accessibility of user-related
functionalities.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 .../handlers/ce/CustomOAuth2UserServiceCEImpl.java     | 10 +++++++---
 .../handlers/ce/CustomOidcUserServiceCEImpl.java       | 10 +++++++---
 .../server/repositories/ce/CustomUserRepositoryCE.java |  4 ++++
 .../repositories/ce/CustomUserRepositoryCEImpl.java    |  3 ++-
 .../com/appsmith/server/services/ce/UserServiceCE.java |  2 ++
 .../appsmith/server/services/ce/UserServiceCEImpl.java |  3 ++-
 6 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/CustomOAuth2UserServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/CustomOAuth2UserServiceCEImpl.java
index 33cced2fd3f6..fc8ce6974ff5 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/CustomOAuth2UserServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/CustomOAuth2UserServiceCEImpl.java
@@ -47,9 +47,7 @@ private Mono<User> checkAndCreateUser(OAuth2User oAuth2User, OAuth2UserRequest u
 
         String username = oAuth2User.getName();
 
-        return repository
-                .findByEmail(username)
-                .switchIfEmpty(repository.findFirstByEmailIgnoreCaseOrderByCreatedAtDesc(username))
+        return this.findByUsername(username)
                 .switchIfEmpty(Mono.defer(() -> {
                     User newUser = new User();
                     newUser.setName(oAuth2User.getName());
@@ -76,4 +74,10 @@ private Mono<User> checkAndCreateUser(OAuth2User oAuth2User, OAuth2UserRequest u
                         error -> new AppsmithOAuth2AuthenticationException(
                                 new OAuth2Error(error.getAppErrorCode().toString(), error.getMessage(), "")));
     }
+
+    protected Mono<User> findByUsername(String email) {
+        return repository
+                .findByEmail(email)
+                .switchIfEmpty(repository.findFirstByEmailIgnoreCaseOrderByCreatedAtDesc(email));
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/CustomOidcUserServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/CustomOidcUserServiceCEImpl.java
index cbfc782c5e2f..29ef72f2a57e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/CustomOidcUserServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/CustomOidcUserServiceCEImpl.java
@@ -49,9 +49,7 @@ public Mono<User> checkAndCreateUser(OidcUser oidcUser, OidcUserRequest userRequ
 
         String username = (!StringUtils.isEmpty(oidcUser.getEmail())) ? oidcUser.getEmail() : oidcUser.getName();
 
-        return repository
-                .findByEmail(username)
-                .switchIfEmpty(repository.findFirstByEmailIgnoreCaseOrderByCreatedAtDesc(username))
+        return this.findByUsername(username)
                 .switchIfEmpty(Mono.defer(() -> {
                     User newUser = new User();
                     if (oidcUser.getUserInfo() != null) {
@@ -82,4 +80,10 @@ public Mono<User> checkAndCreateUser(OidcUser oidcUser, OidcUserRequest userRequ
                         error -> new AppsmithOAuth2AuthenticationException(
                                 new OAuth2Error(error.getAppErrorCode().toString(), error.getMessage(), "")));
     }
+
+    protected Mono<User> findByUsername(String email) {
+        return repository
+                .findByEmail(email)
+                .switchIfEmpty(repository.findFirstByEmailIgnoreCaseOrderByCreatedAtDesc(email));
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserRepositoryCE.java
index 6ceef7aed4a5..10c66781ecf4 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserRepositoryCE.java
@@ -6,6 +6,8 @@
 import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import reactor.core.publisher.Mono;
 
+import java.util.Set;
+
 public interface CustomUserRepositoryCE extends AppsmithRepository<User> {
 
     Mono<User> findByEmail(String email, AclPermission aclPermission);
@@ -14,5 +16,7 @@ public interface CustomUserRepositoryCE extends AppsmithRepository<User> {
 
     Mono<Boolean> isUsersEmpty();
 
+    Set<String> getSystemGeneratedUserEmails();
+
     Mono<Integer> updateById(String id, UpdateDefinition updateObj);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserRepositoryCEImpl.java
index b09ac27cc259..17db68683223 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserRepositoryCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomUserRepositoryCEImpl.java
@@ -48,7 +48,8 @@ public Mono<Boolean> isUsersEmpty() {
                 .map(count -> count == 0);
     }
 
-    protected Set<String> getSystemGeneratedUserEmails() {
+    @Override
+    public Set<String> getSystemGeneratedUserEmails() {
         Set<String> systemGeneratedEmails = new HashSet<>();
         systemGeneratedEmails.add(FieldName.ANONYMOUS_USER);
         return systemGeneratedEmails;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCE.java
index 2bdb85f67803..24dfffcbc0a9 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCE.java
@@ -41,6 +41,8 @@ public interface UserServiceCE extends CrudService<User, String> {
 
     Flux<User> getAllByEmails(Set<String> emails, AclPermission permission);
 
+    Mono<User> signupIfAllowed(User user);
+
     Mono<User> updateWithoutPermission(String id, User update);
 
     Mono<Boolean> resendEmailVerification(ResendEmailVerificationDTO resendEmailVerificationDTO, String redirectUrl);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java
index 35d24c352aa4..371d6b3a9ebc 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java
@@ -510,7 +510,8 @@ public Mono<UserSignupDTO> createUser(User user) {
      * @param user User object representing the user to be created/enabled.
      * @return Publishes the user object, after having been saved.
      */
-    private Mono<User> signupIfAllowed(User user) {
+    @Override
+    public Mono<User> signupIfAllowed(User user) {
         boolean isAdminUser = false;
 
         if (!commonConfig.getAdminEmails().contains(user.getEmail())) {