Merge branch 'release/v2.6.0' into refactoring/header-context-menu

This commit is contained in:
Nikita Gopienko 2024-06-27 16:36:28 +03:00
commit 6bd8c07ed1
9 changed files with 19 additions and 23 deletions

View File

@ -1,3 +0,0 @@
---
paths:
- ./**

View File

@ -56,7 +56,6 @@ jobs:
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
config-file: .github/codeql/config-codeql.yml
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

View File

@ -404,6 +404,7 @@ const EmbeddingPanelComponent = (props: EmbeddingPanelProps) => {
<StyledModalDialog
visible={visible}
onClose={onClose}
withBodyScroll
displayType={ModalDialogType.aside}
>
<ModalDialog.Header>{t("Files:EmbeddingSettings")}</ModalDialog.Header>

View File

@ -386,6 +386,8 @@ const InsideGroupTableRow = (props) => {
modernView
manualWidth={"fit-content"}
isLoading={isLoading}
optionStyle={{ maxWidth: "400px" }}
textOverflow
/>
);

View File

@ -390,6 +390,8 @@ const PeopleTableRow = (props) => {
modernView
manualWidth={"fit-content"}
isLoading={isLoading}
optionStyle={{ maxWidth: "400px" }}
textOverflow
/>
);

View File

@ -283,7 +283,7 @@ const FilesRowContent = ({
return value;
}
if (!fileExst && !contentLength && !providerKey && !isMobile())
if (!fileExst && !contentLength && !providerKey)
return `${foldersCount} ${t("Translations:Folders")} | ${filesCount} ${t(
"Translations:Files",
)}`;
@ -323,15 +323,17 @@ const FilesRowContent = ({
{!isRoom && !isRooms && quickButtons}
</div>
<Text
containerMinWidth="200px"
containerWidth="15%"
fontSize="12px"
fontWeight={400}
className="row_update-text"
>
{mainInfo}
</Text>
{mainInfo && (
<Text
containerMinWidth="200px"
containerWidth="15%"
fontSize="12px"
fontWeight={400}
className="row_update-text"
>
{mainInfo}
</Text>
)}
<Text
containerMinWidth="90px"

View File

@ -43,12 +43,6 @@ const StyledSimpleNav = styled.div`
justify-content: center;
background-color: ${(props) => props.theme?.login?.navBackground};
svg {
path:last-child {
fill: ${(props) => props.theme.client?.home?.logoColor};
}
}
@media ${mobile} {
display: flex;

View File

@ -49,14 +49,13 @@ const PreviewTile = ({
</div>
<div className="tile-tags">
{tags.length ? (
<Tags columnCount={2} tags={tags} onSelectTag={() => {}} />
<Tags columnCount={2} tags={tags} />
) : (
<Tag
className="type_tag"
tag="script"
label={defaultTagLabel}
isDefault
onClick={() => {}}
/>
)}
</div>

View File

@ -53,5 +53,5 @@ export interface TagsProps {
/** Accepts css style */
style?: React.CSSProperties;
/** Accepts the function that is called when the tag is selected */
onSelectTag: (tag?: object) => void;
onSelectTag?: (tag?: object) => void;
}