Skip to content

Commit b83ae94

Browse files
author
FalkWolsky
committed
Bunch of Frontend Fixes
1 parent f563ca6 commit b83ae94

File tree

7 files changed

+115
-15
lines changed

7 files changed

+115
-15
lines changed
Loading
Loading
Loading
Loading
Loading

client/packages/lowcoder/src/i18n/locales/en.ts

+10-8
Original file line numberDiff line numberDiff line change
@@ -1484,14 +1484,14 @@ export const en = {
14841484
broadCast: "BroadCast Messages",
14851485
title: "Meeting Title",
14861486
//ADDED BY FRED
1487-
meetingCompName: "Meeting Controller",
1488-
sharingCompName: "Video Share",
1489-
videoCompName: "Video Stream",
1490-
videoSharingCompName: "Screen Sharing",
1491-
meetingControlCompName: "Controls Buttons",
1492-
meetingCompDesc: "Meeting component",
1493-
meetingCompControls: "Meeting control",
1494-
meetingCompKeywords: "",
1487+
meetingCompName: "Agora Meeting Controller",
1488+
sharingCompName: "Screen share Stream",
1489+
videoCompName: "Camera Stream",
1490+
videoSharingCompName: "Screen share Stream",
1491+
meetingControlCompName: "Control Button",
1492+
meetingCompDesc: "Meeting Component",
1493+
meetingCompControls: "Meeting Control",
1494+
meetingCompKeywords: "Agora Meeting, Web Meeting, Collaboration",
14951495
//END
14961496
iconSize: "Icon Size",
14971497
userId: "userId",
@@ -1846,6 +1846,8 @@ export const en = {
18461846
preloadLibsEmpty: "No JavaScript libraries were added",
18471847
preloadLibsAddBtn: "Add a library",
18481848
saveSuccess: "Saved successfully",
1849+
AuthOrgTitle: "Workspace welcome Screen",
1850+
AuthOrgDescrition: "The URL for your users to Sign in to the current workspace.",
18491851
},
18501852
branding: {
18511853
title: "Branding",

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

+19
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import { messageInstance, AddIcon } from "lowcoder-design";
3434
import { currentOrgAdmin } from "../../../util/permissionUtils";
3535
import CreateModal from "./createModal";
3636
import _ from "lodash";
37+
import { HelpText } from "components/HelpText";
3738

3839
export const IdSourceList = (props: any) => {
3940
const user = useSelector(getUser);
@@ -44,6 +45,18 @@ export const IdSourceList = (props: any) => {
4445
const [modalVisible, setModalVisible] = useState(false);
4546
const enableEnterpriseLogin = useSelector(selectSystemConfig)?.featureFlag?.enableEnterpriseLogin;
4647

48+
let protocol = window.location.protocol;
49+
const port = window.location.port;
50+
let currentDomain = window.location.hostname;
51+
52+
// Show port only if it is not a standard port
53+
if (port && port !== '80' && port !== '443') {
54+
currentDomain += `:${port}`;
55+
}
56+
57+
const redirectUrl = encodeURIComponent(`${protocol}//${currentDomain}/apps`);
58+
const loginUrl = `${protocol}//${currentDomain}/org/${currentOrgId}/auth/login?redirectUrl=${encodeURIComponent(redirectUrl)}`;
59+
4760
useEffect(() => {
4861
if (!currentOrgId) {
4962
return;
@@ -154,6 +167,11 @@ export const IdSourceList = (props: any) => {
154167
)}
155168
/>
156169
</TableStyled>
170+
171+
<div style={{ marginTop: 20, marginLeft: 12 }} className="section-title">{trans("advanced.AuthOrgTitle")}</div>
172+
<HelpText style={{ marginBottom: 12, marginLeft: 12 }}>{trans("advanced.AuthOrgDescrition") + ": "}</HelpText>
173+
<HelpText style={{ marginBottom: 12, marginLeft: 12 }}><a href={loginUrl} target="blank">{loginUrl}</a></HelpText>
174+
157175
</Level1SettingPageContentWithList>
158176
<CreateModal
159177
modalVisible={modalVisible}
@@ -167,3 +185,4 @@ export const IdSourceList = (props: any) => {
167185
</>
168186
);
169187
};
188+

0 commit comments

Comments
 (0)