Skip to content

Commit 32d9889

Browse files
FalkWolskyFalkWolsky
authored
Merge pull request #480 from lowcoder-org/dev
Dev -> Main v2.1.4
2 parents eb14d0d + e8bf78e commit 32d9889

File tree

16 files changed

+50
-42
lines changed

16 files changed

+50
-42
lines changed

‎client/packages/lowcoder-cli/client.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ declare var REACT_APP_LANGUAGES: string;
3131
declare var REACT_APP_COMMIT_ID: string;
3232
declare var REACT_APP_API_HOST: string;
3333
declare var LOWCODER_NODE_SERVICE_URL: string;
34-
declare var LOWCODER_SHOW_BRAND: string;
35-
declare var LOWCODER_CUSTOM_LOGO: string;
36-
declare var LOWCODER_CUSTOM_LOGO_SQUARE: string;
37-
declare var LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string;
34+
declare var REACT_APP_LOWCODER_SHOW_BRAND: string;
35+
declare var REACT_APP_LOWCODER_CUSTOM_LOGO: string;
36+
declare var REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE: string;
37+
declare var REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string;
3838
declare var REACT_APP_ENV: string;
3939
declare var REACT_APP_BUILD_ID: string;
4040
declare var REACT_APP_LOG_LEVEL: string;

‎client/packages/lowcoder-dev-utils/buildVars.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@ export const buildVars = [
2020
defaultValue: "",
2121
},
2222
{
23-
name: "LOWCODER_SHOW_BRAND",
23+
name: "REACT_APP_LOWCODER_SHOW_BRAND",
2424
defaultValue: 'false',
2525
},
2626
{
27-
name: "LOWCODER_CUSTOM_LOGO",
27+
name: "REACT_APP_LOWCODER_CUSTOM_LOGO",
2828
defaultValue: '',
2929
},
3030
{
31-
name: "LOWCODER_CUSTOM_LOGO_SQUARE",
31+
name: "REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE",
3232
defaultValue: '',
3333
},
3434
{
35-
name: "LOWCODER_NODE_SERVICE_URL",
36-
defaultValue: "",
35+
name: "REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT",
36+
defaultValue: '',
3737
},
3838
{
39-
name: "LOWCODER_CUSTOM_AUTH_WELCOME_TEXT",
39+
name: "LOWCODER_NODE_SERVICE_URL",
4040
defaultValue: "",
4141
},
4242
{

‎client/packages/lowcoder/index.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,11 @@
9696
<div id="root"></div>
9797
<script type="module" src="/src/index.ts"></script>
9898
<!-- <%- browserCheckScript %> -->
99+
<script>
100+
window.lowcoder_show_brand = "<%= process.env.REACT_APP_LOWCODER_SHOW_BRAND %>";
101+
window.lowcoder_custom_auth_welcome_text = "<%= process.env.REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT %>";
102+
window.lowcoder_custom_logo = "<%= process.env.REACT_APP_LOWCODER_CUSTOM_LOGO %>";
103+
window.lowcoder_custom_logo_square = "<%= process.env.REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE %>";
104+
</script>
99105
</body>
100106
</html>

‎client/packages/lowcoder/src/api/configApi.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class ConfigApi extends Api {
1313
static fetchConfig(orgId?: string): AxiosPromise<ConfigResponse> {
1414
let authConfigURL = ConfigApi.configURL;
1515
if(orgId?.length) {
16-
authConfigURL += `?orgId?=${orgId}`;
16+
authConfigURL += `?orgId=${orgId}`;
1717
}
1818
return Api.get(authConfigURL);
1919
}

‎client/packages/lowcoder/src/app-env.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ declare var REACT_APP_LANGUAGES: string;
3434
declare var REACT_APP_COMMIT_ID: string;
3535
declare var REACT_APP_API_HOST: string;
3636
declare var LOWCODER_NODE_SERVICE_URL: string;
37-
declare var LOWCODER_SHOW_BRAND: string;
38-
declare var LOWCODER_CUSTOM_LOGO: string;
39-
declare var LOWCODER_CUSTOM_LOGO_SQUARE: string;
40-
declare var LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string;
37+
declare var REACT_APP_LOWCODER_SHOW_BRAND: string;
38+
declare var REACT_APP_LOWCODER_CUSTOM_LOGO: string;
39+
declare var REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE: string;
40+
declare var REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string;
4141
declare var REACT_APP_ENV: string;
4242
declare var REACT_APP_BUILD_ID: string;
4343
declare var REACT_APP_LOG_LEVEL: string;

‎client/packages/lowcoder/src/components/PageSkeleton.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ export default function PageSkeleton(props: IProps) {
8383
{!hideHeader && isHeaderReady && (
8484
<Header
8585
headerStart={
86-
LOWCODER_SHOW_BRAND === 'true' ?
87-
LOWCODER_CUSTOM_LOGO !== "" ? <img src={LOWCODER_CUSTOM_LOGO} alt="logo" /> :<StyledLogoWithName branding={true} /> :
86+
REACT_APP_LOWCODER_SHOW_BRAND === 'true' ?
87+
REACT_APP_LOWCODER_CUSTOM_LOGO !== "" ? <img src={REACT_APP_LOWCODER_CUSTOM_LOGO} alt="logo" /> :<StyledLogoWithName branding={true} /> :
8888
<StyledLogoHome branding={true} />
8989
}
9090
style={{ backgroundColor: brandingConfig?.headerColor, ...props.headStyle }}

‎client/packages/lowcoder/src/index.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ debug(`REACT_APP_LANGUAGES:, ${REACT_APP_LANGUAGES}`);
3434
debug(`REACT_APP_API_HOST:, ${REACT_APP_API_HOST}`);
3535
debug(`REACT_APP_ENV:, ${REACT_APP_ENV}`);
3636
debug(`REACT_APP_LOG_LEVEL:, ${REACT_APP_LOG_LEVEL}`);
37-
37+
debug(`REACT_APP_LOWCODER_SHOW_BRAND:, ${REACT_APP_LOWCODER_SHOW_BRAND}`);
38+
debug(`REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT:, ${REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT}`);
39+
debug(`LOWCODER_CUSTOM_LOGO:, ${REACT_APP_LOWCODER_CUSTOM_LOGO}`);
40+
debug(`LOWCODER_CUSTOM_LOGO_SQUARE:, ${REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE}`);
41+
3842
try {
3943
bootstrap();
4044
hideLoading();

‎client/packages/lowcoder/src/pages/common/header.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ export default function Header(props: HeaderProps) {
290290
const headerStart = (
291291
<>
292292
<StyledLink onClick={() => history.push(ALL_APPLICATIONS_URL)}>
293-
{LOWCODER_SHOW_BRAND === 'true' ?
294-
LOWCODER_CUSTOM_LOGO_SQUARE !== "" ? <img src={LOWCODER_CUSTOM_LOGO_SQUARE } height={24} width={24} alt="logo" /> :<LogoIcon /> :
293+
{REACT_APP_LOWCODER_SHOW_BRAND === 'true' ?
294+
REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE !== "" ? <img src={REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE } height={24} width={24} alt="logo" /> :<LogoIcon /> :
295295
<LogoHome />}
296296
</StyledLink>
297297
{editName ? (
@@ -434,8 +434,8 @@ export function AppHeader() {
434434
const brandingConfig = useSelector(getBrandingConfig);
435435
const headerStart = (
436436
<StyledLink onClick={() => history.push(ALL_APPLICATIONS_URL)}>
437-
{LOWCODER_SHOW_BRAND === 'true' ?
438-
LOWCODER_CUSTOM_LOGO !== "" ? <img src={LOWCODER_CUSTOM_LOGO} height={28} alt="logo" /> :<LogoWithName branding={!user.orgDev} /> :
437+
{REACT_APP_LOWCODER_SHOW_BRAND === 'true' ?
438+
REACT_APP_LOWCODER_CUSTOM_LOGO !== "" ? <img src={REACT_APP_LOWCODER_CUSTOM_LOGO} height={28} alt="logo" /> :<LogoWithName branding={!user.orgDev} /> :
439439
<LogoHome />}
440440
</StyledLink>
441441
);

‎client/packages/lowcoder/src/pages/setting/idSource/list.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ export const IdSourceList = (props: any) => {
4545
const enableEnterpriseLogin = useSelector(selectSystemConfig)?.featureFlag?.enableEnterpriseLogin;
4646

4747
useEffect(() => {
48-
if (!currentOrgId || (!isSelfDomain(config) && !isEnterpriseMode(config))) {
48+
if (!currentOrgId) {
4949
return;
5050
}
5151
getConfigs();
5252
}, [currentOrgId]);
5353

54-
if (!currentOrgId || (!isSelfDomain(config) && !isEnterpriseMode(config))) {
54+
if (!currentOrgId) {
5555
return null;
5656
}
5757

‎client/packages/lowcoder/src/pages/setting/settingHome.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,9 @@ export function SettingHome() {
5252
{
5353
key: SettingPageEnum.OAuthProvider,
5454
label: (
55-
<span>
56-
<span className="text">{trans("settings.oauthProviders")}</span>
57-
{(!currentOrgAdmin(user) || (!isSelfDomain(config) && !isEnterpriseMode(config))) && (
58-
<FreeLimitTag text={trans("settings.premium")} />
59-
)}
60-
</span>
55+
<span className="text">{trans("settings.oauthProviders")}</span>
6156
),
62-
disabled: !currentOrgAdmin(user) || (!isSelfDomain(config) && !isEnterpriseMode(config)),
57+
disabled: !currentOrgAdmin(user),
6358
},
6459
{
6560
key: SettingPageEnum.Environments,

0 commit comments

Comments
 (0)