now even user chooses s3 domain in public cloud, saveContent still uses kodo api & now it gives tips for editing with cdn domain

Author: bachue

app/components/services/domains.js

@@ -4,15 +4,15 @@ angular.module("web").factory("Domains", [
   "$translate",
   "AuthInfo",
   "QiniuClient",
-  function(
+  function (
     $q,
     $timeout,
     $translate,
     AuthInfo,
     QiniuClient,
-    ) {
+  ) {
     const T = $translate.instant,
-          { KODO_MODE, S3_MODE } = require('kodo-s3-adapter-sdk');
+      { KODO_MODE, S3_MODE } = require('kodo-s3-adapter-sdk');
 
     class S3Domain {
       constructor(region, bucket) {
@@ -48,8 +48,8 @@ angular.module("web").factory("Domains", [
       }
 
       saveContent(key, content, opt) {
-        const newOpt = Object.assign({}, opt, { preferS3Adapter: true });
-        return QiniuClient.saveContent(this.region, this.bucket, key, content, this.toQiniuDomain(), newOpt);
+        const getOpt = Object.assign({}, opt, { preferS3Adapter: true });
+        return QiniuClient.saveContent(this.region, this.bucket, key, content, this.toQiniuDomain(), getOpt, opt);
       }
 
       deadlineRequired() {
@@ -96,8 +96,8 @@ angular.module("web").factory("Domains", [
       }
 
       saveContent(key, content, opt) {
-        const newOpt = Object.assign({}, opt, { preferKodoAdapter: true });
-        return QiniuClient.saveContent(this.region, this.bucket, key, content, this.toQiniuDomain(), newOpt);
+        const getOpt = Object.assign({}, opt, { preferKodoAdapter: true });
+        return QiniuClient.saveContent(this.region, this.bucket, key, content, this.toQiniuDomain(), getOpt, opt);
       }
 
       deadlineRequired() {

app/components/services/qiniu-client.js

@@ -8,14 +8,14 @@ angular.module('web').factory('QiniuClient', [
   'Config',
   'AuthInfo',
   'settingsSvs',
-  function($q, $rootScope, $translate, $timeout, $state, Toast, Config, AuthInfo, settingsSvs) {
+  function ($q, $rootScope, $translate, $timeout, $state, Toast, Config, AuthInfo, settingsSvs) {
     const { Qiniu, Region, KODO_MODE, S3_MODE, RegionService } = require('kodo-s3-adapter-sdk'),
-          path = require('path'),
-          { Semaphore } = require('semaphore-promise'),
-          T = $translate.instant,
-          kodoAdaptersCache = {},
-          s3AdaptersCache = {},
-          regionServicesCache = {};
+      path = require('path'),
+      { Semaphore } = require('semaphore-promise'),
+      T = $translate.instant,
+      kodoAdaptersCache = {},
+      s3AdaptersCache = {},
+      regionServicesCache = {};
 
     return {
       isQueryRegionAPIAvaiable: isQueryRegionAPIAvaiable,
@@ -210,7 +210,7 @@ angular.module('web').factory('QiniuClient', [
 
     function headFile(region, bucket, key, opt) {
       let promise = getDefaultClient(opt)
-                      .getObjectInfo(region, { bucket: bucket, key: key });
+        .getObjectInfo(region, { bucket: bucket, key: key });
       if (!opt.ignoreError) {
         promise = promise.catch((err) => {
           handleError(err);
@@ -232,12 +232,11 @@ angular.module('web').factory('QiniuClient', [
       });
     }
 
-    function saveContent(region, bucket, key, content, domain, opt) {
+    function saveContent(region, bucket, key, content, domain, getOpt, putOpt) {
       return new Promise((resolve, reject) => {
-        const client = getDefaultClient(opt);
-        client.getObjectHeader(region, { bucket: bucket, key: key }, domain).then((headers) => {
+        getDefaultClient(getOpt).getObjectHeader(region, { bucket: bucket, key: key }, domain).then((headers) => {
           const basename = path.basename(key);
-          client.putObject(region, { bucket: bucket, key: key }, Buffer.from(content), basename,
+          getDefaultClient(putOpt).putObject(region, { bucket: bucket, key: key }, Buffer.from(content), basename,
             { metadata: headers.metadata },
           ).then(() => { resolve(); }).catch((err) => {
             handleError(err);
@@ -592,7 +591,7 @@ angular.module('web').factory('QiniuClient', [
     function clientBackendMode(opt) {
       const adapterOption = getAdapterOption(opt);
       const usePublicCloud = AuthInfo.usePublicCloud();
-        if (adapterOption.regions && adapterOption.regions.length > 0 && !adapterOption.preferKodoAdapter || adapterOption.preferS3Adapter || !usePublicCloud) {
+      if (adapterOption.regions && adapterOption.regions.length > 0 && !adapterOption.preferKodoAdapter || adapterOption.preferS3Adapter || !usePublicCloud) {
         return S3_MODE;
       } else {
         return KODO_MODE;
@@ -613,11 +612,11 @@ angular.module('web').factory('QiniuClient', [
     }
 
     function getDefaultClient(opt) {
-      switch(clientBackendMode(opt)) {
-      case S3_MODE:
-        return getS3Client(opt);
-      case KODO_MODE:
-        return getKodoClient(opt);
+      switch (clientBackendMode(opt)) {
+        case S3_MODE:
+          return getS3Client(opt);
+        case KODO_MODE:
+          return getKodoClient(opt);
       }
     }
 
@@ -650,18 +649,18 @@ angular.module('web').factory('QiniuClient', [
     }
 
     function clearAllCache() {
-        Object.keys(s3AdaptersCache).forEach((key) => {
-          s3AdaptersCache[key].clearCache();
-          delete s3AdaptersCache[key];
-        });
-        Object.keys(kodoAdaptersCache).forEach((key) => {
-          kodoAdaptersCache[key].clearCache();
-          delete kodoAdaptersCache[key];
-        });
-        Object.keys(regionServicesCache).forEach((key) => {
-          regionServicesCache[key].clearCache();
-          delete regionServicesCache[key];
-        });
+      Object.keys(s3AdaptersCache).forEach((key) => {
+        s3AdaptersCache[key].clearCache();
+        delete s3AdaptersCache[key];
+      });
+      Object.keys(kodoAdaptersCache).forEach((key) => {
+        kodoAdaptersCache[key].clearCache();
+        delete kodoAdaptersCache[key];
+      });
+      Object.keys(regionServicesCache).forEach((key) => {
+        regionServicesCache[key].clearCache();
+        delete regionServicesCache[key];
+      });
     }
 
     function debugRequest(mode) {
@@ -686,21 +685,21 @@ angular.module('web').factory('QiniuClient', [
         }
 
         let requestUrl = undefined, requestMethod = undefined, requestHeaders = undefined,
-            responseStatusCode = undefined, responseHeaders = undefined, responseInterval = undefined, responseData = undefined, responseError = undefined;
+          responseStatusCode = undefined, responseHeaders = undefined, responseInterval = undefined, responseData = undefined, responseError = undefined;
         if (response) {
-            responseStatusCode = response.statusCode;
-            responseHeaders = response.headers;
-            responseInterval = response.interval;
-            responseData = response.data;
-            responseError = response.error;
+          responseStatusCode = response.statusCode;
+          responseHeaders = response.headers;
+          responseInterval = response.interval;
+          responseData = response.data;
+          responseError = response.error;
           if (response.request) {
             requestUrl = response.request.url;
             requestMethod = response.request.method;
             requestHeaders = response.request.headers;
           }
         }
         console.info('<<', mode, 'REQ_URL:', requestUrl, 'REQ_METHOD:', requestMethod, 'REQ_HEADERS: ', requestHeaders,
-            'RESP_STATUS:', responseStatusCode, 'RESP_HEADERS:', responseHeaders, 'RESP_INTERVAL:', responseInterval, 'ms RESP_DATA:', responseData, 'RESP_ERROR:', responseError);
+          'RESP_STATUS:', responseStatusCode, 'RESP_HEADERS:', responseHeaders, 'RESP_INTERVAL:', responseInterval, 'ms RESP_DATA:', responseData, 'RESP_ERROR:', responseError);
       };
     }
 

app/main/files/modals/preview/code-modal.html

@@ -49,9 +49,13 @@ <h4 class="modal-title">
       {{'close'|translate}}
     </button>
 
-  <button ng-if="previewBarVisible && currentUser.privilege!='readOnly'" type="button" class="pull-right btn btn-primary btn-sm" ng-click="saveContent()">
+  <button ng-if="previewBarVisible && currentUser.privilege!='readOnly' && objectInfo.size <= MAX_SIZE" type="button" class="pull-right btn btn-primary btn-sm" ng-click="saveContent()">
         <i class="fa fa-save"></i>
         <!-- 保存 -->
         {{'save'|translate}}
       </button>
+
+  <div ng-if="previewBarVisible && currentUser.privilege!='readOnly' && objectInfo.size <= MAX_SIZE && !domain.default()" class="text-right pull-right small" style="display: inline-block; position: relative; height: 30px; width: 500px;">
+    <p style="display: inline-block; margin: 0; width: 500px; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);">{{'preview.should_not_use_cdn_domain_to_edit'|translate}}</p>
+  </div>
 </div>

app/main/files/modals/preview/code-modal.js

@@ -10,6 +10,7 @@ angular.module('web')
         fileType: fileType,
         qiniuClientOpt: qiniuClientOpt,
         afterCheckSuccess: afterCheckSuccess,
+        domain: selectedDomain.domain,
 
         previewBarVisible: false,
         showFn: showFn,

node/i18n/en-US.js

@@ -331,6 +331,7 @@ module.exports = {
   "cannot.preview": "Can not preview",
   "cannot.preview.this.file": "Can not preview this file.",
   "tryto.open.as.textfile": "Try to open as a text file",
+  "preview.should_not_use_cdn_domain_to_edit": "If you're going to edit the file, it is recommended not to use a customized CDN domain (with caching mechanism) to get the latest file content",
 
   save: "Save",
   size: "Size",

node/i18n/ja-JP.js

@@ -330,6 +330,7 @@ module.exports = {
   "cannot.preview": "プレビューできません",
   "cannot.preview.this.file": "このファイルをプレビューできません。",
   "tryto.open.as.textfile": "テキストファイルとして開こうとする",
+  "preview.should_not_use_cdn_domain_to_edit": "ファイルを編集する場合は、カスタマイズされたCDNドメイン（キャッシュメカニズムを使用）を使用して最新のファイルコンテンツを取得しないことをお勧めします。",
 
   save: "セーブ",
   size: "サイズ",

node/i18n/zh-CN.js

@@ -331,6 +331,7 @@ module.exports = {
   "cannot.preview": "无法预览",
   "cannot.preview.this.file": "该文件类型无法预览。",
   "tryto.open.as.textfile": "尝试作为文本文件打开",
+  "preview.should_not_use_cdn_domain_to_edit": "编辑文件，建议不要使用自定义 CDN 域名（有缓存机制），以获取最新的文件内容",
 
   save: "保存",
   size: "大小",