A modern, self-hosted backup solution for secure, encrypted backups across local and cloud storage.
fix: resolves various storage connectivity issue
towfiqi4eedb11f7997
diff --git a/backend/src/managers/BaseBackupManager.ts b/backend/src/managers/BaseBackupManager.tsindex 21668d0..f3c048a 100644--- a/backend/src/managers/BaseBackupManager.ts+++ b/backend/src/managers/BaseBackupManager.ts@@ -75,19 +75,12 @@ export class BaseBackupManager extends EventEmitter {if (!encryption) {repoCommand.push('--insecure-no-password');}- const repoResult = await runResticCommand(- repoCommand,- {- RESTIC_PASSWORD: repoPassword,- RCLONE_CONFIG_PASS: repoPassword,- },- (data: Buffer) => {- console.log('[restic] Progress Data :', data.toString());- }- );- console.log('[BaseBackupManager] 🤍 repo Creation Result :', repoResult);+ const repoResult = await runResticCommand(repoCommand, {+ RESTIC_PASSWORD: repoPassword,+ RCLONE_CONFIG_PASS: repoPassword,+ });} catch (error: any) {- // logger.error('[BaseBackup] repo Creation Error :', error);+ // console.log('[BaseBackupManager] repo Creation Error :', error);return { success: false, result: 'Could Not Create Restic Repo. Details: ' + error.message };}diff --git a/backend/src/managers/BaseStorageManager.ts b/backend/src/managers/BaseStorageManager.tsindex a71bbd5..01f932c 100644--- a/backend/src/managers/BaseStorageManager.ts+++ b/backend/src/managers/BaseStorageManager.ts@@ -2,19 +2,6 @@ import { providers } from '../utils/providers';import { runRcloneCommand } from '../utils/rclone/rclone';export class BaseStorageManager {- async setupRclone() {- // Encrypt Rclone Config file.- // set the password in RCLONE_CONFIG_PASS env then run:- // rclone config encryption set --config=rclone.conf --encrypted-config=rclone.conf.enc --ask-password=false-- // Remove the rclone.conf file- if (process.platform === 'win32') {- // use rm to remove rclone.conf file- } else {- // If linux, use shred to remove the file- }- }-async createRemote(type: string,name: string,@@ -23,11 +10,25 @@ export class BaseStorageManager {settings?: Record<string, string>): Promise<any> {const provider = providers[type];+ const bucketName = credentials?.bucket ? credentials.bucket.trim() : '';if (!provider && type !== 'local') {throw new Error(`Unsupported storage type: ${type}`);}- const args = ['config', 'create', name, type];+ let rcloneStorageType = type;+ if (provider) {+ if (provider.s3Adapter) {+ rcloneStorageType = 's3';+ if (!bucketName) {+ return {+ success: false,+ result: 'Bucket Name is required.',+ };+ }+ }+ }++ const args = ['config', 'create', name, rcloneStorageType];const setupArgs = provider.setup(credentials, authType);if (setupArgs === false) {throw new Error(`Missing Required credentials.`);@@ -58,14 +59,16 @@ export class BaseStorageManager {}).then(response => response.json()).then((result: any) => {- console.log('result.id :', result.id);- console.log('result.driveType :', result.driveType);if (result && result.id && result.driveType) {args.push('drive_id', result.id, 'drive_type', result.driveType);}});} catch (error: any) {- console.log('error :', error);+ return {+ success: false,+ result:+ 'Failed to fetch OneDrive drive information. Please verify your credentials and try again.',+ };}}@@ -78,36 +81,41 @@ export class BaseStorageManager {const output = await runRcloneCommand(args);try {- const lsdOutput = await runRcloneCommand(['lsd', name + ':']);+ const lsdOutput = await runRcloneCommand(['lsd', name + ':' + (bucketName ?? '')]);// console.log('lsd Success :', lsdOutput);return {success: true,result: output,};} catch (error: any) {- console.log('lsd error:', error);+ const storageListingError = (error?.message || '').split('\n')[0];await runRcloneCommand(['config', 'delete', name]);return {success: false,- result: error?.message || '',+ result: storageListingError,};}} catch (error: any) {+ // split the first line and return only the error message+ const storageCreateError = (error?.message || '').split('\n')[0];+return {success: false,- result: error?.message || '',+ result: storageCreateError,};}}async updateRemote(name: string,- newSettings: Record<string, string | number | boolean>,- oldSettings: Record<string, string | number | boolean>+ newSettings: Record<string, any>,+ oldSettings: Record<string, any>): Promise<any> {// Filter out settings that need to be updated vs removed// When a setting is in the config file and it is not provided on subsequent updates,// its reset to default by rclone+ const availableCreds = newSettings.credentials || oldSettings.credentials;+ const bucketName = availableCreds?.bucket ? availableCreds?.bucket.trim() : '';const updateArgs = ['config', 'update', name];Object.entries(newSettings).forEach(([key, value]) => {updateArgs.push(key, value.toString());@@ -119,7 +127,7 @@ export class BaseStorageManager {// Verify the remote still works after updatetry {- const lsdOutput = await runRcloneCommand(['lsd', name + ':']);+ const lsdOutput = await runRcloneCommand(['lsd', name + ':' + (bucketName ?? '')]);return {success: true,@@ -227,9 +235,9 @@ export class BaseStorageManager {}}- async verifyRemote(name: string): Promise<{ success: boolean; result: string }> {+ async verifyRemote(name: string, bucket?: string): Promise<{ success: boolean; result: string }> {try {- const lsdOutput = await runRcloneCommand(['lsd', name + ':']);+ const lsdOutput = await runRcloneCommand(['lsd', name + ':' + (bucket ?? '')]);return {success: true,result: lsdOutput,diff --git a/backend/src/services/StorageService.ts b/backend/src/services/StorageService.tsindex 4f459cb..ab9eab6 100644--- a/backend/src/services/StorageService.ts+++ b/backend/src/services/StorageService.ts@@ -98,10 +98,11 @@ export class StorageService {}const { type, name, authType, credentials, settings, tags } = parsedStorageData;+ const storageName = (name || '').trim();// Create the remote storage with rcloneconst remoteResult = await this.storageManager.createRemote(type as string,- name as string,+ storageName,authType as string,credentials as Record<string, string>,settings as Record<string, string>@@ -122,10 +123,11 @@ export class StorageService {const storageId = generateUID();const newStorage = await this.storageStore.create({id: storageId,- name: name as string,+ name: storageName,type: type as string,settings: settings as Record<string, string>,credentials: encryptedCreds,+ defaultPath: credsObj?.bucket || '/',authType: authType as string,tags: tags as string[],});@@ -280,8 +282,26 @@ export class StorageService {if (!storage) {throw new NotFoundError('Storage not found');}+ const decryptedCreds: Record<string, string> = {};+ try {+ const cryptr = new Cryptr(configService.config.SECRET as string);+ const credsObj = storage.credentials;- const verifyResult = await this.storageManager.verifyRemote(storage.name);+ if (credsObj) {+ Object.keys(credsObj).forEach((k: string) => {+ if (typeof credsObj[k] === 'string') {+ decryptedCreds[k] = cryptr.decrypt(credsObj[k]);+ }+ });+ }+ } catch (error: any) {+ throw new AppError(+ 500,+ 'Could not decrypt your Storage Credentials Settings. Your Pluton Secret key may have changed or missing.'+ );+ }+ const bucketName = decryptedCreds?.bucket as string;+ const verifyResult = await this.storageManager.verifyRemote(storage.name, bucketName);if (!verifyResult.success) {throw new AppError(500, verifyResult.result || 'Failed to verify storage');}diff --git a/backend/src/utils/providers.ts b/backend/src/utils/providers.tsindex c451c5c..4163fee 100644--- a/backend/src/utils/providers.ts+++ b/backend/src/utils/providers.ts@@ -95,6 +95,7 @@ export interface ProviderConfig {About: boolean;EmptyDir: boolean;};+ s3Adapter?: boolean;settings?: ProviderSetting[];doc?: string;setup: (credentials: Record<string, string>, type?: string) => string[] | false;@@ -122,14 +123,29 @@ export const providers: Record<string, ProviderConfig> = {settings: s3Settings,authTypes: ['client'],features: providerFeatures['s3'],- setup: creds => [- 'access_key_id',- creds.access_key_id,- 'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,- 'region',- creds.region,- ],+ s3Adapter: true,+ setup: creds => {+ const args = [+ 'provider',+ 'AWS',+ 'access_key_id',+ creds.access_key_id,+ 'secret_access_key',+ creds.secret_access_key,+ 'region',+ creds.region,+ 'acl',+ creds.acl || 'private',+ ];+ if (creds.location_constraint && creds.location_constraint !== 'us-east-1') {+ args.push('location_constraint', creds.location_constraint);+ }+ if (creds.endpoint) {+ args.push('endpoint', creds.endpoint);+ }++ return args;+ },},drive: {name: 'Google Drive',@@ -151,7 +167,7 @@ export const providers: Record<string, ProviderConfig> = {'client_id',creds.client_id,'client_secret',- `$(rclone obscure ${creds.client_secret})`,+ creds.client_secret,'scope',creds.scope || 'drive','--drive-client-credentials',@@ -179,7 +195,7 @@ export const providers: Record<string, ProviderConfig> = {'client_id',creds.client_id,'client_secret',- `$(rclone obscure ${creds.client_secret})`,+ creds.client_secret,'--onedrive-client-credentials',];}@@ -205,7 +221,7 @@ export const providers: Record<string, ProviderConfig> = {'client_id',creds.client_id,'client_secret',- `$(rclone obscure ${creds.client_secret})`,+ creds.client_secret,'--dropbox-client-credentials',];}@@ -231,7 +247,7 @@ export const providers: Record<string, ProviderConfig> = {'client_id',creds.client_id,'client_secret',- `$(rclone obscure ${creds.client_secret})`,+ creds.client_secret,'--box-client-credentials',];}@@ -242,7 +258,7 @@ export const providers: Record<string, ProviderConfig> = {doc: '/storages/connecting-azure-blob-storage',settings: azureblobSettings,authTypes: ['client', 'password'],- setup: creds => ['account', creds.account, 'key', `$(rclone obscure ${creds.key})`],+ setup: creds => ['account', creds.account, 'key', creds.key],features: providerFeatures['azureBlob'],},gcs: {@@ -275,7 +291,7 @@ export const providers: Record<string, ProviderConfig> = {doc: '/storages/connecting-mega',authTypes: ['password'],settings: megaSettings,- setup: creds => ['user', creds.user, 'pass', `$(rclone obscure ${creds.password})`],+ setup: creds => ['user', creds.user, 'pass', creds.pass],features: providerFeatures['mega'],},pcloud: {@@ -297,7 +313,7 @@ export const providers: Record<string, ProviderConfig> = {'client_id',creds.client_id,'client_secret',- `$(rclone obscure ${creds.client_secret})`,+ creds.client_secret,'--pcloud-client-credentials',];}@@ -314,7 +330,7 @@ export const providers: Record<string, ProviderConfig> = {'user',creds.user,'key',- `$(rclone obscure ${creds.key})`,+ creds.key,'auth',creds.authUrl,'tenant',@@ -341,7 +357,7 @@ export const providers: Record<string, ProviderConfig> = {'user',creds.user,'pass',- `$(rclone obscure ${creds.password})`,+ creds.pass,'library',creds.library,],@@ -355,7 +371,7 @@ export const providers: Record<string, ProviderConfig> = {features: providerFeatures['jottacloud'],setup: (creds, type) => {if (type === 'password') {- return ['user', creds.user, 'pass', `$(rclone obscure ${creds.password})`];+ return ['user', creds.user, 'pass', creds.pass];} else {if (!creds.client_id || !creds.client_secret) {return false;@@ -364,7 +380,7 @@ export const providers: Record<string, ProviderConfig> = {'client_id',creds.client_id,'client_secret',- `$(rclone obscure ${creds.client_secret})`,+ creds.client_secret,'--jottacloud-client-credentials',];}@@ -389,7 +405,7 @@ export const providers: Record<string, ProviderConfig> = {'client_id',creds.client_id,'client_secret',- `$(rclone obscure ${creds.client_secret})`,+ creds.client_secret,'--yandex-client-credentials',];}@@ -415,7 +431,7 @@ export const providers: Record<string, ProviderConfig> = {'client_id',creds.client_id,'client_secret',- `$(rclone obscure ${creds.client_secret})`,+ creds.client_secret,'region',creds.region,'--zoho-client-credentials',@@ -443,7 +459,7 @@ export const providers: Record<string, ProviderConfig> = {'client_id',creds.client_id,'client_secret',- `$(rclone obscure ${creds.client_secret})`,+ creds.client_secret,'scope',creds.scope,'--hidrive-client-credentials',@@ -457,14 +473,7 @@ export const providers: Record<string, ProviderConfig> = {doc: '/storages/connecting-koofr',settings: koofrSettings,authTypes: ['client'],- setup: creds => [- 'endpoint',- creds.endpoint,- 'user',- creds.email,- 'password',- `$(rclone obscure ${creds.password})`,- ],+ setup: creds => ['endpoint', creds.endpoint, 'user', creds.email, 'password', creds.password],features: providerFeatures['koofr'],},mailru: {@@ -482,7 +491,7 @@ export const providers: Record<string, ProviderConfig> = {if (!creds.user || !creds.password) {return false;}- return ['user', creds.user, 'password', `$(rclone obscure ${creds.password})`];+ return ['user', creds.user, 'password', creds.password];}},features: providerFeatures['mailru'],@@ -492,7 +501,7 @@ export const providers: Record<string, ProviderConfig> = {doc: '/storages/connecting-opendrive',authTypes: ['password'],settings: opendriveSettings,- setup: creds => ['username', creds.username, 'password', `$(rclone obscure ${creds.password})`],+ setup: creds => ['username', creds.username, 'password', creds.password],features: providerFeatures['opendrive'],},qingstor: {@@ -502,9 +511,9 @@ export const providers: Record<string, ProviderConfig> = {settings: qingstorSettings,setup: creds => ['access_key_id',- creds.accessKeyId,+ creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secretKey})`,+ creds.secret_access_key,'zone',creds.zone,],@@ -529,9 +538,9 @@ export const providers: Record<string, ProviderConfig> = {'client_id',creds.client_id,'client_secret',- `$(rclone obscure ${creds.client_secret})`,+ creds.client_secret,'api_key',- `$(rclone obscure ${creds.api_key})`,+ creds.api_key,'--premiumizeme-client-credentials',];}@@ -553,7 +562,7 @@ export const providers: Record<string, ProviderConfig> = {if (!creds.token) {return false;}- return ['token', `$(rclone obscure ${creds.token})`];+ return ['token', creds.token];}},features: providerFeatures['putio'],@@ -579,7 +588,7 @@ export const providers: Record<string, ProviderConfig> = {'client_id',creds.client_id,'client_secret',- `$(rclone obscure ${creds.client_secret})`,+ creds.client_secret,'--sharefile-client-credentials',];}@@ -595,25 +604,12 @@ export const providers: Record<string, ProviderConfig> = {'access_key_id',creds.access_key_id,'private_access_key',- `$(rclone obscure ${creds.private_access_key})`,+ creds.private_access_key,'refresh_token',creds.refresh_token,],features: providerFeatures['sugarsync'],},- // 'nextcloud': {- // name: 'NextCloud',- // setup: creds => [- // 'url',- // creds.url,- // 'user',- // creds.user,- // 'pass',- // `$(rclone obscure ${creds.password})`,- // 'vendor',- // 'nextcloud',- // ],- // },fichier: {name: '1Fichier',@@ -621,7 +617,7 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: fichierSettings,setup: creds => {- return ['api_key', `$(rclone obscure ${creds.api_key})`];+ return ['api_key', creds.api_key];},features: providerFeatures['1fichier'],},@@ -636,7 +632,7 @@ export const providers: Record<string, ProviderConfig> = {'account_name',creds.account_name,'key',- `$(rclone obscure ${creds.key})`,+ creds.key,],features: providerFeatures['netstorage'],},@@ -645,7 +641,7 @@ export const providers: Record<string, ProviderConfig> = {doc: '/storages/connecting-files-com',authTypes: ['client', 'password'],settings: filesComSettings,- setup: creds => ['api_key', `$(rclone obscure ${creds.api_key})`],+ setup: creds => ['api_key', creds.api_key],features: providerFeatures['files'],},gofile: {@@ -653,7 +649,7 @@ export const providers: Record<string, ProviderConfig> = {doc: '/storages/connecting-gofile',authTypes: ['client'],settings: gofileSettings,- setup: creds => ['token', `$(rclone obscure ${creds.token})`],+ setup: creds => ['token', creds.token],features: providerFeatures['gofile'],},gphotos: {@@ -661,12 +657,7 @@ export const providers: Record<string, ProviderConfig> = {doc: '/storages/connecting-google-photos',authTypes: ['client', 'password'],settings: gphotosSettings,- setup: creds => [- 'client_id',- creds.client_id,- 'client_secret',- `$(rclone obscure ${creds.client_secret})`,- ],+ setup: creds => ['client_id', creds.client_id, 'client_secret', creds.client_secret],features: providerFeatures['gphotos'],},internetarchive: {@@ -678,7 +669,7 @@ export const providers: Record<string, ProviderConfig> = {'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,],features: providerFeatures['internetarchive'],},@@ -687,7 +678,7 @@ export const providers: Record<string, ProviderConfig> = {doc: '/storages/connecting-linkbox',authTypes: ['client'],settings: linkboxSettings,- setup: creds => ['api_key', `$(rclone obscure ${creds.api_key})`],+ setup: creds => ['api_key', creds.api_key],features: providerFeatures['linkbox'],},oracle: {@@ -705,7 +696,7 @@ export const providers: Record<string, ProviderConfig> = {'access_key',creds.access_key,'secret_key',- `$(rclone obscure ${creds.secret_key})`,+ creds.secret_key,],features: providerFeatures['oracle'],},@@ -714,7 +705,7 @@ export const providers: Record<string, ProviderConfig> = {doc: '/storages/connecting-pikpak',authTypes: ['password'],settings: pikpakSettings,- setup: creds => ['username', creds.username, 'password', `$(rclone obscure ${creds.password})`],+ setup: creds => ['username', creds.username, 'password', creds.password],features: providerFeatures['pikpak'],},pixeldrain: {@@ -722,7 +713,7 @@ export const providers: Record<string, ProviderConfig> = {doc: '/storages/connecting-pixeldrain',authTypes: ['client'],settings: pixeldrainSettings,- setup: creds => ['api_key', `$(rclone obscure ${creds.api_key})`],+ setup: creds => ['api_key', creds.api_key],features: providerFeatures['pixeldrain'],},proton: {@@ -730,7 +721,7 @@ export const providers: Record<string, ProviderConfig> = {doc: '/storages/connecting-proton-drive',authTypes: ['password'],settings: protondriveSettings,- setup: creds => ['username', creds.username, 'password', `$(rclone obscure ${creds.password})`],+ setup: creds => ['username', creds.username, 'password', creds.password],features: providerFeatures['proton'],},quatrix: {@@ -738,14 +729,7 @@ export const providers: Record<string, ProviderConfig> = {doc: '/storages/connecting-quatrix',authTypes: ['client'],settings: quatrixSettings,- setup: creds => [- 'api_key',- `$(rclone obscure ${creds.api_key})`,- 'user',- creds.user,- 'host',- creds.host,- ],+ setup: creds => ['api_key', creds.api_key, 'user', creds.user, 'host', creds.host],features: providerFeatures['quatrix'],},sia: {@@ -753,7 +737,7 @@ export const providers: Record<string, ProviderConfig> = {doc: '/storages/connecting-sia',authTypes: ['client'],settings: siaSettings,- setup: creds => ['api_url', creds.api_url, 'password', `$(rclone obscure ${creds.password})`],+ setup: creds => ['api_url', creds.api_url, 'password', creds.password],features: providerFeatures['sia'],},ulozto: {@@ -761,7 +745,7 @@ export const providers: Record<string, ProviderConfig> = {doc: '/storages/connecting-uloz-to',authTypes: ['password'],settings: uloztoSettings,- setup: creds => ['username', creds.username, 'password', `$(rclone obscure ${creds.password})`],+ setup: creds => ['username', creds.username, 'password', creds.password],features: providerFeatures['ulozto'],},hdfs: {@@ -777,14 +761,7 @@ export const providers: Record<string, ProviderConfig> = {doc: '/storages/connecting-smb',authTypes: ['password'],settings: smbSettings,- setup: creds => [- 'host',- creds.host,- 'username',- creds.username,- 'password',- `$(rclone obscure ${creds.password})`,- ],+ setup: creds => ['host', creds.host, 'username', creds.username, 'password', creds.password],features: providerFeatures['smb'],},sftp: {@@ -792,14 +769,7 @@ export const providers: Record<string, ProviderConfig> = {doc: '/storages/connecting-sftp',authTypes: ['password'],settings: sftpSettings,- setup: creds => [- 'host',- creds.host,- 'user',- creds.user,- 'pass',- `$(rclone obscure ${creds.password})`,- ],+ setup: creds => ['host', creds.host, 'user', creds.user, 'pass', creds.pass],features: providerFeatures['sftp'],},ftp: {@@ -807,14 +777,7 @@ export const providers: Record<string, ProviderConfig> = {doc: '/storages/connecting-ftp',authTypes: ['password'],settings: ftpSettings,- setup: creds => [- 'host',- creds.host,- 'user',- creds.user,- 'pass',- `$(rclone obscure ${creds.password})`,- ],+ setup: creds => ['host', creds.host, 'user', creds.user, 'pass', creds.pass],features: providerFeatures['ftp'],},webdav: {@@ -822,14 +785,7 @@ export const providers: Record<string, ProviderConfig> = {doc: '/storages/connecting-webdav',authTypes: ['password'],settings: webdavSettings,- setup: creds => [- 'url',- creds.url,- 'user',- creds.user,- 'pass',- `$(rclone obscure ${creds.password})`,- ],+ setup: creds => ['url', creds.url, 'user', creds.user, 'pass', creds.pass],features: providerFeatures['webdav'],},http: {@@ -840,24 +796,68 @@ export const providers: Record<string, ProviderConfig> = {setup: creds => ['url', creds.url],features: providerFeatures['http'],},- // S3 Compatible API+ drime: {+ name: 'Drime',+ doc: '/storages/connecting-drime',+ authTypes: ['client'],+ settings: drimeSettings,+ setup: creds => ['access_token', creds.access_token],+ features: providerFeatures['drime'],+ },+ filelu: {+ name: 'FileLu',+ doc: '/storages/connecting-filelu',+ authTypes: ['client'],+ settings: fileluSettings,+ setup: creds => ['key', creds.key],+ features: providerFeatures['filelu'],+ },+ filen: {+ name: 'Filen',+ doc: '/storages/connecting-filen',+ authTypes: ['password'],+ settings: filenSettings,+ setup: creds => ['email', creds.email, 'password', creds.password, 'api_key', creds.api_key],+ features: providerFeatures['filen'],+ },+ internxt: {+ name: 'Internxt Drive',+ doc: '/storages/connecting-internxt',+ authTypes: ['password'],+ settings: internxtSettings,+ setup: creds => ['email', creds.email, 'pass', creds.pass],+ features: providerFeatures['internxt'],+ },+ shade: {+ name: 'Shade',+ doc: '/storages/connecting-shade',+ authTypes: ['client'],+ settings: shadeSettings,+ setup: creds => ['drive_id', creds.drive_id, 'api_key', creds.api_key],+ features: providerFeatures['shade'],+ },++ /* ===================== S3 Compatible Storages ========================== */r2: {name: 'Cloudflare R2',doc: '/storages/connecting-cloudflare-r2',authTypes: ['client'],settings: r2Settings,features: providerFeatures['s3'],+ s3Adapter: true,setup: creds => ['provider','Cloudflare','access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',- `${creds.endpoint}.r2.cloudflarestorage.com`,- 'acl',- 'private',+ `https://${creds.endpoint}.r2.cloudflarestorage.com`,+ 'region',+ 'auto',+ 'no_check_bucket',+ 'true',],},oss: {@@ -866,17 +866,16 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: ossSettings,features: providerFeatures['s3'],+ s3Adapter: true,setup: creds => ['provider','Alibaba','access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',creds.endpoint,- 'acl',- 'private','storage_class',creds.storage_class,],@@ -887,13 +886,14 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: cephSettings,features: providerFeatures['s3'],+ s3Adapter: true,setup: creds => ['provider','Ceph', //TODO: No region field'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',`${creds.endpoint}`,'acl',@@ -906,13 +906,14 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: dreamobjectsSettings,features: providerFeatures['s3'],+ s3Adapter: true,setup: creds => ['provider','DreamHost', //TODO: No region field'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',creds.endpoint,'acl',@@ -925,13 +926,14 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: spacesSettings,features: providerFeatures['s3'],+ s3Adapter: true,setup: creds => ['provider','DigitalOcean', //TODO: No region field'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',creds.endpoint,],@@ -942,13 +944,14 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: obsSettings,features: providerFeatures['s3'],+ s3Adapter: true,setup: creds => ['provider','HuaweiOBS','access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'region',creds.region,'endpoint',@@ -963,13 +966,14 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: ibmcosSettings,features: providerFeatures['s3'],+ s3Adapter: true,setup: creds => ['provider','IBMCOS','access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'region',creds.region,'endpoint',@@ -986,13 +990,14 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: idriveSettings,features: providerFeatures['s3'],+ s3Adapter: true,setup: creds => ['provider','IDrive','access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',creds.endpoint,],@@ -1003,13 +1008,14 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: ionosSettings,features: providerFeatures['s3'],+ s3Adapter: true,setup: creds => ['provider','IONOS', //TODO: No region field'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',creds.endpoint,],@@ -1020,13 +1026,14 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: minioSettings,features: providerFeatures['s3'],+ s3Adapter: true,setup: creds => ['provider','Minio','access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',creds.endpoint,'region',@@ -1039,13 +1046,14 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: outscaleSettings,features: providerFeatures['s3'],+ s3Adapter: true,setup: creds => ['provider','Outscale','access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',`oos.${creds.region}.outscale.com`,'region',@@ -1057,6 +1065,7 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: qiniuSettings,features: providerFeatures['s3'],+ s3Adapter: true,doc: '/storages/connecting-qiniu-kodo',setup: creds => ['provider',@@ -1064,7 +1073,7 @@ export const providers: Record<string, ProviderConfig> = {'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',`s3.${creds.region}.qiniucs.com `,'region',@@ -1082,6 +1091,7 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: rackcorpSettings,features: providerFeatures['s3'],+ s3Adapter: true,doc: '/storages/connecting-rackcorp',setup: creds => ['provider',@@ -1089,7 +1099,7 @@ export const providers: Record<string, ProviderConfig> = {'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',`${creds.region}.s3.rackcorp.com`,'region',@@ -1103,13 +1113,14 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: rcloneSettings,features: providerFeatures['s3'],+ s3Adapter: true,setup: creds => ['provider','Rclone','access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',creds.endpoint,'use_multipart_uploads',@@ -1122,6 +1133,7 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: scalewaySettings,features: providerFeatures['s3'],+ s3Adapter: true,doc: '/storages/connecting-scaleway',setup: creds => ['provider',@@ -1129,7 +1141,7 @@ export const providers: Record<string, ProviderConfig> = {'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',creds.endpoint,'region',@@ -1153,6 +1165,7 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: lyvecloudSettings,features: providerFeatures['s3'],+ s3Adapter: true,doc: '/storages/connecting-seagate-lyve-cloud',setup: creds => ['provider',@@ -1160,7 +1173,7 @@ export const providers: Record<string, ProviderConfig> = {'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',creds.endpoint,],@@ -1170,6 +1183,7 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: seaweedfsSettings,features: providerFeatures['s3'],+ s3Adapter: true,doc: '/storages/connecting-seaweedfs',setup: creds => ['provider',@@ -1177,7 +1191,7 @@ export const providers: Record<string, ProviderConfig> = {'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',creds.endpoint,],@@ -1187,6 +1201,7 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: selectelSettings,features: providerFeatures['s3'],+ s3Adapter: true,doc: '/storages/connecting-selectel',setup: creds => ['provider',@@ -1194,7 +1209,7 @@ export const providers: Record<string, ProviderConfig> = {'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint','s3.ru-1.storage.selcloud.ru','region',@@ -1208,6 +1223,7 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: wasabiSettings,features: providerFeatures['s3'],+ s3Adapter: true,doc: '/storages/connecting-wasabi',setup: creds => ['provider',@@ -1215,9 +1231,9 @@ export const providers: Record<string, ProviderConfig> = {'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',- `s3.${creds.region === 'us-east-1' ? '' : creds.region}.wasabisys.com`,+ `s3.${creds.region === 'us-east-1' ? '' : '.' + creds.region}wasabisys.com`,'region',creds.region,],@@ -1228,13 +1244,14 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: leviiaSettings,features: providerFeatures['s3'],+ s3Adapter: true,setup: creds => ['provider','Leviia','access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',creds.endpoint,'acl',@@ -1246,6 +1263,7 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: liaraSettings,features: providerFeatures['s3'],+ s3Adapter: true,doc: '/storages/connecting-liara',setup: creds => ['provider',@@ -1253,7 +1271,7 @@ export const providers: Record<string, ProviderConfig> = {'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint','storage.iran.liara.space',],@@ -1263,6 +1281,7 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: linodeSettings,features: providerFeatures['s3'],+ s3Adapter: true,doc: '/storages/connecting-linode',setup: creds => ['provider',@@ -1270,7 +1289,7 @@ export const providers: Record<string, ProviderConfig> = {'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',creds.endpoint,],@@ -1280,6 +1299,7 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: magaluSettings,features: providerFeatures['s3'],+ s3Adapter: true,doc: '/storages/connecting-magalu',setup: creds => ['provider',@@ -1287,7 +1307,7 @@ export const providers: Record<string, ProviderConfig> = {'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',creds.endpoint,],@@ -1297,6 +1317,7 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: arvanSettings,features: providerFeatures['s3'],+ s3Adapter: true,doc: '/storages/connecting-arvan-cloud',setup: creds => ['provider',@@ -1304,7 +1325,7 @@ export const providers: Record<string, ProviderConfig> = {'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'region',creds.region,'endpoint',@@ -1316,6 +1337,7 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: tencentSettings,features: providerFeatures['s3'],+ s3Adapter: true,doc: '/storages/connecting-tencent-cos',setup: creds => ['provider',@@ -1323,7 +1345,7 @@ export const providers: Record<string, ProviderConfig> = {'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint',creds.endpoint,],@@ -1333,6 +1355,7 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: petaboxSettings,features: providerFeatures['s3'],+ s3Adapter: true,doc: '/storages/connecting-petabox',setup: creds => ['provider',@@ -1340,11 +1363,11 @@ export const providers: Record<string, ProviderConfig> = {'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'endpoint','s3.petabox.io','region',- 'eu-east-1', //Avaialble in One location only: https://docs.petabox.io/http-api-compatible-with-amazon-s3/api-reference/bucket/getbucketlocation+ 'eu-east-1', //Available in One location only: https://docs.petabox.io/http-api-compatible-with-amazon-s3/api-reference/bucket/getbucketlocation],},synologyc2: {@@ -1352,6 +1375,7 @@ export const providers: Record<string, ProviderConfig> = {authTypes: ['client'],settings: synologySettings,features: providerFeatures['s3'],+ s3Adapter: true,doc: '/storages/connecting-synology',setup: creds => ['provider',@@ -1359,7 +1383,7 @@ export const providers: Record<string, ProviderConfig> = {'access_key_id',creds.access_key_id,'secret_access_key',- `$(rclone obscure ${creds.secret_access_key})`,+ creds.secret_access_key,'region',creds.region,'endpoint',@@ -1368,51 +1392,4 @@ export const providers: Record<string, ProviderConfig> = {'true',],},- drime: {- name: 'Drime',- doc: '/storages/connecting-drime',- authTypes: ['client'],- settings: drimeSettings,- setup: creds => ['access_token', creds.access_token],- features: providerFeatures['drime'],- },- filelu: {- name: 'FileLu',- doc: '/storages/connecting-filelu',- authTypes: ['client'],- settings: fileluSettings,- setup: creds => ['key', creds.key],- features: providerFeatures['filelu'],- },- filen: {- name: 'Filen',- doc: '/storages/connecting-filen',- authTypes: ['password'],- settings: filenSettings,- setup: creds => [- 'email',- creds.email,- 'password',- `$(rclone obscure ${creds.password})`,- 'api_key',- `$(rclone obscure ${creds.apiKey})`,- ],- features: providerFeatures['filen'],- },- internxt: {- name: 'Internxt Drive',- doc: '/storages/connecting-internxt',- authTypes: ['password'],- settings: internxtSettings,- setup: creds => ['email', creds.email, 'pass', `$(rclone obscure ${creds.password})`],- features: providerFeatures['internxt'],- },- shade: {- name: 'Shade',- doc: '/storages/connecting-shade',- authTypes: ['client'],- settings: shadeSettings,- setup: creds => ['drive_id', creds.drive_id, 'api_key', creds.api_key],- features: providerFeatures['shade'],- },};diff --git a/backend/src/utils/providers/_s3Options.ts b/backend/src/utils/providers/_s3Options.tsindex 653c0f6..8042f30 100644--- a/backend/src/utils/providers/_s3Options.ts+++ b/backend/src/utils/providers/_s3Options.ts@@ -1,4 +1,15 @@const s3Options = [+ {+ label: 'Environment Auth',+ value: 'env_auth',+ fieldType: 'bool',+ authFieldType: 'client',+ required: false,+ default: false,+ description:+ 'Get AWS credentials from runtime (environment variables or EC2/ECS meta data if no env vars).',+ command: '--s3-env-auth',+ },{label: 'Server-side Encryption',value: 'server_side_encryption',@@ -174,8 +185,7 @@ const s3Options = [fieldType: 'string',required: false,default: '',- description:- 'Path to the shared credentials file. Only used when Environment Auth is enabled.',+ description: 'Path to the shared credentials file. Only used when Environment Auth is enabled.',command: '--s3-shared-credentials-file',condition: [{ env_auth: true }],},@@ -226,8 +236,7 @@ const s3Options = [fieldType: 'bool',required: false,default: false,- description:- 'If enabled, use v2 authentication instead of the default v4 authentication.',+ description: 'If enabled, use v2 authentication instead of the default v4 authentication.',command: '--s3-v2-auth',},{@@ -509,8 +518,7 @@ const s3Options = [fieldType: 'bool',required: false,default: false,- description:- 'Enable this if you are using an AWS Directory Bucket.',+ description: 'Enable this if you are using an AWS Directory Bucket.',command: '--s3-directory-bucket',},{diff --git a/backend/src/utils/providers/arvan.ts b/backend/src/utils/providers/arvan.tsindex 42f55d6..f81b78a 100644--- a/backend/src/utils/providers/arvan.ts+++ b/backend/src/utils/providers/arvan.ts@@ -42,6 +42,16 @@ const arvanSettings = ['Your Arvan Cloud Endpoint. eg: s3.ir-thr-at1.arvanstorage.ir or BUCKETNAME.ir-thr-at1.arvanstorage.ir',command: '--s3-endpoint',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Arvan Cloud Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/ceph.ts b/backend/src/utils/providers/ceph.tsindex 494988d..1b0fda0 100644--- a/backend/src/utils/providers/ceph.ts+++ b/backend/src/utils/providers/ceph.ts@@ -31,6 +31,16 @@ const cephSettings = [description: 'API Endpoint to connect to. Example: https://ceph.endpoint.example.com',command: '--s3-endpoint',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Ceph Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/dreamobjects.ts b/backend/src/utils/providers/dreamobjects.tsindex 09b59b9..b96dddc 100644--- a/backend/src/utils/providers/dreamobjects.ts+++ b/backend/src/utils/providers/dreamobjects.ts@@ -39,6 +39,16 @@ const dreamobjectsSettings = ["Select a Region to connect to that region's API Endpoint. Find out which endpoint you should connect to here: https://help.dreamhost.com/hc/en-us/articles/32254965300372-DreamObjects-cluster-differences",command: '--s3-endpoint',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your DreamObjects Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/ftp.ts b/backend/src/utils/providers/ftp.tsindex fedb6fa..70f6243 100644--- a/backend/src/utils/providers/ftp.ts+++ b/backend/src/utils/providers/ftp.ts@@ -11,16 +11,6 @@ const ftpSettings: ProviderSetting[] = [default: '',description: 'FTP host to connect to. E.g. "ftp.example.com".',},- {- label: 'FTP Username',- command: '--ftp-user',- fieldType: 'string',- authFieldType: 'password',- required: false,- value: 'user',- default: '$user',- description: 'FTP username.',- },{label: 'FTP Port',command: '--ftp-port',@@ -31,6 +21,16 @@ const ftpSettings: ProviderSetting[] = [default: '21',description: 'FTP port number.',},+ {+ label: 'FTP Username',+ command: '--ftp-user',+ fieldType: 'string',+ authFieldType: 'password',+ required: false,+ value: 'user',+ default: '$user',+ description: 'FTP username.',+ },{label: 'FTP Password',command: '--ftp-pass',diff --git a/backend/src/utils/providers/ibmcos.ts b/backend/src/utils/providers/ibmcos.tsindex e821a0d..781bcec 100644--- a/backend/src/utils/providers/ibmcos.ts+++ b/backend/src/utils/providers/ibmcos.ts@@ -153,10 +153,19 @@ const ibmcosSettings = [],required: false,default: '',- description:- 'Access control permissions applied when creating buckets and storing objects.',+ description: 'Access control permissions applied when creating buckets and storing objects.',command: '--s3-acl',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your IBM Cloud Object Storage Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/idrive.ts b/backend/src/utils/providers/idrive.tsindex f0a09e7..5482e7b 100644--- a/backend/src/utils/providers/idrive.ts+++ b/backend/src/utils/providers/idrive.ts@@ -31,17 +31,16 @@ const idriveSettings = [description: 'Your E2 Endpoint. example: q9d9.la12.idrivee2-5.com',command: '--s3-endpoint',},- // {- // label: 'ACL',- // value: 'acl',- // fieldType: 'string',- // authFieldType: 'client',- // required: false,- // default: '',- // description:- // "Canned ACL used when creating buckets and storing or copying objects. This ACL is used for creating objects and if bucket_acl isn't set, for creating buckets too.",- // command: '--s3-acl',- // },+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your iDrive E2 Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/ionos.ts b/backend/src/utils/providers/ionos.tsindex 580f97e..2c4e182 100644--- a/backend/src/utils/providers/ionos.ts+++ b/backend/src/utils/providers/ionos.ts@@ -34,24 +34,23 @@ const ionosSettings = [{ label: 's3.eu-central-1.ionoscloud.com', value: 's3.eu-central-1.ionoscloud.com' },{ label: 's3.eu-central-2.ionoscloud.com', value: 's3.eu-central-2.ionoscloud.com' },{ label: 's3.eu-south-2.ionoscloud.com', value: 's3.eu-south-2.ionoscloud.com' },- { label: 'Insert Custon Endpoint', value: 'custom' },+ { label: 'Insert Custom Endpoint', value: 'custom' },],required: true,default: '',description: 'Your IONOS Cloud Endpoint to connect to.',command: '--s3-endpoint',},- // {- // label: 'ACL',- // value: 'acl',- // fieldType: 'string',- // authFieldType: 'client',- // required: false,- // default: '',- // description:- // "Canned ACL used when creating buckets and storing or copying objects. This ACL is used for creating objects and if bucket_acl isn't set, for creating buckets too.",- // command: '--s3-acl',- // },+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your IONOS Cloud Object Storage Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/leviia.ts b/backend/src/utils/providers/leviia.tsindex 77c88b2..2231e32 100644--- a/backend/src/utils/providers/leviia.ts+++ b/backend/src/utils/providers/leviia.ts@@ -32,6 +32,16 @@ const leviiaSettings = ['Your Leviia Endpoint. Can be found in your Leviia dashboard. example: s3.eu-west.leviia.com',command: '--s3-endpoint',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Leviia Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/liara.ts b/backend/src/utils/providers/liara.tsindex 02d615a..2d122f2 100644--- a/backend/src/utils/providers/liara.ts+++ b/backend/src/utils/providers/liara.ts@@ -21,6 +21,16 @@ const liaraSettings = [description: 'Secret Access Key (password).',command: '--s3-secret-access-key',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Liara Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/linode.ts b/backend/src/utils/providers/linode.tsindex a500cfa..b842fe5 100644--- a/backend/src/utils/providers/linode.ts+++ b/backend/src/utils/providers/linode.ts@@ -23,7 +23,7 @@ const linodeSettings = [},{label: 'Region',- value: 'ednpoint',+ value: 'endpoint',fieldType: 'select',authFieldType: 'client',allowCustom: true,@@ -54,14 +54,24 @@ const linodeSettings = [{ label: 'Stockholm, Sweden', value: 'se-sto-1.linodeobjects.com' },{ label: 'Melbourne, Australia', value: 'au-mel-1.linodeobjects.com' },{ label: 'São Paulo, Brazil', value: 'br-gru-1.linodeobjects.com' },- { label: 'Insert Custon Endpoint', value: 'custom' },+ { label: 'Insert Custom Endpoint', value: 'custom' },],required: true,default: '',description:- "Select a Region to connect to that region's API Ednpoint. Custom Endpoint example: au-mel-1.linodeobjects.com",+ "Select a Region to connect to that region's API Endpoint. Custom Endpoint example: au-mel-1.linodeobjects.com",command: '--s3-region',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Linode Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/lyvecloud.ts b/backend/src/utils/providers/lyvecloud.tsindex 639636e..78a4943 100644--- a/backend/src/utils/providers/lyvecloud.ts+++ b/backend/src/utils/providers/lyvecloud.ts@@ -38,14 +38,24 @@ const lyvecloudSettings = [},{ label: 'EU-West-1 (London)', value: 's3.eu-west-1.lyvecloud.seagate.com' },{ label: 'US-Central-2 (Texas)', value: 's3.us-central-2.lyvecloud.seagate.com' },- { label: 'Insert Custon Endpoint', value: 'custom' },+ { label: 'Insert Custom Endpoint', value: 'custom' },],required: true,default: '',description:- "Select a Region to connect to that region's API Ednpoint. Custom Endpoint example: s3.us-central-2.lyvecloud.seagate.com",+ "Select a Region to connect to that region's API Endpoint. Custom Endpoint example: s3.us-central-2.lyvecloud.seagate.com",command: '--s3-endpoint',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Lyve Cloud Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/magalu.ts b/backend/src/utils/providers/magalu.tsindex 1567536..5cdc557 100644--- a/backend/src/utils/providers/magalu.ts+++ b/backend/src/utils/providers/magalu.ts@@ -23,7 +23,7 @@ const magaluSettings = [},{label: 'Region',- value: 'ednpoint',+ value: 'endpoint',fieldType: 'select',authFieldType: 'client',allowCustom: true,@@ -31,14 +31,24 @@ const magaluSettings = [{ label: 'Select Region', value: '' },{ label: 'São Paulo, SP (BR), br-se1', value: 'br-se1.magaluobjects.com' },{ label: 'Fortaleza, CE (BR), br-ne1', value: 'br-ne1.magaluobjects.com' },- { label: 'Insert Custon Endpoint', value: 'custom' },+ { label: 'Insert Custom Endpoint', value: 'custom' },],required: true,default: '',description:- "Select a Region to connect to that region's API Ednpoint. Custom Endpoint example: br-ne1.magaluobjects.com",+ "Select a Region to connect to that region's API Endpoint. Custom Endpoint example: br-ne1.magaluobjects.com",command: '--s3-region',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Magalu Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/minio.ts b/backend/src/utils/providers/minio.tsindex a1d374c..46388e2 100644--- a/backend/src/utils/providers/minio.ts+++ b/backend/src/utils/providers/minio.ts@@ -28,7 +28,8 @@ const minioSettings = [authFieldType: 'client',required: true,default: '',- description: 'Your Minio Endpoint to connect to.',+ description:+ 'Your Minio Endpoint to connect to. example: http://192.168.1.106:9000 or https://play.min.io',command: '--s3-endpoint',},{@@ -41,17 +42,16 @@ const minioSettings = [description: 'Your Minio Region',command: '--s3-region',},- // {- // label: 'ACL',- // value: 'acl',- // fieldType: 'string',- // authFieldType: 'client',- // required: false,- // default: '',- // description:- // "Canned ACL used when creating buckets and storing or copying objects. This ACL is used for creating objects and if bucket_acl isn't set, for creating buckets too.",- // command: '--s3-acl',- // },+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Minio Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/obs.ts b/backend/src/utils/providers/obs.tsindex ceb5362..da9f098 100644--- a/backend/src/utils/providers/obs.ts+++ b/backend/src/utils/providers/obs.ts@@ -48,13 +48,23 @@ const obsSettings = [{ label: 'LA-Mexico City1', value: 'na-mexico-1' },{ label: 'LA-Sao Paulo1', value: 'sa-brazil-1' },{ label: 'TR-Istanbul', value: 'tr-west-1' },- { label: 'Insert Custon Endpoint', value: 'custom' },+ { label: 'Insert Custom Endpoint', value: 'custom' },],required: true,default: '',description: "Select a Region to connect to that region's API Endpoint.",command: '--s3-region',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your OBS Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/oss.ts b/backend/src/utils/providers/oss.tsindex 33afb1c..4498b7e 100644--- a/backend/src/utils/providers/oss.ts+++ b/backend/src/utils/providers/oss.ts@@ -59,10 +59,19 @@ const ossSettings = [],required: true,default: '',- description:- "Select a Region to connect to that region's API Endpoint.",+ description: "Select a Region to connect to that region's API Endpoint.",command: '--s3-region',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your OSS Bucket Name. eg: pluton-backup',+ command: '',+ },{label: 'Access Control List (ACL)',value: 'acl',@@ -79,8 +88,7 @@ const ossSettings = [],required: false,default: '',- description:- 'Access control permissions applied when creating buckets and storing objects.',+ description: 'Access control permissions applied when creating buckets and storing objects.',command: '--s3-acl',},{diff --git a/backend/src/utils/providers/outscale.ts b/backend/src/utils/providers/outscale.tsindex 0be9cec..b118d68 100644--- a/backend/src/utils/providers/outscale.ts+++ b/backend/src/utils/providers/outscale.ts@@ -34,24 +34,23 @@ const outscaleSettings = [{ label: 'California, USA (us-west-1)', value: 'us-west-1' },{ label: 'SecNumCloud, Paris, France (cloudgouv-eu-west-1)', value: 'cloudgouv-eu-west-1' },{ label: 'Tokyo, Japan (ap-northeast-1)', value: 'ap-northeast-1' },- { label: 'Insert Custon Region', value: 'custom' },+ { label: 'Insert Custom Region', value: 'custom' },],required: true,default: '',description: "Select a Region to connect to that region's API Endpoint.",command: '--s3-region',},- // {- // label: 'ACL',- // value: 'acl',- // fieldType: 'string',- // authFieldType: 'client',- // required: false,- // default: '',- // description:- // "Canned ACL used when creating buckets and storing or copying objects. This ACL is used for creating objects and if bucket_acl isn't set, for creating buckets too.",- // command: '--s3-acl',- // },+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Outscale Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/petabox.ts b/backend/src/utils/providers/petabox.tsindex dcbf4d3..2825b43 100644--- a/backend/src/utils/providers/petabox.ts+++ b/backend/src/utils/providers/petabox.ts@@ -21,6 +21,16 @@ const petaboxSettings = [description: 'Secret Access Key (password).',command: '--s3-secret-access-key',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Petabox Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/qiniu.ts b/backend/src/utils/providers/qiniu.tsindex 0c4df92..ba0df9e 100644--- a/backend/src/utils/providers/qiniu.ts+++ b/backend/src/utils/providers/qiniu.ts@@ -38,13 +38,23 @@ const qiniuSettings = [{ label: 'Asia Pacific-Singapore (formerly Southeast Asia)', value: 'ap-southeast-1' },{ label: 'Asia Pacific-Hanoi', value: 'ap-southeast-2' },{ label: 'Asia Pacific-Ho Chi Minh', value: 'ap-southeast-3' },- { label: 'Insert Custon Region', value: 'custom' },+ { label: 'Insert Custom Region', value: 'custom' },],required: true,default: '',description: "Select a Region to connect to that region's API Endpoint.",command: '--s3-region',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Qiniu Bucket Name. eg: pluton-backup',+ command: '',+ },{label: 'Storage Type/Class',value: 'storage_class',@@ -75,8 +85,7 @@ const qiniuSettings = [],required: false,default: '',- description:- 'Access control permissions applied when creating buckets and storing objects.',+ description: 'Access control permissions applied when creating buckets and storing objects.',command: '--s3-acl',},diff --git a/backend/src/utils/providers/r2.ts b/backend/src/utils/providers/r2.tsindex 03278fd..4965340 100644--- a/backend/src/utils/providers/r2.ts+++ b/backend/src/utils/providers/r2.ts@@ -31,17 +31,16 @@ const r2Settings = [description: 'Your R2 Account ID, which will be used to generate the Endpoint.',command: '--s3-endpoint',},- // {- // label: 'ACL',- // value: 'acl',- // fieldType: 'string',- // authFieldType: 'client',- // required: false,- // default: '',- // description:- // "Canned ACL used when creating buckets and storing or copying objects. This ACL is used for creating objects and if bucket_acl isn't set, for creating buckets too.",- // command: '--s3-acl',- // },+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your R2 Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/rackcorp.ts b/backend/src/utils/providers/rackcorp.tsindex b8f4116..7a82f2d 100644--- a/backend/src/utils/providers/rackcorp.ts+++ b/backend/src/utils/providers/rackcorp.ts@@ -53,6 +53,16 @@ const rackcorpSettings = [description: "Select a Region to connect to that region's API Endpoint.",command: '--s3-region',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Rackcorp Bucket Name. eg: pluton-backup',+ command: '',+ },{label: 'ACL',value: 'acl',@@ -64,8 +74,7 @@ const rackcorpSettings = [],required: false,default: '',- description:- 'Access control permissions applied when creating buckets and storing objects.',+ description: 'Access control permissions applied when creating buckets and storing objects.',command: '--s3-acl',},diff --git a/backend/src/utils/providers/rclone.ts b/backend/src/utils/providers/rclone.tsindex 6cba744..f86dc9c 100644--- a/backend/src/utils/providers/rclone.ts+++ b/backend/src/utils/providers/rclone.ts@@ -8,7 +8,7 @@ const rcloneSettings = [authFieldType: 'client',required: true,default: '',- description: 'R2 Access Key ID.',+ description: 'Rclone Serve S3 Access Key ID.',command: '--s3-access-key-id',},{@@ -18,7 +18,7 @@ const rcloneSettings = [authFieldType: 'client',required: true,default: '',- description: 'R2 Secret Access Key (password).',+ description: 'Rclone Serve S3 Secret Access Key (password).',command: '--s3-secret-access-key',},{@@ -28,9 +28,19 @@ const rcloneSettings = [authFieldType: 'client',required: true,default: '',- description: 'Your Rclone Server Endpoint.',+ description: 'Your Rclone Serve S3 Server Endpoint.',command: '--s3-endpoint',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Rclone Serve S3 Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/s3.ts b/backend/src/utils/providers/s3.tsindex 88369a7..7a10de0 100644--- a/backend/src/utils/providers/s3.ts+++ b/backend/src/utils/providers/s3.ts@@ -1,17 +1,6 @@import s3Options from './_s3Options';const s3Settings = [- {- label: 'Environment Auth',- value: 'env_auth',- fieldType: 'bool',- authFieldType: 'client',- required: false,- default: false,- description:- 'Get AWS credentials from runtime (environment variables or EC2/ECS meta data if no env vars).',- command: '--s3-env-auth',- },{label: 'Access Key ID',value: 'access_key_id',@@ -46,26 +35,36 @@ const s3Settings = [command: '--s3-region',},{- label: 'Endpoint',- value: 'endpoint',+ label: 'Location Constraint',+ value: 'location_constraint',fieldType: 'string',authFieldType: 'client',required: true,default: '',description:- 'Endpoint for S3 API. Leave blank if using AWS to use the default endpoint for the region.',- command: '--s3-endpoint',+ 'Location constraint - must be set to match the Region. Used when creating buckets only.',+ command: '--s3-location-constraint',},{- label: 'Location Constraint',- value: 'location_constraint',+ label: 'Bucket Name',+ value: 'bucket',fieldType: 'string',authFieldType: 'client',required: true,default: '',+ description: 'Your S3 Bucket Name. eg: pluton-backup',+ command: '',+ },+ {+ label: 'Endpoint',+ value: 'endpoint',+ fieldType: 'string',+ authFieldType: 'client',+ required: false,+ default: '',description:- 'Location constraint - must be set to match the Region. Used when creating buckets only.',- command: '--s3-location-constraint',+ 'Endpoint for S3 API. Leave blank if using AWS to use the default endpoint for the region.',+ command: '--s3-endpoint',},{label: 'ACL',diff --git a/backend/src/utils/providers/scaleway.ts b/backend/src/utils/providers/scaleway.tsindex b6d56a3..7f08a0f 100644--- a/backend/src/utils/providers/scaleway.ts+++ b/backend/src/utils/providers/scaleway.ts@@ -32,13 +32,23 @@ const scalewaySettings = [{ label: 'Amsterdam, The Netherlands', value: 'nl-ams' },{ label: 'Paris, France', value: 'fr-par' },{ label: 'Warsaw, Poland', value: 'pl-waw' },- { label: 'Insert Custon Region', value: 'custom' },+ { label: 'Insert Custom Region', value: 'custom' },],required: true,default: '',- description: "Select a Region to connect to that region's API Ednpoint.",+ description: "Select a Region to connect to that region's API Endpoint.",command: '--s3-region',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Scaleway Bucket Name. eg: pluton-backup',+ command: '',+ },{label: 'Endpoint',value: 'endpoint',@@ -50,12 +60,12 @@ const scalewaySettings = [{ label: 'Amsterdam, The Netherlands', value: 's3.nl-ams.scw.cloud' },{ label: 'Paris, France', value: 's3.fr-par.scw.cloud' },{ label: 'Warsaw, Poland', value: 's3.pl-waw.scw.cloud' },- { label: 'Insert Custon Endpoint', value: 'custom' },+ { label: 'Insert Custom Endpoint', value: 'custom' },],required: true,default: '',description:- "Select a Region to connect to that region's API Ednpoint. Custom Endpoint example: my-bucket.s3.nl-ams.scw.cloud",+ "Select a Region to connect to that region's API Endpoint. Custom Endpoint example: my-bucket.s3.nl-ams.scw.cloud",command: '--s3-endpoint',},{diff --git a/backend/src/utils/providers/seaweedfs.ts b/backend/src/utils/providers/seaweedfs.tsindex 951d6f3..8742b02 100644--- a/backend/src/utils/providers/seaweedfs.ts+++ b/backend/src/utils/providers/seaweedfs.ts@@ -31,6 +31,16 @@ const seaweedfsSettings = [description: 'Your SeaweedFS Server Endpoint.',command: '--s3-endpoint',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your SeaweedFS Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/selectel.ts b/backend/src/utils/providers/selectel.tsindex d500bce..f053b2e 100644--- a/backend/src/utils/providers/selectel.ts+++ b/backend/src/utils/providers/selectel.ts@@ -21,6 +21,16 @@ const selectelSettings = [description: 'Secret Access Key (password).',command: '--s3-secret-access-key',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Selectel Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/sftp.ts b/backend/src/utils/providers/sftp.tsindex 787bf74..a5daeaf 100644--- a/backend/src/utils/providers/sftp.ts+++ b/backend/src/utils/providers/sftp.ts@@ -9,16 +9,6 @@ const sftpSettings = [default: '',description: 'SSH host to connect to. E.g. "example.com".',},- {- label: 'SSH Username',- command: '--sftp-user',- fieldType: 'string',- authFieldType: 'password',- required: false,- value: 'user',- default: '$user',- description: 'SSH username.',- },{label: 'SSH Port',command: '--sftp-port',@@ -29,6 +19,16 @@ const sftpSettings = [default: '22',description: 'SSH port number.',},+ {+ label: 'SSH Username',+ command: '--sftp-user',+ fieldType: 'string',+ authFieldType: 'password',+ required: false,+ value: 'user',+ default: '$user',+ description: 'SSH username.',+ },{label: 'SSH Password',command: '--sftp-pass',diff --git a/backend/src/utils/providers/spaces.ts b/backend/src/utils/providers/spaces.tsindex 6771dbc..6f25704 100644--- a/backend/src/utils/providers/spaces.ts+++ b/backend/src/utils/providers/spaces.ts@@ -49,6 +49,16 @@ const spacesSettings = ["Select a Region to connect to that region's API Endpoint. Custom Endpoint Example: xxxx.digitaloceanspaces.com",command: '--s3-endpoint',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Spaces Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/synologyc2.ts b/backend/src/utils/providers/synologyc2.tsindex b44ec55..839714b 100644--- a/backend/src/utils/providers/synologyc2.ts+++ b/backend/src/utils/providers/synologyc2.ts@@ -37,13 +37,23 @@ const synologySettings = [{ label: 'US Endpoint 2 (us-002)', value: 'us-002' },{ label: 'US Endpoint 3 (us-003)', value: 'us-003' },{ label: 'TW Endpoint 1 (tw-001)', value: 'tw-001' },- { label: 'Insert Custon Region', value: 'custom' },+ { label: 'Insert Custom Region', value: 'custom' },],required: true,default: '',- description: "Select a Region to connect to that region's API Ednpoint.",+ description: "Select a Region to connect to that region's API Endpoint.",command: '--s3-region',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Synology C2 Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/tencent.ts b/backend/src/utils/providers/tencent.tsindex 172a04f..6a7a1c2 100644--- a/backend/src/utils/providers/tencent.ts+++ b/backend/src/utils/providers/tencent.ts@@ -32,6 +32,16 @@ const tencentSettings = ['Your Tencent COS Endpoint. Example: examplebucket-1250000000.cos.ap-guangzhou.myqcloud.com',command: '--s3-endpoint',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Tencent COS Bucket Name. eg: pluton-backup',+ command: '',+ },...s3Options,];diff --git a/backend/src/utils/providers/wasabi.ts b/backend/src/utils/providers/wasabi.tsindex d2b9c19..a6a9dc3 100644--- a/backend/src/utils/providers/wasabi.ts+++ b/backend/src/utils/providers/wasabi.ts@@ -44,13 +44,23 @@ const wasabiSettings = [{ label: 'AP Northeast 2 (Osaka)', value: 'ap-northeast-2' },{ label: 'AP Southeast 1 (Singapore)', value: 'ap-southeast-1' },{ label: 'AP Southeast 2 (Sydney)', value: 'ap-southeast-2' },- { label: 'Insert Custon Region', value: 'custom' },+ { label: 'Insert Custom Region', value: 'custom' },],required: true,default: '',- description: "Select a Region to connect to that region's API Ednpoint.",+ description: "Select a Region to connect to that region's API Endpoint.",command: '--s3-region',},+ {+ label: 'Bucket Name',+ value: 'bucket',+ fieldType: 'string',+ authFieldType: 'client',+ required: true,+ default: '',+ description: 'Your Wasabi Bucket Name. eg: pluton-backup',+ command: '',+ },{label: 'ACL',value: 'acl',diff --git a/frontend/src/components/common/form/StoragePicker/StoragePicker.module.scss b/frontend/src/components/common/form/StoragePicker/StoragePicker.module.scssindex ad5f74a..f3f2eff 100644--- a/frontend/src/components/common/form/StoragePicker/StoragePicker.module.scss+++ b/frontend/src/components/common/form/StoragePicker/StoragePicker.module.scss@@ -24,6 +24,9 @@width: calc(65% - 10px);margin-left: 10px;position: relative;+ display: flex;+ flex-direction: row;+ align-items: center;.fileManagerBtn {position: absolute;right: 1px;@@ -35,9 +38,33 @@color: var(--primary-color);}}+ .defaultPath {+ display: block;+ min-width: fit-content;+ background: var(--background-color);+ color: var(--content-text-color-light);+ cursor: default;+ padding: 8px;+ padding-top: 9px;+ border-radius: 6px 0 0 6px;+ border: 1px solid var(--field-line-color);+ border-right: 0;+ box-sizing: border-box;+ white-space: nowrap;+ overflow: hidden;+ text-overflow: ellipsis;+ }+ div[class*='_inputField_'] {+ display: inline-block;+ }div[class*='_inputField_'] input {padding: 10px 12px;}+ &.withBucket {+ div[class*='_inputField_'] input {+ border-radius: 0 6px 6px 0;+ }+ }}& > div {border-radius: 4px;diff --git a/frontend/src/components/common/form/StoragePicker/StoragePicker.tsx b/frontend/src/components/common/form/StoragePicker/StoragePicker.tsxindex f2f6c12..e220c26 100644--- a/frontend/src/components/common/form/StoragePicker/StoragePicker.tsx+++ b/frontend/src/components/common/form/StoragePicker/StoragePicker.tsx@@ -7,7 +7,7 @@ import FolderPicker from '../../FolderPicker/FolderPicker';import Icon from '../../Icon/Icon';import AddStorage from '../../../Storage/AddStorage/AddStorage';-type storageItem = { name: string; id: string; type: string };+type storageItem = { name: string; id: string; type: string; defaultPath?: string };interface StoragePickerProps {storagePath?: string;@@ -23,11 +23,16 @@ const StoragePicker = ({ onUpdate, storagePath = '', storageId, disabled = falseconst [showAddStorageModal, setShowAddStorageModal] = useState(false);const [path, setPath] = useState(() => storagePath);const isLocalStorage = selectedStorage?.type === 'local';+ const hasBucketName = selectedStorage?.defaultPath && selectedStorage?.defaultPath !== '/';+ const fullPath = hasBucketName ? `${selectedStorage.defaultPath}${path ? `/${path}` : ''}` : path;const { data: allStorageData } = useGetStorages();const allUserStorages = (allStorageData?.result as storageItem[]) || [];const allStorages = [...allUserStorages];+ console.log('allStorages :', allStorages);+ console.log('selectedStorage :', selectedStorage);+const storageOptions = useMemo(() => {const storageOpts = allStorages.map(({ name, id, type }) => ({label: name,@@ -52,12 +57,16 @@ const StoragePicker = ({ onUpdate, storagePath = '', storageId, disabled = falseif (allStorages.length > 0 && storageId) {const currentStorage = allStorages.find((s) => s.id === storageId);setSelectedStorage(currentStorage);+ if (currentStorage?.defaultPath && currentStorage.defaultPath !== '/') {+ const prefix = currentStorage.defaultPath + '/';+ setPath((prev) => (prev.startsWith(prefix) ? prev.slice(prefix.length) : prev));+ }}}, [allStorageData]);useEffect(() => {if (selectedStorage) {- onUpdate({ storage: selectedStorage, path });+ onUpdate({ storage: selectedStorage, path: fullPath });}}, [selectedStorage, path]);@@ -80,12 +89,17 @@ const StoragePicker = ({ onUpdate, storagePath = '', storageId, disabled = falsedisabled={disabled}/></div>- <div className={classes.path}>+ <div className={`${classes.path} ${hasBucketName ? classes.withBucket : ''}`}>+ {hasBucketName && (+ <span className={classes.defaultPath} title={`Bucket: ${selectedStorage.defaultPath}`}>+ {selectedStorage.defaultPath + '/'}+ </span>+ )}<Inputdisabled={disabled}fieldValue={path}- onUpdate={(val) => setPath(val)}- placeholder={isLocalStorage ? 'Select a folder' : `folder-or-bucket/subfolder`}+ onUpdate={(val) => setPath(val.startsWith('/') ? val.slice(1) : val)} //if the val starts with a slash remove it+ placeholder={isLocalStorage ? 'Select a folder' : hasBucketName ? 'subfolder' : `folder-or-bucket/subfolder`}full={true}required={!disabled && isLocalStorage}error={(!disabled && isLocalStorage && !path ? 'Required' : '') as string}