Skip to content

Commit 15018ff

Browse files
committed
feat: add default storage classes and hide accelerate uploading if private
1 parent 026f436 commit 15018ff

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ const UploadFilesConfirm: React.FC<ModalProps & UploadFilesConfirmProps> = ({
382382
</Modal.Body>
383383
<Modal.Footer>
384384
{
385+
currentUser?.endpointType === EndpointType.Public &&
385386
onClickRefreshCanAccelerateUploading &&
386387
<TipPopover
387388
className="me-auto"

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

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {useEffect, useState} from "react";
22
import {Region} from "kodo-s3-adapter-sdk";
3+
import {RegionStorageClass} from "kodo-s3-adapter-sdk/dist/region";
34
import {toast} from "react-hot-toast";
45

56
import * as LocalLogger from "@renderer/modules/local-logger";
@@ -12,6 +13,20 @@ interface LoadRegionsState {
1213
regions: Region[],
1314
}
1415

16+
const DEFAULT_REGION_STORAGE_CLASSES: RegionStorageClass[] = [
17+
{
18+
fileType: 0,
19+
kodoName: "Standard",
20+
s3Name: "STANDARD",
21+
billingI18n: {},
22+
nameI18n: {
23+
en_US: "Standard",
24+
ja_JP: "標準",
25+
zh_CN: "标准存储",
26+
},
27+
},
28+
];
29+
1530
export default function useLoadRegions({
1631
user,
1732
shouldAutoReload,
@@ -63,8 +78,11 @@ export default function useLoadRegions({
6378
} else {
6479
try {
6580
regions = regionsFromEndpointConfig.map(r => {
66-
const storageClasses = regionsFromFetch
67-
.find(i => i.s3Id === r.identifier)?.storageClasses ?? []
81+
let storageClasses = regionsFromFetch
82+
.find(i => i.s3Id === r.identifier)?.storageClasses;
83+
if (!storageClasses?.length) {
84+
storageClasses = DEFAULT_REGION_STORAGE_CLASSES;
85+
}
6886
const result = new Region(
6987
r.identifier,
7088
r.identifier,

src/renderer/modules/qiniu-client/utils.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Path as QiniuPath } from "qiniu-path/dist/src/path";
55

66
import * as AppConfig from "@common/const/app-config";
77
import * as KodoNav from "@renderer/const/kodo-nav";
8-
import {AkItem, AkSpecialType} from "@renderer/modules/auth";
8+
import {AkItem, EndpointType} from "@renderer/modules/auth";
99

1010
import {debugRequest, debugResponse, GetAdapterOptionParam, getDefaultClient} from './common'
1111
import {checkFileExists, checkFolderExists} from "./files";
@@ -99,7 +99,9 @@ export async function isAccelerateUploadingAvailable(
9999
opt: GetAdapterOptionParam,
100100
refreshCache = false,
101101
): Promise<boolean> {
102-
if (user.specialType === AkSpecialType.STS) {
102+
if (
103+
user.endpointType !== EndpointType.Public
104+
) {
103105
return false;
104106
}
105107

0 commit comments

Comments
 (0)