Merge branch 'task/dung.dao/add-expired-date' into 'master'

upload version and change name folder

See merge request !5

.idea/vcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

css/uploadFileCommon.css

@@ -77,7 +77,6 @@
     cursor: pointer;
     margin-top: 30px;
     margin-bottom: 10px;
-    border: 1px solid #888888;
 }
 
 #btnLogin, #btnLogout{

js/commonCookies.js

@@ -10,6 +10,7 @@ function setCookie(cname, cvalue, isDayClose= false) {
     let expires = "expires="+d.toUTCString();
     document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
 }
+
 // get value from cookie
 function getCookie(cname) {
     let name = cname + "=";
@@ -25,6 +26,7 @@ function getCookie(cname) {
     }
     return "";
 }
+
 // Check field existed cookies
 function checkCookie() {
     let user = getCookie("username");

js/desktop.js

@@ -55,7 +55,6 @@ jQuery.noConflict();
 
             };
 
-            // Kiểm tra token. Nếu chưa có yêu cầu đăng nhập
             if (gapi.client.getToken() === null) {
                 tokenClient.requestAccessToken({prompt: 'consent'});
             } else {
@@ -97,13 +96,15 @@ jQuery.noConflict();
 
     }
 
-     // Function create folder with name folder
-    async function createFolderFunction(nameFolder) {
+    async function createFolderFunction(nameFolder, idParent=null) {
         const fileMetadata = {
             'title': nameFolder,
             'name': nameFolder,
             'mimeType': 'application/vnd.google-apps.folder',
         };
+        if(idParent){
+            fileMetadata.parents = [`${idParent}`]
+        }
         try {
             const file = await gapi.client.drive.files.create({
                 resource: fileMetadata,
@@ -111,7 +112,7 @@ jQuery.noConflict();
             });
             return file.result.id;
         } catch (err) {
-            onExpiredDateAuth(err, createFolderFunction, nameFolder)
+            onExpiredDateAuth(err, createFolderFunction, {nameFolder, idParent})
             throw err;
         }
     }
@@ -203,7 +204,7 @@ jQuery.noConflict();
         try{
             const response = await gapi.client.drive.files.list({
                 'q' : `mimeType = "application/vnd.google-apps.folder" and name = "${nameFolder}"`,
-                'pageSize': 500
+                'pageSize': 3
             });
             if(response && response.status=== 200){
                 let listFilesCheck = response.result ? response.result.files : []
@@ -240,7 +241,7 @@ jQuery.noConflict();
                if(spaceInput){
                    recordId = event.recordId || null
                    sourceAppId = kintone.app.getId();
-                   let nameFolder = `${NAME_FOLDER_DEFAULT}_${sourceAppId}_${recordId}`
+                   let nameFolder = `${NAME_FOLDER_DEFAULT}_${recordId}`
 
                    setTimeout( async () =>{
                        if(getCookie(COOKIES_TOKEN_KINTONE)){
@@ -258,8 +259,10 @@ jQuery.noConflict();
                        listDataUploaded.id = 'list-uploaded'
                        let listDataTitle = document.createElement('h4')
                        let titleText = document.createElement('span')
+
                        titleText.innerText = TITLE_LIST_FILE_UPLOAD
                        let titleButton = document.createElement('button')
+
                        titleButton.innerText = TEXT_BTN_CREATE_FILE
                        listDataTitle.appendChild(titleText)
                        listDataTitle.appendChild(titleButton)
@@ -268,12 +271,22 @@ jQuery.noConflict();
 
                        if(nameFolder){
                            let idFolderGet =  await checkFolder(nameFolder)
+                           let nameParentFolder= `${NAME_FOLDER_APP}_${sourceAppId}`
+                           let idParentFolder = await checkFolder(nameParentFolder)
                            ID_FOLDER = idFolderGet
-                           if(idFolderGet){
+                           if(idFolderGet && idParentFolder){
                                await listFiles(idFolderGet, listDataUploaded)
                            }else{
-                               let idFolder = await createFolderFunction(nameFolder)
-                               ID_FOLDER = idFolder
+                               if(idParentFolder){
+                                   let idFolder = await createFolderFunction(nameFolder, idParentFolder)
+                                   ID_FOLDER = idFolder
+                               }else{
+                                   let idParent = await createFolderFunction(nameParentFolder)
+                                   if(idParent){
+                                       let idFolder = await createFolderFunction(nameFolder, idParent)
+                                       ID_FOLDER = idFolder
+                                   }
+                               }
                            }
                        }
 
@@ -393,7 +406,7 @@ jQuery.noConflict();
                                })
                                let imageFile = document.createElement('img')
                                if(value.name){
-                                   imageFile.src = value.thumbnailLink || LINK_IMAGE_TYPE+value.name.split('.')[value.name.split('.').length -1]
+                                   imageFile.src = value.thumbnailLink || value.iconLink.replace("/16/","/128/");
                                }
 
                                let itemSize = document.createElement('span')

js/fieldConstant.js

@@ -17,6 +17,7 @@ const TEXT_BTN_DOWNLOAD = 'Download'
 const TEXT_BTN_CREATE_FILE = 'New File'
 const TEXT_BTN_CANCEL = 'Cancel'
 const TITLE_LIST_FILE_UPLOAD = 'List File Upload'
-const NAME_FOLDER_DEFAULT = 'KintoneApp'
+const NAME_FOLDER_DEFAULT = 'Record'
+const NAME_FOLDER_APP = 'FolderApp'
 const COOKIES_TOKEN_KINTONE = "TOKEN_ACCOUNT_KINTONE"
 const URL_API_CALL = 'https://62e0b6e998dd9c9df615e954.mockapi.io/plugins'

js/functionCommon.js

+// reverse text
 function reverse(string){
     return string.split('').reverse().join('');
 }
 
+
+// get file by size
 function getFileSize(sizeValue){
     let _size = sizeValue;
     let fSExt = new Array('Bytes', 'KB', 'MB', 'GB'),

manifest.json

@@ -4,7 +4,7 @@
     "type": "APP",
     "name": {
         "ja": "Upload File To Driver Plugin",
-        "en": "Upload File To Driver 3.0"
+        "en": "Upload File To Driver 2.0"
     },
     "description": {
         "ja": "Upload file to driver with kintone app",