fix: Sync EE items into CE (#34373)
## 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" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!IMPORTANT] > 🟣 🟣 🟣 Your tests are running. > Tests running at: <https://github.com/appsmithorg/appsmith/actions/runs/9642308929> > Commit: 825650372300260c39ae7b5b2ce91d2178dfa8c9 > Workflow: `PR Automation test suite` > Tags: `` <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [x] No <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## 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. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
parent
20b83faec4
commit
16706cad08
1
app/client/src/Globals.d.ts
vendored
1
app/client/src/Globals.d.ts
vendored
|
|
@ -3,4 +3,5 @@ declare module "*.txt" {
|
|||
export default filePath;
|
||||
}
|
||||
|
||||
declare let CDN_URL: string;
|
||||
declare module "echarts-gl";
|
||||
|
|
|
|||
1
app/client/src/assets/icons/ads/enter.svg
Normal file
1
app/client/src/assets/icons/ads/enter.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M19.0003 13.9999L19.0004 5.00003L17.0004 5L17.0003 11.9999L9.41421 12V6.58581L3 13L9.41421 19.4142L9.41421 14L19.0003 13.9999Z"></path></svg>
|
||||
|
After Width: | Height: | Size: 210 B |
BIN
app/client/src/assets/images/scim.png
Normal file
BIN
app/client/src/assets/images/scim.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 9.0 KiB |
|
|
@ -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":[]}
|
||||
{"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":[]}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
`;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -577,7 +577,7 @@ function ReconnectDatasourceModal() {
|
|||
return (
|
||||
<Modal open={isModalOpen}>
|
||||
<ModalContentWrapper
|
||||
data-testid="reconnect-datasource-modal"
|
||||
data-testId="reconnect-datasource-modal"
|
||||
onClick={handleClose}
|
||||
onEscapeKeyDown={onClose}
|
||||
onInteractOutside={handleClose}
|
||||
|
|
|
|||
|
|
@ -225,6 +225,9 @@ export const getRenderMode = (state: AppState) => {
|
|||
: RenderModes.PAGE;
|
||||
};
|
||||
|
||||
export const getIsViewMode = (state: AppState) =>
|
||||
state.entities.app.mode === APP_MODE.PUBLISHED;
|
||||
|
||||
export const getViewModePageList = createSelector(
|
||||
getPageList,
|
||||
getCurrentPageId,
|
||||
|
|
|
|||
|
|
@ -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 };
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ interface ButtonData {
|
|||
label?: string;
|
||||
iconName?: string;
|
||||
}
|
||||
|
||||
// Extract props influencing to width change
|
||||
const getButtonData = (
|
||||
groupButtons: Record<string, GroupButtonProps>,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user