@social-mail/social-mail-client 1.0.78 → 1.0.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-client",
-  "version": "1.0.78",
+  "version": "1.0.79",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/admin/pages/users/UserDetailsPage.tsx

@@ -1,19 +1,12 @@
-import { ContentPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp"
-import { HostedDomain, IAppFileAccess, IDomainUser, IMailbox, IUser, IUserMailbox } from "../../../model/model"
+import { ContentPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
+import { IAppFileAccess, IDomainUser, IUser, IUserMailbox } from "../../../model/model";
 import AdminUserService from "./services/AdminUserService";
 import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
 import XNode from "@web-atoms/core/dist/core/XNode";
 import Form from "@web-atoms/web-controls/dist/basic/Form";
-import FormField from "@web-atoms/web-controls/dist/basic/FormField";
-import AtomRepeater from "@web-atoms/web-controls/dist/basic/AtomRepeater";
 import { toFileSize } from "../../../common/NumberFormats";
-import { AddIconTextButton } from "../../../common/controls/buttons/IconButton";
-import Expander from "@web-atoms/web-controls/dist/basic/Expander";
 import CollectionEditor from "../../../common/controls/collection-editor/CollectionEditor";
-import ChooseDomainPage from "../domains/choose/ChooseDomainPage";
-import PageNavigator from "@web-atoms/web-controls/dist/PageNavigator";
 import EditDomainUserPage from "./domains/EditDomainUserPage";
-import ChooseMailboxPage from "../../../web/page/mails/ChooseMailboxPage";
 import EditUserMailboxPage from "./mailboxes/EditUserMailboxPage";
 import EditFileAcessPage from "./files/EditFileAccessPage";
 

package/src/admin/pages/users/UserListPage.tsx

@@ -52,7 +52,7 @@ export default class UserListPage extends MasterDetailPage {
                 items={this.users}
                 {... InfiniteRepeater.pagedItems((start) =>
                     (c, e, cancelToken) =>
-                        this.userService.list({ start, search: this.search, cancelToken }))}
+                        this.userService.list({ start, search: this.search, cancelToken, v: this.version }))}
                 itemRenderer={(user: IUser) => <tr>
                     <td>{user.userID}</td>
                     <td>{user.userName}</td>

package/src/admin/pages/users/files/EditFileAccessPage.tsx

@@ -24,7 +24,8 @@ export default class EditFileAcessPage extends PopupWindowPage {
         const file = await PageNavigator.pushPageForResultOrCancel(ChooserFolderPage, {});
 
         this.model.type ||= "read";
-
+        this.model.file ??= file;
+        this.model.fileID = file.appFileID;
         this.renderer = <div>
             <Form>
                 <FormField label="Folder">
@@ -44,7 +45,7 @@ export default class EditFileAcessPage extends PopupWindowPage {
                 </FormField>
                 <div data-layout="command-row">
                     <SaveIconTextButton
-                        data-event-click="save-access"
+                        data-submit-event="save-access"
                         />
                 </div>
             </Form>

package/src/admin/pages/users/services/AdminUserService.ts

@@ -22,7 +22,7 @@ export default class AdminUserService {
             .firstOrDefault();
     }
 
-    public list({ search = "", start = 0, size = 50, cancelToken }) {
+    public list({ search = "", start = 0, size = 50, cancelToken, v = void 0 }) {
         let q = this.entityService.query(User);
         if (search) {
             if (/\^d+$/.test(search)) {

package/src/services/files/LocalFileService.tsx

@@ -87,7 +87,7 @@ export default class LocalFileService {
         return detail.files;
     }
 
-    async upload(files: File[], extra: any) {
+    async upload(files: File[], extra: any, ct?: CancelToken) {
         return files.map((file) => {
             const uploadFile: IFileUpload = {
                 name: file.name
@@ -99,6 +99,7 @@ export default class LocalFileService {
                     const onError = () => {
                     reject(new Error(xhr.responseText || "Error"));
                 };
+                ct?.registerForCancel(() => xhr.abort());
                 xhr.upload.addEventListener("progress", (event) => {
                     if (event.lengthComputable) {
                         uploadFile.progress = event.loaded / event.total;
@@ -179,7 +180,7 @@ class FileUploadWindow extends PopupWindow {
             await this.requestCancel();
         }, null, { capture: true });
 
-        this.files = await this.localFileService.upload(this.parameters.files, this.parameters.extra);
+        this.files = await this.localFileService.upload(this.parameters.files, this.parameters.extra, this.cancelToken);
 
         this.render(<div>
             <AtomRepeater