Fix v2.3.2 dev problems (#194)

* feat: add refresh accelerate uploading cache on confirm popup

* feat: add accelerate uploading tip

* feat: add default storage classes and hide accelerate uploading if private

* chore: improve accelerate uploading fee hint

* fix: download from s3 custom domain

* fix: crash when only one available storage class

* bump kodo-s3-adapter-sdk to v0.7.1

package.json

@@ -111,7 +111,7 @@
     "form-data": "^4.0.0",
     "js-base64": "^3.4.5",
     "js-md5": "^0.7.3",
-    "kodo-s3-adapter-sdk": "0.7.0",
+    "kodo-s3-adapter-sdk": "0.7.1",
     "lockfile": "^1.0.4",
     "lodash": "^4.17.21",
     "mime": "^2.3.1",

src/common/ipc-actions/download.ts

@@ -1,5 +1,5 @@
 import {NatureLanguage} from "kodo-s3-adapter-sdk/dist/uplog";
-import {Domain} from "kodo-s3-adapter-sdk/dist/adapter";
+import {Domain, UrlStyle} from "kodo-s3-adapter-sdk/dist/adapter";
 
 import {ClientOptionsSerialized} from "@common/qiniu";
 import {Status} from "@common/models/job/types";
@@ -24,6 +24,7 @@ export interface DownloadOptions {
     bucket: string,
 
     domain?: Domain,
+    urlStyle?: UrlStyle,
 
     isOverwrite: boolean,
     storageClasses: StorageClass[],

src/common/models/job/download-job.ts

@@ -3,7 +3,7 @@ import fs, {constants as fsConstants, promises as fsPromises} from "fs";
 
 import lodash from "lodash";
 import {Downloader} from "kodo-s3-adapter-sdk";
-import {Adapter, Domain, ObjectHeader, StorageClass} from "kodo-s3-adapter-sdk/dist/adapter";
+import {Adapter, Domain, ObjectHeader, StorageClass, UrlStyle} from "kodo-s3-adapter-sdk/dist/adapter";
 import {NatureLanguage} from "kodo-s3-adapter-sdk/dist/uplog";
 
 import {ClientOptions, createQiniuClient} from "@common/qiniu";
@@ -36,7 +36,8 @@ interface DownloadOptions {
 
 interface OptionalOptions extends DownloadOptions {
     id: string,
-    domain?: Domain,
+    domain: Domain | undefined,
+    urlStyle: UrlStyle | undefined,
 
     status: Status,
     message: string,
@@ -58,6 +59,8 @@ type Options = RequiredOptions & Partial<OptionalOptions>
 
 const DEFAULT_OPTIONS: OptionalOptions = {
     id: "",
+    domain: undefined,
+    urlStyle: undefined,
 
     multipartDownloadThreshold: 100,
     multipartDownloadSize: 8,
@@ -86,6 +89,7 @@ type PersistInfo = {
     from: RequiredOptions["from"],
     backendMode: RequiredOptions["clientOptions"]["backendMode"],
     domain: OptionalOptions["domain"],
+    urlStyle: OptionalOptions["urlStyle"],
     prog: OptionalOptions["prog"],
     status: Exclude<OptionalOptions["status"], Status.Waiting | Status.Running>,
     message: OptionalOptions["message"],
@@ -112,6 +116,8 @@ export default class DownloadJob extends TransferJob {
     ): DownloadJob {
         return new DownloadJob({
             id,
+            domain: persistInfo.domain,
+            urlStyle: persistInfo.urlStyle,
             status: persistInfo.status,
             message: persistInfo.message,
 
@@ -213,6 +219,7 @@ export default class DownloadJob extends TransferJob {
             to: this.options.to,
             from: this.options.from,
             domain: this.options.domain,
+            urlStyle: this.options.urlStyle,
             storageClasses: this.options.storageClasses,
             backendMode: this.options.clientOptions.backendMode,
 
@@ -297,6 +304,7 @@ export default class DownloadJob extends TransferJob {
             this.tempFilePath,
             this.options.domain,
             {
+                urlStyle: this.options.urlStyle,
                 recoveredFrom: this.prog.resumable
                     ? this.prog.loaded
                     : 0,

src/main/transfer-managers/download-manager.ts

@@ -293,6 +293,7 @@ export default class DownloadManager extends TransferManager<DownloadJob, Config
             overwrite: downloadOptions.isOverwrite,
             region: downloadOptions.region,
             domain: downloadOptions.domain,
+            urlStyle: downloadOptions.urlStyle,
 
             multipartDownloadThreshold: this.config.multipartThreshold,
             multipartDownloadSize: this.config.multipartSize,

src/renderer/components/forms/change-storage-class-form.tsx

@@ -7,7 +7,6 @@ import StorageClass from "@common/models/storage-class";
 
 export interface ChangeStorageClassFormData {
   storageClassKodoName: string,
-  someInput: string,
 }
 
 interface ChangeStorageClassFormProps {
@@ -52,7 +51,7 @@ const ChangeStorageClassForm: React.FC<ChangeStorageClassFormProps> = ({
 
   useEffect(() => {
     reset({
-      storageClassKodoName: availableStorageClasses[0].kodoName ?? "Standard",
+      storageClassKodoName: availableStorageClasses[0]?.kodoName ?? "",
     });
   }, []);
 
@@ -97,33 +96,37 @@ const ChangeStorageClassForm: React.FC<ChangeStorageClassFormProps> = ({
               </div>
             </Form.Group>
         }
-        <Form.Group as={Fragment} controlId="storageClassKodoName">
-          <Form.Label className="text-end">
-            {translate("forms.changeStorageClass.storageClassKodoName.label")}
-          </Form.Label>
-          <div>
-            {
-              availableStorageClasses.map(storageClass => (
-                <Form.Check
-                  {...register("storageClassKodoName")}
-                  id={`storageClassKodoName-${storageClass.kodoName}`}
-                  key={storageClass.kodoName}
-                  type="radio"
-                  label={storageClass.nameI18n[currentLanguage]}
-                  value={storageClass.kodoName}
-                />
-              ))
-            }
-            <Form.Text>
-              {
-                availableStorageClasses
-                  .find(storageClasses =>
-                    storageClasses.kodoName === watch("storageClassKodoName"))
-                  ?.billingI18n[currentLanguage]
-              }
-            </Form.Text>
-          </div>
-        </Form.Group>
+        {
+          !availableStorageClasses.length
+          ? null
+          : <Form.Group as={Fragment} controlId="storageClassKodoName">
+            <Form.Label className="text-end">
+              {translate("forms.changeStorageClass.storageClassKodoName.label")}
+            </Form.Label>
+              <div>
+                {
+                  availableStorageClasses.map(storageClass => (
+                    <Form.Check
+                      {...register("storageClassKodoName")}
+                      id={`storageClassKodoName-${storageClass.kodoName}`}
+                      key={storageClass.kodoName}
+                      type="radio"
+                      label={storageClass.nameI18n[currentLanguage]}
+                      value={storageClass.kodoName}
+                    />
+                  ))
+                }
+                <Form.Text>
+                  {
+                    availableStorageClasses
+                      .find(storageClasses =>
+                        storageClasses.kodoName === watch("storageClassKodoName"))
+                      ?.billingI18n[currentLanguage]
+                  }
+                </Form.Text>
+              </div>
+          </Form.Group>
+        }
       </fieldset>
     </Form>
   );

src/renderer/components/modals/file/change-file-storage-class/index.tsx

@@ -58,11 +58,12 @@ const ChangeFileStorageClass: React.FC<ModalProps & ChangeFileStorageClassProps>
   const changeStorageClassFormController = useForm<ChangeStorageClassFormData>({
     mode: "onChange",
     defaultValues: {
-      storageClassKodoName: storageClasses[0]?.kodoName ?? "Standard",
+      storageClassKodoName: storageClasses[0]?.kodoName ?? "",
     },
   });
 
   const {
+    watch,
     handleSubmit,
     formState: {
       isSubmitting,
@@ -135,7 +136,7 @@ const ChangeFileStorageClass: React.FC<ModalProps & ChangeFileStorageClassProps>
       </Modal.Body>
       <Modal.Footer>
         {
-          !memoFileItem || isSubmitSuccessful
+          !memoFileItem || !watch("storageClassKodoName") || isSubmitSuccessful
             ? null
             : <Button
               variant="primary"

src/renderer/components/modals/file/change-files-storage-class/index.tsx

@@ -87,7 +87,7 @@ const ChangeFilesStorageClass: React.FC<ModalProps & ChangeFilesStorageClassProp
   const changeStorageClassFormController = useForm<ChangeStorageClassFormData>({
     mode: "onChange",
     defaultValues: {
-      storageClassKodoName: storageClasses[0]?.kodoName ?? "Standard",
+      storageClassKodoName: storageClasses[0]?.kodoName ?? "",
     },
   });
 

src/renderer/components/modals/file/upload-files-confirm/index.tsx

@@ -339,10 +339,9 @@ const UploadFilesConfirm: React.FC<ModalProps & UploadFilesConfirmProps> = ({
                       label={translate("modals.uploadConfirm.form.accelerateUploading.hint")}
                     />
                     {
-                    // TODO(lihs): need to be confirmed with PM
-                    // <Form.Text>
-                    //   {translate("modals.uploadConfirm.form.accelerateUploading.hintSecondary")}
-                    // </Form.Text>
+                    <Form.Text>
+                      {translate("modals.uploadConfirm.form.accelerateUploading.hintSecondary")}
+                    </Form.Text>
                     }
                   </div>
                 </Form.Group>
@@ -383,6 +382,7 @@ const UploadFilesConfirm: React.FC<ModalProps & UploadFilesConfirmProps> = ({
       </Modal.Body>
       <Modal.Footer>
         {
+          currentUser?.endpointType === EndpointType.Public &&
           onClickRefreshCanAccelerateUploading &&
           <TipPopover
             className="me-auto"

src/renderer/components/modals/preview-file/file-content/code-content.tsx

@@ -7,9 +7,10 @@ import {BackendMode} from "@common/qiniu"
 
 import {useI18n} from "@renderer/modules/i18n";
 import {useAuth} from "@renderer/modules/auth";
-import {getContent, saveContent} from "@renderer/modules/qiniu-client";
+import {getContent, saveContent, getStyleForSignature} from "@renderer/modules/qiniu-client";
 import {DomainAdapter, NON_OWNED_DOMAIN} from "@renderer/modules/qiniu-client-hooks";
 import {DiffView, EditorView} from "@renderer/modules/codemirror";
+import {useFileOperation} from "@renderer/modules/file-operation";
 
 import LoadingHolder from "@renderer/components/loading-holder";
 
@@ -34,6 +35,7 @@ const CodeContent: React.FC<CodeContentProps> = ({
 }) => {
   const {translate} = useI18n();
   const {currentUser} = useAuth();
+  const {bucketPreferBackendMode: preferBackendMode} = useFileOperation();
 
   // code mirror editor
   const editorRef = useRef<Editor>();
@@ -76,13 +78,19 @@ const CodeContent: React.FC<CodeContentProps> = ({
       endpointType: currentUser.endpointType,
       preferS3Adapter: domain.apiScope === BackendMode.S3,
     };
+    const domainToGet = domain?.name === NON_OWNED_DOMAIN.name
+      ? undefined
+      : domain;
     getContent(
       regionId,
       bucketName,
       filePath,
-      domain.name === NON_OWNED_DOMAIN.name
-        ? undefined
-        : domain,
+      domainToGet,
+      getStyleForSignature({
+        domain: domainToGet,
+        preferBackendMode,
+        currentEndpointType: currentUser.endpointType,
+      }),
       opt,
     )
       .then(contentBuffer => {

src/renderer/components/modals/preview-file/file-operation/change-storage-class.tsx

@@ -62,11 +62,12 @@ const ChangeStorageClass: React.FC<ChangeStorageClassProps> = ({
   const changeStorageClassFormController = useForm<ChangeStorageClassFormData>({
     mode: "onChange",
     defaultValues: {
-      storageClassKodoName: storageClasses[0]?.kodoName ?? "Standard",
+      storageClassKodoName: storageClasses[0]?.kodoName ?? "",
     },
   });
 
   const {
+    watch,
     handleSubmit,
     formState: {
       isSubmitting,
@@ -123,7 +124,7 @@ const ChangeStorageClass: React.FC<ChangeStorageClassProps> = ({
         onSubmit={handleSubmitChangeStorageClass}
       />
       {
-        !SubmitButtonPortal || isSubmitSuccessful
+        !SubmitButtonPortal || !watch("storageClassKodoName") || isSubmitSuccessful
           ? null
           : <SubmitButtonPortal>
             <Button

src/renderer/modules/i18n/lang/ja-jp.ts

@@ -792,7 +792,7 @@ const dict: Dictionary = {
                 accelerateUploading: {
                   label: "アップロードを加速する：",
                   hint: "（今回だけ）",
-                  hintSecondary: "開いた後、アクセラレーションドメインを優先してアップロードします；アクセラレーションドメインを使用する場合、追加料金が発生します。",
+                  hintSecondary: "開いた後、アクセラレーションドメインを優先してアップロードします；アクセラレーションドメインを使用する場合、追加通信料金が発生します。",
                 },
                 storageClassKodoName: {
                     label: "保管タイプ：",

src/renderer/modules/i18n/lang/zh-cn.ts

@@ -792,7 +792,7 @@ const dict: Dictionary = {
         accelerateUploading: {
           label: "加速上传：",
           hint: "（仅本次）",
-          hintSecondary: "开启后，优先通过加速域名上传；当使用加速域名上传时，产生额外费用。",
+          hintSecondary: "开启后，优先通过加速域名上传；当使用加速域名上传时，产生传输加速费用。",
         },
         storageClassKodoName: {
           label: "存储类型：",

src/renderer/modules/qiniu-client-hooks/use-load-regions.ts

@@ -1,5 +1,6 @@
 import {useEffect, useState} from "react";
 import {Region} from "kodo-s3-adapter-sdk";
+import {RegionStorageClass} from "kodo-s3-adapter-sdk/dist/region";
 import {toast} from "react-hot-toast";
 
 import * as LocalLogger from "@renderer/modules/local-logger";
@@ -12,6 +13,20 @@ interface LoadRegionsState {
   regions: Region[],
 }
 
+const DEFAULT_REGION_STORAGE_CLASSES: RegionStorageClass[] = [
+  {
+    fileType: 0,
+    kodoName: "Standard",
+    s3Name: "STANDARD",
+    billingI18n: {},
+    nameI18n: {
+      en_US: "Standard",
+      ja_JP: "標準",
+      zh_CN: "标准存储",
+    },
+  },
+];
+
 export default function useLoadRegions({
   user,
   shouldAutoReload,
@@ -63,8 +78,7 @@ export default function useLoadRegions({
         } else {
           try {
             regions = regionsFromEndpointConfig.map(r => {
-              const storageClasses = regionsFromFetch
-                .find(i => i.s3Id === r.identifier)?.storageClasses ?? []
+              const storageClasses = regionsFromFetch.find(i => i.s3Id === r.identifier)?.storageClasses;
               const result = new Region(
                 r.identifier,
                 r.identifier,
@@ -90,6 +104,12 @@ export default function useLoadRegions({
         }
       }
     } finally {
+      // set default storage classes
+      regions?.forEach(r => {
+        if (!r.storageClasses.length) {
+          r.storageClasses.push(...DEFAULT_REGION_STORAGE_CLASSES.map(sc => ({...sc})));
+        }
+      });
       setLoadRegionsState({
         loading: false,
         regions: regions || [],

src/renderer/modules/qiniu-client/common.test.ts

@@ -3,10 +3,16 @@ import * as MockAuth from "@common/qiniu/_mock-helpers_/auth";
 
 import { RegionService } from "kodo-s3-adapter-sdk/dist/region_service";
 
-jest.mock("kodo-s3-adapter-sdk/dist/region_service", () => ({
+jest.mock("kodo-s3-adapter-sdk/dist/region_service", () => {
+  class MockedRegionService extends jest.fn() {
+    static clearCache = jest.fn();
+    clearCache = jest.fn();
+  }
+  return {
     __esModule: true,
-    RegionService: jest.fn().mockReturnValue({ clearCache: () => {} }),
-}));
+    RegionService: MockedRegionService,
+  }
+});
 
 import { Kodo as KodoAdapter } from "kodo-s3-adapter-sdk/dist/kodo";
 import { S3 as S3Adapter } from "kodo-s3-adapter-sdk/dist/s3";