diff --git a/app/client/src/ce/utils/BusinessFeatures/permissionPageHelpers.tsx b/app/client/src/ce/utils/BusinessFeatures/permissionPageHelpers.tsx index 8fc561e5eb..04a00accf0 100644 --- a/app/client/src/ce/utils/BusinessFeatures/permissionPageHelpers.tsx +++ b/app/client/src/ce/utils/BusinessFeatures/permissionPageHelpers.tsx @@ -8,6 +8,9 @@ import { hasCreateDatasourcePermission as hasCreateDatasourcePermission_EE } fro import { hasManageDatasourcePermission as hasManageDatasourcePermission_CE } from "ce/utils/permissionHelpers"; import { hasManageDatasourcePermission as hasManageDatasourcePermission_EE } from "@appsmith/utils/permissionHelpers"; +import { hasManageWorkspaceDatasourcePermission as hasManageWorkspaceDatasourcePermission_CE } from "ce/utils/permissionHelpers"; +import { hasManageWorkspaceDatasourcePermission as hasManageWorkspaceDatasourcePermission_EE } from "@appsmith/utils/permissionHelpers"; + import { hasDeleteDatasourcePermission as hasDeleteDatasourcePermission_CE } from "ce/utils/permissionHelpers"; import { hasDeleteDatasourcePermission as hasDeleteDatasourcePermission_EE } from "@appsmith/utils/permissionHelpers"; @@ -62,6 +65,14 @@ export const getHasManageDatasourcePermission = ( else return hasManageDatasourcePermission_CE(permissions); }; +export const getHasManageWorkspaceDatasourcePermission = ( + isEnabled: boolean, + permissions?: string[], +) => { + if (isEnabled) return hasManageWorkspaceDatasourcePermission_EE(permissions); + else return hasManageWorkspaceDatasourcePermission_CE(permissions); +}; + export const getHasDeleteDatasourcePermission = ( isEnabled: boolean, permissions?: string[], diff --git a/app/client/src/ce/utils/permissionHelpers.tsx b/app/client/src/ce/utils/permissionHelpers.tsx index b2a7f479f6..353974ffdf 100644 --- a/app/client/src/ce/utils/permissionHelpers.tsx +++ b/app/client/src/ce/utils/permissionHelpers.tsx @@ -81,6 +81,10 @@ export const hasCreateDatasourcePermission = (_permissions?: string[]) => true; export const hasManageDatasourcePermission = (_permissions?: string[]) => true; +export const hasManageWorkspaceDatasourcePermission = ( + _permissions?: string[], +) => true; + export const hasDeleteDatasourcePermission = (_permissions?: string[]) => true; export const hasCreateDatasourceActionPermission = (_permissions?: string[]) => diff --git a/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx b/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx index c03df294b6..31c7a907f9 100644 --- a/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx +++ b/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx @@ -16,6 +16,11 @@ import AnalyticsUtil from "utils/AnalyticsUtil"; const CLIPID = "clip__feature"; const Z_INDEX = 1000; +const WalkthroughDescription = styled(Text)` + // CSS to add new line for each \n in the description + white-space: pre-line; +`; + const WalkthroughWrapper = styled.div<{ overlayColor?: string }>` left: 0px; top: 0px; @@ -304,7 +309,7 @@ const InstructionsComponent = ({ size="md" /> - {details.description} + {details.description} {details.imageURL && (