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 0000000000..79df1714bb Binary files /dev/null and b/app/client/src/assets/images/scim.png differ diff --git a/app/client/src/assets/lottie/guided-tour-indicator.json.txt b/app/client/src/assets/lottie/guided-tour-indicator.json.txt index 4df1c90f81..7c9e70de00 100644 --- a/app/client/src/assets/lottie/guided-tour-indicator.json.txt +++ b/app/client/src/assets/lottie/guided-tour-indicator.json.txt @@ -1 +1 @@ -{"v":"5.5.8","fr":30,"ip":0,"op":55,"w":30,"h":30,"nm":"dot notification 2","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"palette 01","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[15,15,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0]},"t":0,"s":[80,80,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":13,"s":[110,110,100]},{"t":43,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[11.25,11.25],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":11.25,"ix":4},"nm":"Trazado de rectángulo 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.30980399251,0.160784006119,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Relleno 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformar"}],"nm":"palette 01","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"palette 02","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[5]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":17.5,"s":[35]},{"t":35,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[15,15,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0]},"t":0,"s":[60,60,100]},{"t":35,"s":[150,150,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":18,"ix":4},"nm":"Trazado de rectángulo 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.30980399251,0.160784006119,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Relleno 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformar"}],"nm":"palette 02","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0}],"markers":[]} \ No newline at end of file +{"v":"5.5.8","fr":30,"ip":0,"op":55,"w":30,"h":30,"nm":"dot notification 2","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"palette 01","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[15,15,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0]},"t":0,"s":[80,80,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":13,"s":[110,110,100]},{"t":43,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[11.25,11.25],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":11.25,"ix":4},"nm":"Trazado de rectángulo 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.30980399251,0.160784006119,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Relleno 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformar"}],"nm":"palette 01","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"palette 02","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[5]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":17.5,"s":[35]},{"t":35,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[15,15,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0]},"t":0,"s":[60,60,100]},{"t":35,"s":[150,150,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":18,"ix":4},"nm":"Trazado de rectángulo 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.30980399251,0.160784006119,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Relleno 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transformar"}],"nm":"palette 02","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":60,"st":0,"bm":0}],"markers":[]} diff --git a/app/client/src/globalStyles/popover.ts b/app/client/src/globalStyles/popover.ts index ac4b525027..dd725ecba0 100644 --- a/app/client/src/globalStyles/popover.ts +++ b/app/client/src/globalStyles/popover.ts @@ -45,4 +45,14 @@ export const PopoverStyles = createGlobalStyle` } } } + .ai-window { + .bp3-popover2 { + & { + border: 1px solid !important; + border-radius: var(--ads-v2-border-radius); + border-color: var(--ads-v2-color-border) !important; + box-shadow: var(--ads-v2-shadow-popovers) !important; + } + } + } `; diff --git a/app/client/src/pages/AdminSettings/FormGroup/CopyUrlForm.tsx b/app/client/src/pages/AdminSettings/FormGroup/CopyUrlForm.tsx index 0aee861f10..1e39e8c4dd 100644 --- a/app/client/src/pages/AdminSettings/FormGroup/CopyUrlForm.tsx +++ b/app/client/src/pages/AdminSettings/FormGroup/CopyUrlForm.tsx @@ -7,6 +7,8 @@ import { Icon, Input, Text, toast, Tooltip } from "design-system"; export const BodyContainer = styled.div` width: 100%; padding: 0 0 16px; + .ads-v2-input__input-section-input, + .ads-v2-input__input-section-icon[data-has-onclick="true"], .ads-v2-input__input-section-icon[data-has-onclick="true"] * { cursor: pointer !important; } diff --git a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx index e832a27cdf..11beaa2dfa 100644 --- a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx +++ b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx @@ -577,7 +577,7 @@ function ReconnectDatasourceModal() { return ( { : 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,