Small fix about InviteButton - And WIP app Redirect

Author: FalkWolsky

client/packages/lowcoder/src/app.tsx

@@ -49,6 +49,7 @@ import { initApp } from "util/commonUtils";
 import { favicon } from "assets/images";
 import { hasQueryParam } from "util/urlUtils";
 import { isFetchUserFinished } from "redux/selectors/usersSelectors"; // getCurrentUser, 
+import { getIsCommonSettingFetched } from "redux/selectors/commonSettingSelectors";
 import { SystemWarning } from "./components/SystemWarning";
 import { getBrandingConfig } from "./redux/selectors/configSelectors";
 import { buildMaterialPreviewURL } from "./util/materialUtils";
@@ -79,6 +80,7 @@ const Wrapper = (props: { children: React.ReactNode, language: string }) => (
 
 type AppIndexProps = {
   isFetchUserFinished: boolean;
+  getIsCommonSettingFetched: boolean;
   currentOrgId?: string;
   orgDev: boolean;
   defaultHomePage: string | null | undefined;
@@ -121,7 +123,7 @@ class AppIndex extends React.Component<AppIndexProps, any> {
     // persisting the language in local storage
     localStorage.setItem('lowcoder_uiLanguage', this.props.uiLanguage);
 
-    // console.log("this.props.defaultHomePage: ", this.props.defaultHomePage)
+    console.log('Props: ', this.props);
 
     return (
       <Wrapper language={this.props.uiLanguage}>
@@ -272,21 +274,12 @@ class AppIndex extends React.Component<AppIndexProps, any> {
         <SystemWarning />
           <Router history={history}>
             <Switch>
-              {/* 
-              // we decided to show the org homepage in a own navigation page
-              {!this.props.orgDev && !!this.props.defaultHomePage ? (
-              <Redirect exact from={BASE_URL} to={APPLICATION_VIEW_URL(this.props.defaultHomePage, "view")}
-              />
-            ) : (
-              <Redirect exact from={BASE_URL} to={USER_PROFILE_URL} />
-            )}
-            {!this.props.orgDev && !!this.props.defaultHomePage && (
-              <Redirect exact from={ALL_APPLICATIONS_URL} to={APPLICATION_VIEW_URL(this.props.defaultHomePage, "view")}
-              />
-            )} */}
-
-              {!this.props.orgDev ? (
-                <Redirect exact from={BASE_URL} to={ORG_HOME_URL} />
+              {this.props.isFetchUserFinished && !this.props.orgDev ? (
+                this.props.getIsCommonSettingFetched && this.props.defaultHomePage !== undefined ? ( 
+                  <Redirect exact from={BASE_URL} to={APPLICATION_VIEW_URL(this.props.defaultHomePage || "", "view")}/>
+                ) : (
+                  <Redirect exact from={BASE_URL} to={ORG_HOME_URL} />
+                )
               ) : (
                 <Redirect exact from={BASE_URL} to={ALL_APPLICATIONS_URL} />
               )}
@@ -377,6 +370,7 @@ class AppIndex extends React.Component<AppIndexProps, any> {
 
 const mapStateToProps = (state: AppState) => ({
   isFetchUserFinished: isFetchUserFinished(state),
+  getIsCommonSettingFetched: getIsCommonSettingFetched(state),
   orgDev: state.ui.users.user.orgDev,
   currentOrgId: state.ui.users.user.currentOrgId,
   defaultHomePage: state.ui.application.homeOrg?.commonSettings.defaultHomePage,

client/packages/lowcoder/src/pages/ApplicationV2/index.tsx

@@ -494,7 +494,10 @@ export default function ApplicationHome() {
 
         ]}
       />
-      {user.orgDev && (
+      
+      {/* 
+        // we have the invite dialog in the Admin Area, so we don't need it here
+        {user.orgDev && (
         <InviteDialog
           trigger={
             <InviteUser>
@@ -504,7 +507,7 @@ export default function ApplicationHome() {
           }
           style={{ marginLeft: "auto" }}
         />
-      )}
+      )} */}
     </DivStyled>
   );
 }

client/packages/lowcoder/src/pages/setting/permission/permissionList.tsx

@@ -9,12 +9,17 @@ import { getUser } from "redux/selectors/usersSelectors";
 import { getNextEntityName } from "util/stringUtils";
 import { validateResponse } from "api/apiUtils";
 import {
+  AddMemberButton,
   GroupNameView,
   OperationWrapper,
   EditBtn,
   PopoverIcon,
   CreateButton,
 } from "./styledComponents";
+import {
+  MembersIcon,
+} from "lowcoder-design";
+import styled from "styled-components";
 import { trans } from "i18n";
 import { getOrgGroups } from "redux/selectors/orgSelectors";
 import { Table } from "components/Table";
@@ -25,9 +30,17 @@ import { timestampToHumanReadable } from "../../../util/dateTimeUtils";
 import { usePermissionMenuItems } from "@lowcoder-ee/pages/setting/permission/permissionMenuItems";
 import { OrgGroup } from "constants/orgConstants";
 import { messageInstance } from "lowcoder-design/src/components/GlobalInstances";
+import InviteDialog from "pages/common/inviteDialog";
+import { Flex } from "antd";
 
 const NEW_GROUP_PREFIX = trans("memberSettings.newGroupPrefix");
 
+const StyledMembersIcon = styled(MembersIcon)`
+  g g {
+    stroke: #ffffff;
+  }
+`;
+
 type DataItemInfo = {
   key: string;
   label: string;
@@ -120,14 +133,21 @@ export default function PermissionSetting() {
       <Level1SettingPageTitleWithBtn>
         {trans("settings.userGroups")}
         {currentOrgAdmin(user) && (
-          <CreateButton
+          <Flex gap="middle">
+            <CreateButton
             loading={groupCreating}
             buttonType={"primary"}
             icon={<AddIcon />}
             onClick={() => handleGroupCreate()}
           >
             {trans("memberSettings.createGroup")}
           </CreateButton>
+          <InviteDialog
+            trigger={<AddMemberButton buttonType="primary" icon={<StyledMembersIcon />}>
+              {trans("memberSettings.inviteUser")}
+            </AddMemberButton>}
+            style={{ marginLeft: "auto" }} />
+          </Flex>
         )}
       </Level1SettingPageTitleWithBtn>
       <div>