🔀 Merge remote-tracking branch 'origin/main' into 525-515-548-523-onlyoffice-rework

This commit is contained in:
Eric Doughty-Papassideris
2024-09-26 15:40:43 +02:00
7 changed files with 695 additions and 664 deletions
@@ -303,7 +303,7 @@ class FileUploadService {
return new Resumable({
target,
headers,
chunkSize: chunkSize || 50000000,
chunkSize: chunkSize || 5000000,
testChunks: testChunks || false,
simultaneousUploads: simultaneousUploads || 5,
maxChunkRetries: maxChunkRetries || 2,
@@ -402,7 +402,7 @@ export default memo(
sortLabel.order === 'asc' ? 'transform rotate-180' : ''
}`}
/>
<span>By {sortLabel.by}</span>
<span>{Languages.t('components.item_context_menu.sorting.selected.' + sortLabel.by)}</span>
<ChevronDownIcon className="h-4 w-4 ml-2 -mr-1" />
</Button>
</Menu>
@@ -519,7 +519,7 @@ export const useOnBuildSortContextMenu = () => {
const menuItems = [
{
type: 'menu',
text: 'Date',
text: Languages.t('components.item_context_menu.sorting.by.date'),
icon: sortItem.by === 'date' ? 'check' : 'sort-check',
onClick: () => {
// keep the old value for sortItem and change the by value
@@ -534,7 +534,7 @@ export const useOnBuildSortContextMenu = () => {
},
{
type: 'menu',
text: 'Name',
text: Languages.t('components.item_context_menu.sorting.by.name'),
icon: sortItem.by === 'name' ? 'check' : 'sort-check',
onClick: () => {
setSortItem(prevSortItem => {
@@ -548,7 +548,7 @@ export const useOnBuildSortContextMenu = () => {
},
{
type: 'menu',
text: 'Size',
text: Languages.t('components.item_context_menu.sorting.by.size'),
icon: sortItem.by === 'size' ? 'check' : 'sort-check',
onClick: () => {
setSortItem(prevSortItem => {
@@ -563,7 +563,7 @@ export const useOnBuildSortContextMenu = () => {
{type:"separator"},
{
type: 'menu',
text: 'Ascending',
text: Languages.t('components.item_context_menu.sorting.order.asc'),
icon: sortItem.order === 'asc' ? 'check' : 'sort-check',
onClick: () => {
setSortItem(prevSortItem => {
@@ -577,7 +577,7 @@ export const useOnBuildSortContextMenu = () => {
},
{
type: 'menu',
text: 'Descending',
text: Languages.t('components.item_context_menu.sorting.order.desc'),
icon: sortItem.order === 'desc' ? 'check' : 'sort-check',
onClick: () => {
setSortItem(prevSortItem => {