-
+
+
@@ -103,23 +103,25 @@
white-space: nowrap;
}
- .go-back-button {
- text-align: left;
- flex: 1;
+ .go-back-button {
+ text-align: left;
+ flex: 1;
+ opacity: 0;
+ visibility: hidden;
+ pointer-events: none;
- .icon-back {
- vertical-align: middle;
- cursor: pointer;
- opacity: 0;
- visibility: hidden;
- margin-top: -2px;
+ .icon-back {
+ vertical-align: middle;
+ cursor: pointer;
+ margin-top: -2px;
+ }
- &.is-visible {
- opacity: 1;
- visibility: visible;
- }
- }
- }
+ &.is-visible {
+ pointer-events: initial;
+ visibility: visible;
+ opacity: 1;
+ }
+ }
.directory-name {
line-height: 1;
diff --git a/resources/js/helpers.js b/resources/js/helpers.js
index 5ec685af..02d9758f 100644
--- a/resources/js/helpers.js
+++ b/resources/js/helpers.js
@@ -215,13 +215,13 @@ const Helpers = {
isNotGeneralError = true,
- striped_name = item.file.name
- .replace(/[^A-Za-z 0-9 \.,\?""!@#\$%\^&\*\(\)-_=\+;:<>\/\\\|\}\{\[\]`~]*/g, ''),
+ striped_spaces = item.file.name.replace(/\s/g, '-'),
+ striped_to_safe_characters = striped_spaces.match(/^[A-Za-z0-9._~()'!*:@,;+?-\W]*$/g),
- filename = Array(16)
+ source_name = Array(16)
.fill(0)
.map(x => Math.random().toString(36).charAt(2))
- .join('') + '-' + striped_name + '.part'
+ .join('') + '-' + striped_to_safe_characters + '.part'
do {
let isLast = chunks.length === 1,
@@ -229,7 +229,8 @@ const Helpers = {
attempts = 0
// Set form data
- formData.set('file', chunk, filename);
+ formData.set('filename', item.file.name);
+ formData.set('file', chunk, source_name);
formData.set('folder_id', item.folder_id)
formData.set('is_last', isLast);
diff --git a/resources/js/i18n/index.js b/resources/js/i18n/index.js
index 8144c645..516859a2 100644
--- a/resources/js/i18n/index.js
+++ b/resources/js/i18n/index.js
@@ -4,7 +4,7 @@ import VueI18n from 'vue-i18n';
Vue.use(VueI18n);
const i18n = new VueI18n({
- locale: config.language,
+ locale: config.locale,
silentTranslationWarn: true,
});
diff --git a/resources/js/views/SetupWizard/EnvironmentSetup.vue b/resources/js/views/SetupWizard/EnvironmentSetup.vue
index 2a8f05d9..f0d0319d 100644
--- a/resources/js/views/SetupWizard/EnvironmentSetup.vue
+++ b/resources/js/views/SetupWizard/EnvironmentSetup.vue
@@ -172,6 +172,9 @@ export default {
if (this.storage.driver === 'backblaze')
this.storage.endpoint = 'https://s3.' + val + '.backblazeb2.com'
+
+ if (this.storage.driver === 'oss')
+ this.storage.endpoint = 'https://' + val + '.aliyuncs.com'
},
},
computed: {
@@ -189,12 +192,65 @@ export default {
case 'backblaze':
return this.backblazeRegions
break
+ case 'oss':
+ return this.ossRegions
+ break
}
},
},
data() {
return {
isLoading: false,
+ ossRegions: [
+ {
+ label: 'China (Hangzhou)',
+ value: 'oss-cn-hangzhou',
+ },
+ {
+ label: 'China (Shanghai)',
+ value: 'oss-cn-shanghai',
+ },
+ {
+ label: 'China (Qingdao)',
+ value: 'oss-cn-qingdao',
+ },
+ {
+ label: 'China (Beijing)',
+ value: 'oss-cn-beijing',
+ },
+ {
+ label: 'China (Zhangjiakou)',
+ value: 'oss-cn-zhangjiakou',
+ },
+ {
+ label: 'China (Hohhot)',
+ value: 'oss-cn-huhehaote',
+ },
+ {
+ label: 'China (Ulanqab)',
+ value: 'oss-cn-wulanchabu',
+ },
+ {
+ label: 'China (Shenzhen)',
+ value: 'oss-cn-shenzhen',
+ },
+ {
+ label: 'China (Heyuan)',
+ value: 'oss-cn-heyuan',
+ },
+ {
+ label: 'China (Guangzhou)',
+ value: 'oss-cn-guangzhou',
+ },
+ {
+ label: 'China (Chengdu)',
+ value: 'oss-cn-chengdu',
+ },
+ {
+ label: 'China (Hong Kong)',
+ value: 'oss-cn-hongkong',
+ },
+ ],
wasabiRegions: [
{
label: 'US East 1 (N. Virginia)',
@@ -352,6 +408,10 @@ export default {
label: 'Backblaze B2 Cloud Storage',
value: 'backblaze',
},
+ {
+ label: 'Alibaba Cloud OSS',
+ value: 'oss',
+ },
],
encryptionList: [
{
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index a6913655..907f3e99 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -40,8 +40,7 @@
let config = {
host: '{{ url('/') }}',
api: '{{ url('/api') }}',
- locale: '{{ \Illuminate\Support\Facades\App::getLocale() }}',
- language: '{{ $settings->language ?? 'en' }}',
+ locale: '{{ app()->getLocale() }}',
app_color: '{{ $settings->app_color ?? '#00BC7E' }}',
app_logo: '{{ $settings->app_logo ?? null }}',
diff --git a/tests/Feature/Admin/AdminTest.php b/tests/Feature/Admin/AdminTest.php
index 87fff466..318b9e2e 100644
--- a/tests/Feature/Admin/AdminTest.php
+++ b/tests/Feature/Admin/AdminTest.php
@@ -361,6 +361,7 @@ class AdminTest extends TestCase
->create("fake-file-$index.pdf", 1200, 'application/pdf');
$this->postJson('/api/upload', [
+ 'filename' => $file->name,
'file' => $file,
'folder_id' => null,
'is_last' => true,
diff --git a/tests/Feature/Admin/LanguageEditorTest.php b/tests/Feature/Admin/LanguageEditorTest.php
index a40c1e64..33d690d0 100644
--- a/tests/Feature/Admin/LanguageEditorTest.php
+++ b/tests/Feature/Admin/LanguageEditorTest.php
@@ -248,18 +248,18 @@ class LanguageEditorTest extends TestCase
]);
$this->assertEquals(
- __t('actions.close'),
- 'Close'
+ 'Close',
+ __t('actions.close')
);
$this->assertEquals(
- __t('shared_link_email_subject', ['user' => 'John']),
- '🙋 John share some files with you. Look at it!'
+ '🙋 John share some files with you. Look at it!',
+ __t('shared_link_email_subject', ['user' => 'John'])
);
$this->assertEquals(
- __t('test', ['name' => 'John', 'surname' => 'Doe']),
- 'Hi, my name is John Doe'
+ 'Hi, my name is John Doe',
+ __t('test', ['name' => 'John', 'surname' => 'Doe'])
);
}
diff --git a/tests/Feature/FileManager/FileTest.php b/tests/Feature/FileManager/FileTest.php
index f45c32a3..e97fd7c0 100644
--- a/tests/Feature/FileManager/FileTest.php
+++ b/tests/Feature/FileManager/FileTest.php
@@ -55,6 +55,7 @@ class FileTest extends TestCase
Sanctum::actingAs($user);
$this->postJson('/api/upload', [
+ 'filename' => $file->name,
'file' => $file,
'folder_id' => null,
'is_last' => true,
@@ -97,6 +98,7 @@ class FileTest extends TestCase
Sanctum::actingAs($user);
$this->postJson('/api/upload', [
+ 'filename' => $file->name,
'file' => $file,
'folder_id' => null,
'is_last' => true,
@@ -266,6 +268,7 @@ class FileTest extends TestCase
->create("fake-file-$index.pdf", 1200, 'application/pdf');
$this->postJson('/api/upload', [
+ 'filename' => $file->name,
'file' => $file,
'folder_id' => null,
'is_last' => true,
@@ -324,6 +327,7 @@ class FileTest extends TestCase
->create("fake-file-$index.pdf", 1200, 'application/pdf');
$this->postJson('/api/upload', [
+ 'filename' => $file->name,
'file' => $file,
'folder_id' => null,
'is_last' => true,
diff --git a/tests/Feature/FileManager/FolderTest.php b/tests/Feature/FileManager/FolderTest.php
index 40179058..6d3b0f75 100644
--- a/tests/Feature/FileManager/FolderTest.php
+++ b/tests/Feature/FileManager/FolderTest.php
@@ -415,6 +415,7 @@ class FolderTest extends TestCase
->create("fake-file-$index.pdf", 1200, 'application/pdf');
$this->postJson('/api/upload', [
+ 'filename' => $file->name,
'file' => $file,
'folder_id' => $folder->id,
'is_last' => true,
@@ -483,6 +484,7 @@ class FolderTest extends TestCase
->create("fake-file-$index.pdf", 1200, 'application/pdf');
$this->postJson('/api/upload', [
+ 'filename' => $file->name,
'file' => $file,
'folder_id' => $folder->id,
'is_last' => true,
diff --git a/tests/Feature/FileManager/TrashTest.php b/tests/Feature/FileManager/TrashTest.php
index 08d51a3d..4de052bf 100644
--- a/tests/Feature/FileManager/TrashTest.php
+++ b/tests/Feature/FileManager/TrashTest.php
@@ -89,6 +89,7 @@ class TrashTest extends TestCase
->image('fake-image.jpg');
$this->postJson('/api/upload', [
+ 'filename' => $image->name,
'file' => $image,
'folder_id' => null,
'is_last' => true,
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 2932d4a6..316fdb0c 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -7,4 +7,9 @@ use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
abstract class TestCase extends BaseTestCase
{
use CreatesApplication;
+
+ public function setUp(): void
+ {
+ parent::setUp();
+ }
}