From 16706cad083c12dec2b8575b01d2af6aa0f6fa0b Mon Sep 17 00:00:00 2001 From: Hetu Nandu Date: Mon, 24 Jun 2024 15:06:38 +0530 Subject: [PATCH] fix: Sync EE items into CE (#34373) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description Going through EE repo to check if there are any changes in the repo (outside EE folder) that do no exist in the CE directory. These changes are harmless and seem to have been added to EE only by mistake. This PR will ensure the changes are copied here as well to maintain the sync ## Automation /ok-to-test tags="@tag.All" ### :mag: Cypress test results > [!IMPORTANT] > 🟣 🟣 🟣 Your tests are running. > Tests running at: > Commit: 825650372300260c39ae7b5b2ce91d2178dfa8c9 > Workflow: `PR Automation test suite` > Tags: `` ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [x] No ## Summary by CodeRabbit - **New Features** - Introduced a new CDN URL declaration for improved asset management. - Added a new function to check if the app mode is in "Published" state. - **Style** - Updated global styles to include new `.ai-window` class in popovers. - Enhanced cursor styling in the `CopyUrlForm` component. - **Bug Fixes** - Corrected an attribute name in the `ReconnectDatasourceModal` component. - **Performance** - Added caching for tenant configuration to optimize loading times. - **Chores** - Set `__webpack_public_path__` to support CDN usage in the Enterprise Edition environment. --- app/client/src/Globals.d.ts | 1 + app/client/src/assets/icons/ads/enter.svg | 1 + app/client/src/assets/images/scim.png | Bin 0 -> 9231 bytes .../assets/lottie/guided-tour-indicator.json.txt | 2 +- app/client/src/globalStyles/popover.ts | 10 ++++++++++ .../AdminSettings/FormGroup/CopyUrlForm.tsx | 2 ++ .../Editor/gitSync/ReconnectDatasourceModal.tsx | 2 +- app/client/src/selectors/editorSelectors.tsx | 3 +++ app/client/src/utils/BrandingUtils.ts | 13 +++++++++++++ .../ButtonGroupWidget/component/index.tsx | 1 + 10 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 app/client/src/assets/icons/ads/enter.svg create mode 100644 app/client/src/assets/images/scim.png diff --git a/app/client/src/Globals.d.ts b/app/client/src/Globals.d.ts index e2e0de448b..2bf7e67e42 100644 --- a/app/client/src/Globals.d.ts +++ b/app/client/src/Globals.d.ts @@ -3,4 +3,5 @@ declare module "*.txt" { export default filePath; } +declare let CDN_URL: string; declare module "echarts-gl"; diff --git a/app/client/src/assets/icons/ads/enter.svg b/app/client/src/assets/icons/ads/enter.svg new file mode 100644 index 0000000000..fd5566defc --- /dev/null +++ b/app/client/src/assets/icons/ads/enter.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/client/src/assets/images/scim.png b/app/client/src/assets/images/scim.png new file mode 100644 index 0000000000000000000000000000000000000000..79df1714bb1a2b279cf868933bee23062b32f044 GIT binary patch literal 9231 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 { : RenderModes.PAGE; }; +export const getIsViewMode = (state: AppState) => + state.entities.app.mode === APP_MODE.PUBLISHED; + export const getViewModePageList = createSelector( getPageList, getCurrentPageId, diff --git a/app/client/src/utils/BrandingUtils.ts b/app/client/src/utils/BrandingUtils.ts index eef24cdd4d..53169ccee3 100644 --- a/app/client/src/utils/BrandingUtils.ts +++ b/app/client/src/utils/BrandingUtils.ts @@ -202,3 +202,16 @@ export const faivconImageValidator = ( callback && callback(e); }; }; + +// NOTE: the reason why the json parsing is out of selector is we don't +// want to do the parsing everytime selector is called +let cachedTenantConfigParsed = {}; +const cachedTenantConfig = localStorage.getItem("tenantConfig"); + +try { + if (cachedTenantConfig) { + cachedTenantConfigParsed = JSON.parse(cachedTenantConfig); + } +} catch (e) {} + +export { cachedTenantConfigParsed }; diff --git a/app/client/src/widgets/ButtonGroupWidget/component/index.tsx b/app/client/src/widgets/ButtonGroupWidget/component/index.tsx index c165962359..0ff9ccb418 100644 --- a/app/client/src/widgets/ButtonGroupWidget/component/index.tsx +++ b/app/client/src/widgets/ButtonGroupWidget/component/index.tsx @@ -40,6 +40,7 @@ interface ButtonData { label?: string; iconName?: string; } + // Extract props influencing to width change const getButtonData = ( groupButtons: Record,