Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0

packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js

@@ -69,6 +69,7 @@ class DetailsHelper {
     this.personal = props.personal;
     this.culture = props.culture;
     this.isVisitor = props.isVisitor;
+    this.isCollaborator = props.isCollaborator;
   }
 
   getPropertyList = () => {
@@ -113,38 +114,38 @@ class DetailsHelper {
 
   getNeededProperties = () => {
     return (this.item.isRoom
-      ? [
-          "Owner",
-          this.item.providerKey && "Storage Type",
-          "Type",
-          "Content",
-          "Date modified",
-          "Last modified by",
-          "Creation date",
-          this.item.tags.length && "Tags",
-        ]
-      : this.item.isFolder
-      ? [
-          "Owner",
-          //"Location",
-          "Type",
-          "Content",
-          "Date modified",
-          "Last modified by",
-          "Creation date",
-        ]
-      : [
-          "Owner",
-          //"Location",
-          "Type",
-          "File extension",
-          "Size",
-          "Date modified",
-          "Last modified by",
-          "Creation date",
-          "Versions",
-          "Comments",
-        ]
+        ? [
+            "Owner",
+            this.item.providerKey && "Storage Type",
+            "Type",
+            "Content",
+            "Date modified",
+            "Last modified by",
+            "Creation date",
+            this.item.tags.length && "Tags",
+          ]
+        : this.item.isFolder
+        ? [
+            "Owner",
+            //"Location",
+            "Type",
+            "Content",
+            "Date modified",
+            "Last modified by",
+            "Creation date",
+          ]
+        : [
+            "Owner",
+            //"Location",
+            "Type",
+            "File extension",
+            "Size",
+            "Date modified",
+            "Last modified by",
+            "Creation date",
+            "Versions",
+            "Comments",
+          ]
     ).filter((nP) => !!nP);
   };
 
@@ -227,7 +228,7 @@ class DetailsHelper {
   getItemOwner = () => {
     const onOpenUser = () => this.openUser(this.item.createdBy, this.history);
 
-    return this.personal || this.isVisitor
+    return this.personal || this.isVisitor || this.isCollaborator
       ? text(decode(this.item.createdBy?.displayName))
       : link(decode(this.item.createdBy?.displayName), onOpenUser);
   };
@@ -279,7 +280,7 @@ class DetailsHelper {
   getItemLastModifiedBy = () => {
     const onOpenUser = () => this.openUser(this.item.updatedBy, this.history);
 
-    return this.personal || this.isVisitor
+    return this.personal || this.isVisitor || this.isCollaborator
       ? text(decode(this.item.updatedBy?.displayName))
       : link(decode(this.item.updatedBy?.displayName), onOpenUser);
   };

packages/client/src/pages/Home/InfoPanel/Body/views/Details/index.js

@@ -19,6 +19,7 @@ const Details = ({
   getInfoPanelItemIcon,
   openUser,
   isVisitor,
+  isCollaborator,
 }) => {
   const [itemProperties, setItemProperties] = useState([]);
 
@@ -28,6 +29,7 @@ const Details = ({
   const history = useHistory();
 
   const detailsHelper = new DetailsHelper({
+    isCollaborator,
     isVisitor,
     t,
     item: selection,
@@ -123,6 +125,7 @@ export default inject(({ auth, filesStore }) => {
   const { user } = userStore;
 
   const isVisitor = user.isVisitor;
+  const isCollaborator = user.isCollaborator;
 
   return {
     personal,
@@ -132,5 +135,6 @@ export default inject(({ auth, filesStore }) => {
     getInfoPanelItemIcon,
     openUser,
     isVisitor,
+    isCollaborator,
   };
 })(withTranslation(["InfoPanel", "Common", "Translations", "Files"])(Details));

packages/common/api/files/index.js

@@ -549,7 +549,7 @@ export function startUploadSession(
   const data = { fileName, fileSize, relativePath, encrypted, createOn };
   return request({
     method: "post",
-    url: `/files/${folderId}/upload/create_session.json`,
+    url: `/files/${folderId}/upload/create_session`,
     data,
   });
 }
@@ -575,7 +575,7 @@ export function checkFileConflicts(destFolderId, folderIds, fileIds) {
 
   return request({
     method: "get",
-    url: `/files/fileops/move.json?destFolderId=${destFolderId}${paramsString}`,
+    url: `/files/fileops/move?destFolderId=${destFolderId}${paramsString}`,
   });
 }
 
@@ -879,7 +879,7 @@ export function setRecentSetting(set) {
 export function hideConfirmConvert(save) {
   return request({
     method: "put",
-    url: "/files/hideconfirmconvert.json",
+    url: "/files/hideconfirmconvert",
     data: { save },
   });
 }

packages/common/api/groups/index.js

@@ -17,7 +17,7 @@ export function getGroupList(fake = false, searchValue) {
 export function getGroup(groupId) {
   return request({
     method: "get",
-    url: `/group/${groupId}.json`,
+    url: `/group/${groupId}`,
   });
 }
 
@@ -25,7 +25,7 @@ export function createGroup(groupName, groupManager, members) {
   const data = { groupName, groupManager, members };
   return request({
     method: "post",
-    url: "/group.json",
+    url: "/group",
     data,
   });
 }
@@ -34,7 +34,7 @@ export function updateGroup(id, groupName, groupManager, members) {
   const data = { groupId: id, groupName, groupManager, members };
   return request({
     method: "put",
-    url: `/group/${id}.json`,
+    url: `/group/${id}`,
     data,
   });
 }
@@ -42,7 +42,7 @@ export function updateGroup(id, groupName, groupManager, members) {
 export function deleteGroup(id) {
   return request({
     method: "delete",
-    url: `/group/${id}.json`,
+    url: `/group/${id}`,
   });
 }
 

packages/common/api/people/index.js

@@ -11,7 +11,7 @@ export function getUserList(filter = Filter.getDefault(), fake = false) {
 
   const params =
     filter && filter instanceof Filter
-      ? `/filter.json?${filter.toApiUrlParams(
+      ? `/filter?${filter.toApiUrlParams(
           "id,status,isAdmin,isOwner,isVisitor,activationStatus,userName,email,mobilePhone,displayName,avatar,listAdminModules,birthday,title,location,isLDAP,isSSO,groups"
         )}`
       : "";
@@ -33,7 +33,7 @@ export function getUserList(filter = Filter.getDefault(), fake = false) {
 export function getUser(userName = null) {
   return request({
     method: "get",
-    url: `/people/${userName || "@self"}.json`,
+    url: `/people/${userName || "@self"}`,
     skipUnauthorized: true,
   }).then((user) => {
     if (user && user.displayName) {
@@ -57,7 +57,7 @@ export function getUserByEmail(userEmail) {
 export function getUserFromConfirm(userId, confirmKey = null) {
   const options = {
     method: "get",
-    url: `/people/${userId}.json`,
+    url: `/people/${userId}`,
   };
 
   if (confirmKey) options.headers = { confirm: confirmKey };
@@ -118,7 +118,7 @@ export function changeEmail(userId, email, key) {
 export function updateActivationStatus(activationStatus, userId, key) {
   return request({
     method: "put",
-    url: `/people/activationstatus/${activationStatus}.json`,
+    url: `/people/activationstatus/${activationStatus}`,
     data: { userIds: [userId] },
     headers: { confirm: key },
   });
@@ -148,7 +148,7 @@ export function deleteSelf(key) {
 export function sendInstructionsToChangePassword(email) {
   return request({
     method: "post",
-    url: "/people/password.json",
+    url: "/people/password",
     data: { email },
   });
 }
@@ -160,7 +160,7 @@ export function getListAdmins(filter = Filter.getDefault()) {
 
   return request({
     method: "get",
-    url: `/people/filter.json?isadministrator=true&${filterParams}`,
+    url: `/people/filter?isadministrator=true&${filterParams}`,
   });
 }
 
@@ -172,7 +172,7 @@ export function getAdmins(isParams) {
   }
   return request({
     method: "get",
-    url: `/people/filter.json?isadministrator=true&${params}`,
+    url: `/people/filter?isadministrator=true&${params}`,
   });
 }
 
@@ -247,7 +247,7 @@ export function loadAvatar(profileId, data) {
 export function createThumbnailsAvatar(profileId, data) {
   return request({
     method: "post",
-    url: `/people/${profileId}/photo/thumbnails.json`,
+    url: `/people/${profileId}/photo/thumbnails`,
     data,
   });
 }
@@ -278,7 +278,7 @@ export function updateUserType(type, userIds) {
 export function linkOAuth(serializedProfile) {
   return request({
     method: "put",
-    url: "people/thirdparty/linkaccount.json",
+    url: "people/thirdparty/linkaccount",
     data: { serializedProfile },
   });
 }
@@ -286,7 +286,7 @@ export function linkOAuth(serializedProfile) {
 export function signupOAuth(signupAccount) {
   return request({
     method: "post",
-    url: "people/thirdparty/signup.json",
+    url: "people/thirdparty/signup",
     data: signupAccount,
   });
 }
@@ -294,21 +294,21 @@ export function signupOAuth(signupAccount) {
 export function unlinkOAuth(provider) {
   return request({
     method: "delete",
-    url: `people/thirdparty/unlinkaccount.json?provider=${provider}`,
+    url: `people/thirdparty/unlinkaccount?provider=${provider}`,
   });
 }
 
 export function sendInstructionsToDelete() {
   return request({
     method: "put",
-    url: "/people/self/delete.json",
+    url: "/people/self/delete",
   });
 }
 
 export function sendInstructionsToChangeEmail(userId, email) {
   return request({
     method: "post",
-    url: "/people/email.json",
+    url: "/people/email",
     data: { userId, email },
   });
 }
@@ -316,14 +316,14 @@ export function sendInstructionsToChangeEmail(userId, email) {
 export function deleteUser(userId) {
   return request({
     method: "delete",
-    url: `/people/${userId}.json`,
+    url: `/people/${userId}`,
   });
 }
 
 export function deleteUsers(userIds) {
   return request({
     method: "put",
-    url: "/people/delete.json",
+    url: "/people/delete",
     data: { userIds },
   });
 }
@@ -331,7 +331,7 @@ export function deleteUsers(userIds) {
 export function getSelectorUserList() {
   return request({
     method: "get",
-    url: "/people/filter.json?fields=id,displayName,groups",
+    url: "/people/filter?fields=id,displayName,groups",
   });
 }
 
@@ -340,7 +340,7 @@ export function changeTheme(key) {
 
   return request({
     method: "put",
-    url: `/people/theme.json`,
+    url: `/people/theme`,
     data,
   });
 }

packages/common/api/portal/index.js

@@ -3,7 +3,7 @@ import { request } from "../client";
 export function getShortenedLink(link) {
   return request({
     method: "put",
-    url: "/portal/getshortenlink.json",
+    url: "/portal/getshortenlink",
     data: { link },
   });
 }
@@ -33,7 +33,7 @@ export function getInvitationLink(type) {
     ? Promise.resolve(link)
     : request({
         method: "get",
-        url: `/portal/users/invite/${type}.json`,
+        url: `/portal/users/invite/${type}`,
       }).then((link) => {
         if (type !== 3 && type !== 4) {
           localStorage.setItem(
@@ -174,7 +174,7 @@ export function enableAutoBackup() {
 export function setPortalRename(alias) {
   return request({
     method: "put",
-    url: "/portal/portalrename.json",
+    url: "/portal/portalrename",
     data: { alias },
   });
 }
@@ -182,21 +182,21 @@ export function setPortalRename(alias) {
 export function sendSuspendPortalEmail() {
   return request({
     method: "post",
-    url: "/portal/suspend.json",
+    url: "/portal/suspend",
   });
 }
 
 export function sendDeletePortalEmail() {
   return request({
     method: "post",
-    url: "/portal/delete.json",
+    url: "/portal/delete",
   });
 }
 
 export function suspendPortal(confirmKey = null) {
   const options = {
     method: "put",
-    url: "/portal/suspend.json",
+    url: "/portal/suspend",
   };
 
   if (confirmKey) options.headers = { confirm: confirmKey };
@@ -207,7 +207,7 @@ export function suspendPortal(confirmKey = null) {
 export function continuePortal(confirmKey = null) {
   const options = {
     method: "put",
-    url: "/portal/continue.json",
+    url: "/portal/continue",
   };
 
   if (confirmKey) options.headers = { confirm: confirmKey };
@@ -218,7 +218,7 @@ export function continuePortal(confirmKey = null) {
 export function deletePortal(confirmKey = null) {
   const options = {
     method: "delete",
-    url: "/portal/delete.json",
+    url: "/portal/delete",
   };
 
   if (confirmKey) options.headers = { confirm: confirmKey };

packages/common/api/settings/index.js

@@ -4,14 +4,14 @@ import axios from "axios";
 export function getSettings(withPassword = false) {
   return request({
     method: "get",
-    url: `/settings.json?withPassword=${withPassword}`,
+    url: `/settings?withPassword=${withPassword}`,
   });
 }
 
 export function getPortalCultures() {
   return request({
     method: "get",
-    url: "/settings/cultures.json",
+    url: "/settings/cultures",
   });
 }
 
@@ -34,7 +34,7 @@ export function setPortalPasswordSettings(
 ) {
   return request({
     method: "put",
-    url: "/settings/security/password.json",
+    url: "/settings/security/password",
     data: { minLength, upperCase, digits, specSymbols },
   });
 }
@@ -42,7 +42,7 @@ export function setPortalPasswordSettings(
 export function setMailDomainSettings(data) {
   return request({
     method: "post",
-    url: "/settings/maildomainsettings.json",
+    url: "/settings/maildomainsettings",
     data,
   });
 }
@@ -50,7 +50,7 @@ export function setMailDomainSettings(data) {
 export function setDNSSettings(dnsName, enable) {
   return request({
     method: "post",
-    url: "/settings/maildomainsettings.json",
+    url: "/settings/maildomainsettings",
     data: { dnsName, enable },
   });
 }
@@ -88,7 +88,7 @@ export function setIpRestrictionsEnable(data) {
 export function setMessageSettings(turnOn) {
   return request({
     method: "post",
-    url: "/settings/messagesettings.json",
+    url: "/settings/messagesettings",
     data: { turnOn },
   });
 }
@@ -96,7 +96,7 @@ export function setMessageSettings(turnOn) {
 export function setCookieSettings(lifeTime) {
   return request({
     method: "put",
-    url: "/settings/cookiesettings.json",
+    url: "/settings/cookiesettings",
     data: { lifeTime },
   });
 }
@@ -104,14 +104,14 @@ export function setCookieSettings(lifeTime) {
 export function getCookieSettings() {
   return request({
     method: "get",
-    url: "/settings/cookiesettings.json",
+    url: "/settings/cookiesettings",
   });
 }
 
 export function setLifetimeAuditSettings(data) {
   return request({
     method: "post",
-    url: "/security/audit/settings/lifetime.json",
+    url: "/security/audit/settings/lifetime",
     data,
   });
 }
@@ -119,21 +119,21 @@ export function setLifetimeAuditSettings(data) {
 export function getLoginHistoryReport() {
   return request({
     method: "post",
-    url: "/security/audit/login/report.json",
+    url: "/security/audit/login/report",
   });
 }
 
 export function getAuditTrailReport() {
   return request({
     method: "post",
-    url: "/security/audit/events/report.json",
+    url: "/security/audit/events/report",
   });
 }
 
 export function getPortalTimezones(confirmKey = null) {
   const options = {
     method: "get",
-    url: "/settings/timezones.json",
+    url: "/settings/timezones",
   };
 
   if (confirmKey) options.headers = { confirm: confirmKey };
@@ -144,7 +144,7 @@ export function getPortalTimezones(confirmKey = null) {
 export function setLanguageAndTime(lng, timeZoneID) {
   return request({
     method: "put",
-    url: "/settings/timeandlanguage.json",
+    url: "/settings/timeandlanguage",
     data: { lng, timeZoneID },
   });
 }
@@ -152,7 +152,7 @@ export function setLanguageAndTime(lng, timeZoneID) {
 export function setGreetingSettings(title) {
   return request({
     method: "post",
-    url: `/settings/greetingsettings.json`,
+    url: `/settings/greetingsettings`,
     data: { title },
   });
 }
@@ -160,28 +160,28 @@ export function setGreetingSettings(title) {
 export function getGreetingSettingsIsDefault() {
   return request({
     method: "get",
-    url: `/settings/greetingsettings/isDefault.json`,
+    url: `/settings/greetingsettings/isDefault`,
   });
 }
 
 export function restoreGreetingSettings() {
   return request({
     method: "post",
-    url: `/settings/greetingsettings/restore.json`,
+    url: `/settings/greetingsettings/restore`,
   });
 }
 
 export function getAppearanceTheme() {
   return request({
     method: "get",
-    url: "/settings/colortheme.json",
+    url: "/settings/colortheme",
   });
 }
 
 export function sendAppearanceTheme(data) {
   return request({
     method: "put",
-    url: "/settings/colortheme.json",
+    url: "/settings/colortheme",
     data,
   });
 }
@@ -196,21 +196,21 @@ export function deleteAppearanceTheme(id) {
 export function getLogoText() {
   return request({
     method: "get",
-    url: `/settings/whitelabel/logotext.json`,
+    url: `/settings/whitelabel/logotext`,
   });
 }
 
 export function getLogoUrls() {
   return request({
     method: "get",
-    url: `/settings/whitelabel/logos.json`,
+    url: `/settings/whitelabel/logos`,
   });
 }
 
 export function setWhiteLabelSettings(data) {
   const options = {
     method: "post",
-    url: "/settings/whitelabel/save.json",
+    url: "/settings/whitelabel/save",
     data,
   };
 
@@ -220,7 +220,7 @@ export function setWhiteLabelSettings(data) {
 export function restoreWhiteLabelSettings(isDefault) {
   return request({
     method: "put",
-    url: "/settings/whitelabel/restore.json",
+    url: "/settings/whitelabel/restore",
     data: { isDefault },
   });
 }
@@ -238,7 +238,7 @@ export function setCompanyInfoSettings(
 
   return request({
     method: "post",
-    url: `/settings/rebranding/company.json`,
+    url: `/settings/rebranding/company`,
     data,
   });
 }
@@ -246,14 +246,14 @@ export function setCompanyInfoSettings(
 export function getCompanyInfoSettings() {
   return request({
     method: "get",
-    url: `/settings/rebranding/company.json`,
+    url: `/settings/rebranding/company`,
   });
 }
 
 export function restoreCompanyInfoSettings() {
   return request({
     method: "delete",
-    url: `/settings/rebranding/company.json`,
+    url: `/settings/rebranding/company`,
   });
 }
 
@@ -279,7 +279,7 @@ export function setAdditionalResources(
 
   return request({
     method: "post",
-    url: `/settings/rebranding/additional.json`,
+    url: `/settings/rebranding/additional`,
     data,
   });
 }
@@ -287,14 +287,14 @@ export function setAdditionalResources(
 export function getAdditionalResources() {
   return request({
     method: "get",
-    url: `/settings/rebranding/additional.json`,
+    url: `/settings/rebranding/additional`,
   });
 }
 
 export function restoreAdditionalResources() {
   return request({
     method: "delete",
-    url: `/settings/rebranding/additional.json`,
+    url: `/settings/rebranding/additional`,
   });
 }
 
@@ -337,7 +337,7 @@ export function setCustomSchema(
 export function getCurrentCustomSchema(id) {
   return request({
     method: "get",
-    url: `settings/customschemas/${id}.json`,
+    url: `settings/customschemas/${id}`,
   });
 }
 
@@ -363,7 +363,7 @@ export function sendOwnerChange(ownerId) {
   const data = { ownerId };
   return request({
     method: "post",
-    url: `/settings/owner.json`,
+    url: `/settings/owner`,
     data,
   });
 }
@@ -371,7 +371,7 @@ export function sendOwnerChange(ownerId) {
 export function getMachineName(confirmKey = null) {
   const options = {
     method: "get",
-    url: "/settings/machine.json",
+    url: "/settings/machine",
   };
 
   if (confirmKey) options.headers = { confirm: confirmKey };
@@ -389,7 +389,7 @@ export function setPortalOwner(
 ) {
   const options = {
     method: "put",
-    url: "/settings/wizard/complete.json",
+    url: "/settings/wizard/complete",
     data: {
       email: email,
       PasswordHash: hash,
@@ -408,7 +408,7 @@ export function setPortalOwner(
 export function getIsLicenseRequired() {
   return request({
     method: "get",
-    url: "/settings/license/required.json",
+    url: "/settings/license/required",
   });
 }
 
@@ -429,13 +429,13 @@ export function setLicense(confirmKey = null, data) {
 export function getPaymentSettings() {
   return request({
     method: "get",
-    url: `/settings/payment.json`,
+    url: `/settings/payment`,
   });
 }
 export function acceptLicense() {
   return request({
     method: "post",
-    url: `/settings/license/accept.json`,
+    url: `/settings/license/accept`,
   });
 }
 export function getConsumersList() {
@@ -548,7 +548,7 @@ export function getBackupStorage() {
 export function getBuildVersion() {
   const options = {
     method: "get",
-    url: "/settings/version/build.json",
+    url: "/settings/version/build",
   };
   return request(options);
 }
@@ -564,7 +564,7 @@ export function getCapabilities() {
 export function getTipsSubscription() {
   const options = {
     method: "get",
-    url: "/settings/tips/subscription.json",
+    url: "/settings/tips/subscription",
   };
   return request(options);
 }
@@ -630,7 +630,7 @@ export function resetSsoForm() {
 export function getLifetimeAuditSettings(data) {
   return request({
     method: "get",
-    url: "/security/audit/settings/lifetime.json",
+    url: "/security/audit/settings/lifetime",
     data,
   });
 }
@@ -638,14 +638,14 @@ export function getLifetimeAuditSettings(data) {
 export function getLoginHistory() {
   return request({
     method: "get",
-    url: "/security/audit/login/last.json",
+    url: "/security/audit/login/last",
   });
 }
 
 export function getAuditTrail() {
   return request({
     method: "get",
-    url: "/security/audit/events/last.json",
+    url: "/security/audit/events/last",
   });
 }
 

packages/common/api/user/index.js

@@ -9,7 +9,7 @@ export function login(userName, passwordHash, session) {
 
   return request({
     method: "post",
-    url: "/authentication.json",
+    url: "/authentication",
     skipLogout: true,
     data,
   });
@@ -18,7 +18,7 @@ export function login(userName, passwordHash, session) {
 export function thirdPartyLogin(SerializedProfile) {
   return request({
     method: "post",
-    url: "authentication.json",
+    url: "authentication",
     data: { SerializedProfile },
   });
 }
@@ -33,7 +33,7 @@ export function logout() {
 export function checkConfirmLink(data) {
   return request({
     method: "post",
-    url: "/authentication/confirm.json",
+    url: "/authentication/confirm",
     data,
   });
 }
@@ -67,7 +67,7 @@ export function loginWithTfaCode(userName, passwordHash, code) {
 export function loginWithConfirmKey(data) {
   return request({
     method: "post",
-    url: `/authentication.json`,
+    url: `/authentication`,
     skipLogout: true,
     data,
   });

packages/components/themes/dark.js

@@ -3005,7 +3005,7 @@ const Dark = {
       },
 
       backup: {
-        rectangleBackgroundColor: "#292929",
+        rectangleBackgroundColor: "#3D3D3D",
         separatorBorder: "1px solid #474747",
         warningColor: "#E06451",
         textColor: "#ADADAD",

products/ASC.Files/Core/Helpers/Global.cs

@@ -656,50 +656,47 @@ public class GlobalFolder
         TrashFolderCache.Remove(cacheKey);
     }
 
-    private async Task<int> GetFolderIdAndProcessFirstVisitAsync(IDaoFactory daoFactory, bool isMy)
+    private async Task<int> GetFolderIdAndProcessFirstVisitAsync(IDaoFactory daoFactory, bool my)
     {
         var folderDao = (FolderDao)daoFactory.GetFolderDao<int>();
 
-        var id = isMy ? await folderDao.GetFolderIDUserAsync(false) : await folderDao.GetFolderIDCommonAsync(false);
+        var id = my ? await folderDao.GetFolderIDUserAsync(false) : await folderDao.GetFolderIDCommonAsync(false);
 
         if (!Equals(id, 0))
         {
             return id;
         }
 
-        id = isMy ? await folderDao.GetFolderIDUserAsync(true) : await folderDao.GetFolderIDCommonAsync(true);
-        
-        if (!_settingsManager.LoadForDefaultTenant<AdditionalWhiteLabelSettings>().StartDocsEnabled)
-        {
-            return id;
-        }
-        
+        id = my ? await folderDao.GetFolderIDUserAsync(true) : await folderDao.GetFolderIDCommonAsync(true);
+
         var tenantId = _tenantManager.GetCurrentTenant().Id;
         var userId = _authContext.CurrentAccount.ID;
+
+        var task = new Task(async () => await CreateSampleDocumentsAsync(_serviceProvider, tenantId, userId, id, my), 
+            TaskCreationOptions.LongRunning);
+
+        _ = task.ConfigureAwait(false);
         
-        _ = Task.Run(() => CreateSampleDocumentsAsync(_serviceProvider, tenantId, userId, id, isMy).GetAwaiter().GetResult());
-        
+        task.Start();
+
         return id;
     }
     
-    private static async Task CreateSampleDocumentsAsync(IServiceProvider serviceProvider, int tenantId, Guid userId, int folderId, bool my)
+    private async Task CreateSampleDocumentsAsync(IServiceProvider serviceProvider, int tenantId, Guid userId, int folderId, bool my)
     {
-        await using var scope = serviceProvider.CreateAsyncScope();
-        var logger = scope.ServiceProvider.GetRequiredService<ILoggerProvider>().CreateLogger("ASC.Files");
-
         try
         {
+            await using var scope = serviceProvider.CreateAsyncScope();
+            
             var tenantManager = scope.ServiceProvider.GetRequiredService<TenantManager>();
             var securityContext = scope.ServiceProvider.GetRequiredService<SecurityContext>();
 
             tenantManager.SetCurrentTenant(tenantId);
             securityContext.AuthenticateMeWithoutCookie(userId);
-        
+
             var userManager = scope.ServiceProvider.GetRequiredService<UserManager>();
             var culture = my ? userManager.GetUsers(userId).GetCulture() : tenantManager.GetCurrentTenant().GetCulture();
 
-            Thread.CurrentThread.CurrentCulture = culture;
-        
             var globalStore = scope.ServiceProvider.GetRequiredService<GlobalStore>();
             var storeTemplate = globalStore.GetStoreTemplate();
             
@@ -717,21 +714,23 @@ public class GlobalFolder
             var folderDao = (FolderDao)scope.ServiceProvider.GetRequiredService<IFolderDao<int>>();
             var socketManager = scope.ServiceProvider.GetRequiredService<SocketManager>();
 
-            await SaveSampleDocumentsAsync(scope.ServiceProvider, fileMarker, folderDao, fileDao, socketManager, folderId, path, storeTemplate, logger);
+            await SaveSampleDocumentsAsync(scope.ServiceProvider, fileMarker, folderDao, fileDao, socketManager, folderId, path, storeTemplate);
         }
         catch (Exception e)
         {
-            logger.ErrorCreateSampleDocuments(e);
+            _logger.ErrorCreateSampleDocuments(e);
         }
     }
     
-    private static async Task SaveSampleDocumentsAsync(IServiceProvider serviceProvider, FileMarker fileMarker, FolderDao folderDao, FileDao fileDao, SocketManager socketManager, 
-        int folderId, string path, IDataStore storeTemplate, ILogger logger)
+    private async Task SaveSampleDocumentsAsync(IServiceProvider serviceProvider, FileMarker fileMarker, FolderDao folderDao, FileDao fileDao, SocketManager socketManager, 
+        int folderId, string path, IDataStore storeTemplate)
     { 
         var files = await storeTemplate.ListFilesRelativeAsync("", path, "*", false)
             .Where(f => FileUtility.GetFileTypeByFileName(f) is not (FileType.Audio or FileType.Video))
             .ToListAsync();
         
+        _logger.Debug($"Found {files.Count} sample documents. Path: {path}");
+        
         foreach (var file in files) 
         {
             try
@@ -765,7 +764,7 @@ public class GlobalFolder
             }
             catch (Exception e)
             {
-                logger.ErrorSaveSampleFile(e);
+                _logger.ErrorSaveSampleFile(e);
             }
         }
 
@@ -782,11 +781,11 @@ public class GlobalFolder
                 var subFolder = await folderDao.GetFolderAsync(subFolderId);
                 await socketManager.CreateFolderAsync(subFolder);
                     
-                await SaveSampleDocumentsAsync(serviceProvider, fileMarker, folderDao, fileDao, socketManager, folderId, path + folderName + "/", storeTemplate, logger);
+                await SaveSampleDocumentsAsync(serviceProvider, fileMarker, folderDao, fileDao, socketManager, folderId, path + folderName + "/", storeTemplate);
             }
             catch (Exception e)
             {
-                logger.ErrorSaveSampleFolder(e);
+                _logger.ErrorSaveSampleFolder(e);
             }
         }
     }

web/ASC.Web.Core/PublicResources/Resource.Designer.cs

@@ -19,7 +19,7 @@ namespace ASC.Web.Core.PublicResources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Resource {
@@ -2554,7 +2554,7 @@ namespace ASC.Web.Core.PublicResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Portal Name.
+        ///   Looks up a localized string similar to Cloud space for your office docs.
         /// </summary>
         public static string PortalName {
             get {

web/ASC.Web.Core/PublicResources/Resource.bg.resx

@@ -367,9 +367,6 @@
   <data name="PersonalFreeSpaceException" xml:space="preserve">
     <value>Превишена е квотата за дисково пространство</value>
   </data>
-  <data name="PortalName" xml:space="preserve">
-    <value>Име на портала</value>
-  </data>
   <data name="PortalSecurity" xml:space="preserve">
     <value>Достъп до портала</value>
   </data>

web/ASC.Web.Core/PublicResources/Resource.cs.resx

@@ -316,9 +316,6 @@
   <data name="Owner" xml:space="preserve">
     <value>Majitel</value>
   </data>
-  <data name="PortalName" xml:space="preserve">
-    <value>Název portálu</value>
-  </data>
   <data name="PortalSecurity" xml:space="preserve">
     <value>Přístup k portálu</value>
   </data>

web/ASC.Web.Core/PublicResources/Resource.de.resx

@@ -836,9 +836,6 @@
   <data name="PersonalFreeSpaceException" xml:space="preserve">
     <value>Der verfügbare Speicherplatz ist überschritten</value>
   </data>
-  <data name="PortalName" xml:space="preserve">
-    <value>Portalname</value>
-  </data>
   <data name="PortalSecurity" xml:space="preserve">
     <value>Zugang zum Portal</value>
   </data>

web/ASC.Web.Core/PublicResources/Resource.es.resx

@@ -799,9 +799,6 @@
   <data name="PersonalFreeSpaceException" xml:space="preserve">
     <value>Cuota de espacio en disco excedida </value>
   </data>
-  <data name="PortalName" xml:space="preserve">
-    <value>Nombre de portal</value>
-  </data>
   <data name="PortalSecurity" xml:space="preserve">
     <value>Acceso a portal</value>
   </data>

web/ASC.Web.Core/PublicResources/Resource.fi.resx

@@ -247,9 +247,6 @@
   <data name="Owner" xml:space="preserve">
     <value>Omistaja</value>
   </data>
-  <data name="PortalName" xml:space="preserve">
-    <value>Sivuston nimi</value>
-  </data>
   <data name="PortalSecurity" xml:space="preserve">
     <value>Portaalin käyttöoikeus</value>
   </data>

web/ASC.Web.Core/PublicResources/Resource.fr.resx

@@ -650,8 +650,8 @@
     <value>Remarque: la taille du fichier ne doit pas dépasser {1}{0}{2}</value>
   </data>
   <data name="FileSizePostfix" xml:space="preserve">
-    <value>octets,ko,Mo,Go,To
-
+    <value>octets,ko,Mo,Go,To
+
 </value>
   </data>
   <data name="FinishInviteJoinEmailMessage" xml:space="preserve">
@@ -834,9 +834,6 @@
   <data name="PersonalFreeSpaceException" xml:space="preserve">
     <value>Quota d'espace disque est dépassé</value>
   </data>
-  <data name="PortalName" xml:space="preserve">
-    <value>Nom du portail</value>
-  </data>
   <data name="PortalSecurity" xml:space="preserve">
     <value>Accès au portail</value>
   </data>

web/ASC.Web.Core/PublicResources/Resource.it.resx

@@ -470,7 +470,7 @@
     <value>ID Client</value>
   </data>
   <data name="ConsumersyahooClientSecret" xml:space="preserve">
-    <value>Client Secret
+    <value>Client Secret
 </value>
   </data>
   <data name="ConsumersYahooDescription" xml:space="preserve">
@@ -672,7 +672,7 @@
     <value>Non è possibile ottenere l'Attributo di Login per uno o più utenti.</value>
   </data>
   <data name="LdapSettingsErrorWrongServerOrPort" xml:space="preserve">
-    <value>Impossibile connettersi al server LDAP. Si prega di controllare se l'indirizzo del server e il numero porta sono corretti.
+    <value>Impossibile connettersi al server LDAP. Si prega di controllare se l'indirizzo del server e il numero porta sono corretti.
 </value>
   </data>
   <data name="LdapSettingsErrorWrongUserAttribute" xml:space="preserve">
@@ -792,9 +792,6 @@
   <data name="PersonalFreeSpaceException" xml:space="preserve">
     <value>Quota di spazio su disco superata</value>
   </data>
-  <data name="PortalName" xml:space="preserve">
-    <value>Nome portale</value>
-  </data>
   <data name="PortalSecurity" xml:space="preserve">
     <value>Accesso al portale</value>
   </data>

web/ASC.Web.Core/PublicResources/Resource.lv.resx

@@ -316,9 +316,6 @@
   <data name="Owner" xml:space="preserve">
     <value>Īpašnieks</value>
   </data>
-  <data name="PortalName" xml:space="preserve">
-    <value>Portāla nosaukums</value>
-  </data>
   <data name="PortalSecurity" xml:space="preserve">
     <value>Piekļuve portālam</value>
   </data>

web/ASC.Web.Core/PublicResources/Resource.nl.resx

@@ -310,9 +310,6 @@
   <data name="Owner" xml:space="preserve">
     <value>Eigenaar</value>
   </data>
-  <data name="PortalName" xml:space="preserve">
-    <value>Portaalnaam</value>
-  </data>
   <data name="PortalSecurity" xml:space="preserve">
     <value>Portaaltoegang</value>
   </data>

web/ASC.Web.Core/PublicResources/Resource.pl.resx

@@ -316,9 +316,6 @@
   <data name="Owner" xml:space="preserve">
     <value>Właściciel</value>
   </data>
-  <data name="PortalName" xml:space="preserve">
-    <value>Nazwa portalu</value>
-  </data>
   <data name="PortalSecurity" xml:space="preserve">
     <value>Dostęp do portalu</value>
   </data>

web/ASC.Web.Core/PublicResources/Resource.pt-BR.resx

@@ -382,9 +382,6 @@
   <data name="PersonalFreeSpaceException" xml:space="preserve">
     <value>Cota de espaço em disco excedida</value>
   </data>
-  <data name="PortalName" xml:space="preserve">
-    <value>Nome do Portal</value>
-  </data>
   <data name="PortalSecurity" xml:space="preserve">
     <value>Acesso ao portal</value>
   </data>

web/ASC.Web.Core/PublicResources/Resource.resx

@@ -890,7 +890,7 @@
     <value>Disk space quota exceeded</value>
   </data>
   <data name="PortalName" xml:space="preserve">
-    <value>Portal Name</value>
+    <value>Cloud space for your office docs</value>
   </data>
   <data name="PortalSecurity" xml:space="preserve">
     <value>Portal Access</value>

web/ASC.Web.Core/PublicResources/Resource.ru.resx

@@ -832,9 +832,6 @@
   <data name="PersonalFreeSpaceException" xml:space="preserve">
     <value>Превышена квота на размер дискового пространства</value>
   </data>
-  <data name="PortalName" xml:space="preserve">
-    <value>Имя портала</value>
-  </data>
   <data name="PortalSecurity" xml:space="preserve">
     <value>Доступ к порталу</value>
   </data>

web/ASC.Web.Core/PublicResources/Resource.sk.resx

@@ -236,8 +236,8 @@
     <value>Upraviť používateľov LDAP na bežných používateľov portálu</value>
   </data>
   <data name="LdapSettingsStatusAddingGroupUser" xml:space="preserve">
-    <value>pridanie používateľa
-
+    <value>pridanie používateľa
+
 </value>
   </data>
   <data name="LdapSettingsStatusCertificateVerification" xml:space="preserve">
@@ -259,8 +259,8 @@
     <value>Načítanie základných informácií LDAP</value>
   </data>
   <data name="LdapSettingsStatusRemovingGroupUser" xml:space="preserve">
-    <value>odstránenie používateľa
-
+    <value>odstránenie používateľa
+
 </value>
   </data>
   <data name="LdapSettingsStatusRemovingOldGroups" xml:space="preserve">
@@ -323,9 +323,6 @@
   <data name="Owner" xml:space="preserve">
     <value>Majiteľ</value>
   </data>
-  <data name="PortalName" xml:space="preserve">
-    <value>Názov portálu</value>
-  </data>
   <data name="PortalSecurity" xml:space="preserve">
     <value>Prístup k portálu</value>
   </data>

web/ASC.Web.Core/PublicResources/Resource.sl.resx

@@ -232,9 +232,6 @@
   <data name="Owner" xml:space="preserve">
     <value>Lastnik</value>
   </data>
-  <data name="PortalName" xml:space="preserve">
-    <value>Ime portala</value>
-  </data>
   <data name="PortalSecurity" xml:space="preserve">
     <value>Dostop portala</value>
   </data>

web/ASC.Web.Core/PublicResources/Resource.tr.resx

@@ -316,9 +316,6 @@
   <data name="Owner" xml:space="preserve">
     <value>Sahip</value>
   </data>
-  <data name="PortalName" xml:space="preserve">
-    <value>Portal ismi</value>
-  </data>
   <data name="PortalSecurity" xml:space="preserve">
     <value>Portal Erişimi</value>
   </data>

web/ASC.Web.Core/PublicResources/Resource.vi.resx

@@ -167,7 +167,7 @@
     <value>Lưu ý: kích thước file không được vượt quá {1}{0}{2}</value>
   </data>
   <data name="FileSizePostfix" xml:space="preserve">
-    <value>bytes,KB,MB,GB,TB
+    <value>bytes,KB,MB,GB,TB
 </value>
   </data>
   <data name="FinishInviteJoinEmailMessage" xml:space="preserve">
@@ -317,9 +317,6 @@
   <data name="Owner" xml:space="preserve">
     <value>Người sở hữu</value>
   </data>
-  <data name="PortalName" xml:space="preserve">
-    <value>Tên Cổng</value>
-  </data>
   <data name="PortalSecurity" xml:space="preserve">
     <value>Truy cập Cổng</value>
   </data>

web/ASC.Web.Core/PublicResources/Resource.zh-CN.resx

@@ -349,9 +349,6 @@
   <data name="PersonalFreeSpaceException" xml:space="preserve">
     <value>超过磁盘空间配额</value>
   </data>
-  <data name="PortalName" xml:space="preserve">
-    <value>门户名称</value>
-  </data>
   <data name="PortalSecurity" xml:space="preserve">
     <value>门户访问</value>
   </data>