From cd087038eaa71e0a9a0c3e8b359822ba0a2849d1 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Wed, 28 Jun 2023 14:02:31 +0500 Subject: [PATCH 1/2] Temporary OCI fix to install on debian bookworm --- .../OneClickInstall/install-Debian/install-preq.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build/install/OneClickInstall/install-Debian/install-preq.sh b/build/install/OneClickInstall/install-Debian/install-preq.sh index 4e946258ff..12061542eb 100644 --- a/build/install/OneClickInstall/install-Debian/install-preq.sh +++ b/build/install/OneClickInstall/install-Debian/install-preq.sh @@ -49,6 +49,9 @@ curl -sL https://deb.nodesource.com/setup_16.x | bash - #add dotnet repo if [ "$DIST" = "debian" ] && [ "$DISTRIB_CODENAME" = "stretch" ]; then curl https://packages.microsoft.com/config/$DIST/10/packages-microsoft-prod.deb -O +elif [ "$DISTRIB_CODENAME" = "bookworm" ]; then + #Temporary fix for missing dotnet repository for debian bookworm + curl https://packages.microsoft.com/config/$DIST/11/packages-microsoft-prod.deb -O else curl https://packages.microsoft.com/config/$DIST/$REV/packages-microsoft-prod.deb -O fi @@ -72,6 +75,9 @@ if ! dpkg -l | grep -q "mysql-server"; then DEBIAN_FRONTEND=noninteractive dpkg -i ${MYSQL_PACKAGE_NAME} rm -f ${MYSQL_PACKAGE_NAME} + #Temporary fix for missing mysql repository for debian bookworm + [ "$DISTRIB_CODENAME" = "bookworm" ] && sed -i "s/$DIST/ubuntu/g; s/$DISTRIB_CODENAME/jammy/g" /etc/apt/sources.list.d/mysql.list + echo mysql-community-server mysql-community-server/root-pass password ${MYSQL_SERVER_PASS} | debconf-set-selections echo mysql-community-server mysql-community-server/re-root-pass password ${MYSQL_SERVER_PASS} | debconf-set-selections echo mysql-community-server mysql-server/default-auth-override select "Use Strong Password Encryption (RECOMMENDED)" | debconf-set-selections @@ -101,6 +107,8 @@ fi curl -s http://nginx.org/keys/nginx_signing.key | gpg --no-default-keyring --keyring gnupg-ring:/usr/share/keyrings/nginx.gpg --import echo "deb [signed-by=/usr/share/keyrings/nginx.gpg] http://nginx.org/packages/$DIST/ $DISTRIB_CODENAME nginx" | tee /etc/apt/sources.list.d/nginx.list chmod 644 /usr/share/keyrings/nginx.gpg +#Temporary fix for missing nginx repository for debian bookworm +[ "$DISTRIB_CODENAME" = "bookworm" ] && sed -i "s/$DISTRIB_CODENAME/buster/g" /etc/apt/sources.list.d/nginx.list # setup msttcorefonts echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections From 8a155464571ef3b7ecf65b36676300fbe0ea002a Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Wed, 28 Jun 2023 13:17:47 +0300 Subject: [PATCH 2/2] Fixed Bug 63193 - Rooms.Thumbnails. Fixed tile view --- packages/client/src/store/FilesActionsStore.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/client/src/store/FilesActionsStore.js b/packages/client/src/store/FilesActionsStore.js index 9c190d28b5..feaefec5eb 100644 --- a/packages/client/src/store/FilesActionsStore.js +++ b/packages/client/src/store/FilesActionsStore.js @@ -1318,9 +1318,12 @@ class FilesActionStore { }; openLocationAction = async (locationId) => { - this.filesStore.setBufferSelection(null); + const { setBufferSelection, setIsLoading, fetchFiles } = this.filesStore; - const files = await this.filesStore.fetchFiles(locationId, null); + setBufferSelection(null); + setIsLoading(true); + const files = await fetchFiles(locationId, null); + setIsLoading(false); return files; };