IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/layout

Browse Source
This commit is contained in:
Akmal Isomadinov 2024-05-17 14:16:40 +05:00
commit ed154cb0eb
13 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/GroupMemberRow/index.styled.ts
View File

@ -44,12 +44,18 @@ export const GroupMemberRow = styled.div<{}>`
align-items: flex-start;
justify-content: center;
padding: 9px 0;
width: 100%;
overflow: hidden;
.name {
color: ${({ theme }) => theme.sideBarRow.titleColor};
font-size: 14px;
font-weight: 600;
line-height: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 100%;
}
.email {
@ -57,6 +63,10 @@ export const GroupMemberRow = styled.div<{}>`
font-size: 10px;
font-weight: 400;
line-height: normal;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 100%;
}
}

1
packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js
View File

@ -425,6 +425,7 @@ const StyledCrossIcon = styled(CrossIcon)`
StyledCrossIcon.defaultProps = { theme: Base };
const StyledDeleteIcon = styled(DeleteIcon)`
cursor: pointer;
${(props) =>
props.theme.interfaceDirection === "rtl"
? css`

3
packages/client/src/components/panels/InvitePanel/sub-components/Item.js
View File

@ -50,6 +50,7 @@ import AccessSelector from "./AccessSelector";
const Item = ({
t,
item,
theme,
setInviteItems,
inviteItems,
changeInviteItem,
@ -216,7 +217,7 @@ const Item = ({
tooltipContent={t("EmailErrorMessage")}
openOnClick={false}
size={16}
color="#F21C0E"
color={theme.infoPanel.errorColor}
/>
<StyledDeleteIcon
className="delete-icon"

4
packages/client/src/components/panels/InvitePanel/sub-components/ItemsList.js
View File

@ -66,6 +66,7 @@ const Row = memo(({ data, index, style }) => {
<Item
t={t}
item={item}
theme={theme}
setInviteItems={setInviteItems}
changeInviteItem={changeInviteItem}
inviteItems={inviteItems}
@ -196,7 +197,7 @@ const ItemsList = ({
export default inject(({ userStore, dialogsStore, settingsStore }) => {
const { setInviteItems, inviteItems, changeInviteItem } = dialogsStore;
const { isOwner } = userStore.user;
const { standalone } = settingsStore;
const { theme, standalone } = settingsStore;
return {
setInviteItems,
@ -204,5 +205,6 @@ export default inject(({ userStore, dialogsStore, settingsStore }) => {
changeInviteItem,
isOwner,
standalone,
theme,
};
})(observer(ItemsList));

2
packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Manager.js
View File

@ -898,7 +898,7 @@ const Manager = (props) => {
scale={true}
onChange={onChangePage}
placeholder={t("EnterPage")}
value={config.filter.page || 1}
value={config.filter.page}
isDisabled={!config.filter.count}
tabIndex={7}
/>

2
packages/client/src/store/GroupsStore.ts
View File

@ -651,6 +651,8 @@ class GroupsStore {
};
changeGroupContextSelection = (group: TGroup, isSingleMenu: boolean) => {
this.peopleStore.selectionStore.setBufferSelection(null);
if (isSingleMenu) {
this.singleContextMenuAction(group);
} else {

2
packages/login/src/middleware.ts
View File

@ -32,7 +32,7 @@ export function middleware(request: NextRequest) {
const host = request.headers.get("x-forwarded-host");
const proto = request.headers.get("x-forwarded-proto");
const redirectUrl = `${proto}:${host}`;
const redirectUrl = `${proto}://${host}`;
if (request.nextUrl.pathname === "/health") {
console.log("Get login health check for portal: ", redirectUrl);

2
packages/login/src/utils/actions.ts
View File

@ -54,7 +54,7 @@ export const checkIsAuthenticated = async () => {
export async function getSettings() {
const [getSettings] = createRequest(
[`/settings?withPassword=false`],
[`/settings?withPassword=true`],
[["", ""]],
"GET",
);

2
packages/shared/components/context-menu-button/ContextMenuButton.tsx
View File

@ -348,7 +348,7 @@ ContextMenuButtonPure.defaultProps = {
size: 16,
isDisabled: false,
directionX: "left",
isFill: false,
isFill: true,
usePortal: true,
displayIconBorder: false,

1
packages/shared/components/link/Link.styled.tsx
View File

@ -52,6 +52,7 @@ const PureText = ({
const StyledText = styled(PureText)`
text-decoration: ${(props) => props.theme.link.textDecoration};
text-underline-offset: 2px;
${(props) =>
props.enableUserSelect

1
packages/shared/themes/base.ts
View File

@ -2094,6 +2094,7 @@ export const getBaseTheme = () => {
borderColor: grayLightMid,
thumbnailBorderColor: grayLightMid,
textColor: black,
errorColor: "#F21C0E",
closeButtonWrapperPadding: "0px",
closeButtonIcon: white,

1
packages/shared/themes/dark.ts
View File

@ -2067,6 +2067,7 @@ const Dark: TTheme = {
borderColor: "#474747",
thumbnailBorderColor: grayLightMid,
textColor: white,
errorColor: "#E06451",
closeButtonWrapperPadding: "6px",
closeButtonIcon: black,

8
packages/shared/utils/next-ssr-helper.ts
View File

@ -34,7 +34,7 @@ export const getBaseUrl = () => {
const host = hdrs.get("x-forwarded-host");
const proto = hdrs.get("x-forwarded-proto");
const baseURL = `${proto}:${host}`;
const baseURL = `${proto}://${host}`;
return baseURL;
};
@ -42,6 +42,8 @@ export const getBaseUrl = () => {
export const getAPIUrl = () => {
const baseUrl = process.env.API_HOST?.trim() ?? getBaseUrl();
// const baseUrl = getBaseUrl();
const baseAPIUrl = `${baseUrl}/${API_PREFIX}`;
return baseAPIUrl;
@ -61,9 +63,9 @@ export const createRequest = (
if (hdr[0]) hdrs.set(hdr[0], hdr[1]);
});
const host = hdrs.get("x-forwarded-host");
const baseURL = getBaseUrl();
if (host && process.env.API_HOST?.trim()) hdrs.set("origin", host);
if (baseURL && process.env.API_HOST?.trim()) hdrs.set("origin", baseURL);
const urls = paths.map((path) => `${apiURL}${path}`);