@mixd-id/web-scaffold 0.1.230406345 → 0.1.230406346

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mixd-id/web-scaffold",
   "private": false,
-  "version": "0.1.230406345",
+  "version": "0.1.230406346",
   "scripts": {
     "dev": "vite serve",
     "build": "vite build",

package/src/components/Modal.vue

@@ -112,9 +112,10 @@ export default{
       this.context = context
 
       if(this.hash){
+        const hash = context.hash ?? this.hash
         this.$router.push({
           ...this.$route,
-          hash: this.$route.hash.replace(this.hash, '') + this.hash
+          hash: this.$route.hash.replace(hash, '') + hash
         })
       }
       else{

package/src/widgets/Dashboard/DatasourceSelector.vue

@@ -15,17 +15,11 @@
 	    </div>
 	  </template>
 	  <template v-slot:foot>
-	    <div v-if="analyseSrc && saveSrc"
-           class="p-6 flex justify-center">
-        <button type="button" class="text-primary"
-                @click="$refs.creator.open()">
-          Create Datasource...
-        </button>
-
-        <DatasourceCreator ref="creator"
-                           :analyse-src="analyseSrc"
-                           :save-src="saveSrc"
-                           @save="load" />
+	    <div class="p-6 flex justify-center">
+        <router-link :to="listSrc" target="_blank" class="text-primary flex flex-row items-center">
+          Datasource Manager
+          <svg class="inline ml-2 fill-primary" width="11" height="11" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.0.0-alpha3 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M392 320c-13.25 0-24 10.75-24 24v112c0 4.406-3.594 8-8 8h-304c-4.406 0-8-3.594-8-8v-304c0-4.406 3.594-8 8-8h112C181.3 144 192 133.3 192 120S181.3 96 168 96h-112C25.13 96 0 121.1 0 152v304C0 486.9 25.13 512 56 512h304c30.88 0 56-25.12 56-56v-112C416 330.8 405.3 320 392 320zM488 0H320c-13.25 0-24 10.75-24 24S306.8 48 320 48h110.1L183 295c-9.375 9.375-9.375 24.56 0 33.94C187.7 333.7 193.8 336 200 336s12.28-2.344 16.97-7.031L464 81.94V192c0 13.25 10.75 24 24 24S512 205.3 512 192V24C512 10.75 501.3 0 488 0z"/></svg>
+        </router-link>
 	    </div>
 	  </template>
 	  <div class="flex-1 p-6 flex">
@@ -36,24 +30,7 @@
                 :class="dashboardStyle.button"
                 class="flex flex-row items-start gap-2">
           <button type="button" class="flex-1 text-left" @click="add(datasource)">{{ datasource.name }}</button>
-          <button v-if="contextMenuItems.length > 0" type="button" class="py-1" :ref="`btn${idx}`" @click="$refs.contextMenu.open($refs[`btn${idx}`][0], { datasource })">
-            <svg width="14" height="14" class="fill-text-300 hover:fill-primary" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 512"><!--! Font Awesome Pro 6.0.0-alpha3 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) --><path d="M128 64c0-35.39-28.62-64-64-64S0 28.61 0 64s28.62 64 64 64S128 99.39 128 64zM128 256c0-35.39-28.62-64-64-64S0 220.6 0 256s28.62 64 64 64S128 291.4 128 256zM128 448c0-35.39-28.62-64-64-64s-64 28.61-64 64s28.62 64 64 64S128 483.4 128 448z"/></svg>
-          </button>
         </div>
-
-        <ContextMenu ref="contextMenu" position="bottom-right">
-          <template #default="{ context }">
-            <div class="flex flex-col min-w-[200px]">
-              <div v-for="item in contextMenuItems">
-                <button v-if="item.type === 'remove'" class="w-full p-3 text-left flex flex-row" :class="appStyle.menuItem"
-                        @click="remove(context.datasource)">
-                  {{ $t('Remove') }}
-                </button>
-              </div>
-
-            </div>
-          </template>
-        </ContextMenu>
       </div>
 
       <div v-else class="flex-1 flex items-center justify-center">
@@ -69,12 +46,10 @@
 <script>
 
 import Modal from "../../components/Modal.vue"
-import md5 from "md5";
-import DatasourceCreator from "./DatasourceCreator.vue";
 
 export default{
 
-  components: {DatasourceCreator, Modal },
+  components: { Modal },
 
   emits: [ 'add' ],
 
@@ -82,11 +57,7 @@ export default{
 
   props: {
 
-    analyseSrc: String,
-
-    saveSrc: String,
-
-    removeSrc: String,
+    listSrc: String,
 
     src: String,
 
@@ -94,13 +65,6 @@ export default{
 
   computed: {
 
-    contextMenuItems(){
-      return [
-        this.removeSrc ? { type:'remove' } : null
-      ]
-        .filter(_=>_)
-    }
-
   },
 
 	data(){

package/src/widgets/Dashboard.vue

@@ -713,9 +713,7 @@
 
     <DatasourceSelector ref="chooseDatasource"
                         :src="datasourceSrc"
-                        :analyseSrc="analyseDatasourceSrc"
-                        :saveSrc="saveDatasourceSrc"
-                        :removeSrc="removeDatasourceSrc"
+                        :list-src="datasourceListSrc"
                         @add="addDatasource" />
 
     <ViewSelector ref="chooseView" />
@@ -1218,9 +1216,10 @@ export default{
       if(!uids) this.readyState = 0
       this.socket.send(this.src, { views })
           .then(_ => {
-            this.readyState = 1
             Object.assign(this.values, _)
           })
+          .catch(err => this.alert(err))
+          .finally(_ => this.readyState = 1)
     },
 
     async loadNext(component){
@@ -1309,15 +1308,10 @@ export default{
 
     config: Object,
 
-    analyseDatasourceSrc: String,
-
     src: String,
 
-    removeDatasourceSrc: String,
-
-    saveDatasourceSrc: String,
-
     datasourceSrc: String,
+    datasourceListSrc: String,
 
     previewSrc: String,
 

package/src/widgets/Dashboard/DatasourceCreator.vue

@@ -1,197 +0,0 @@
-<template>
-	<Modal ref="modal"
-         :width="width"
-         :height="height">
-	  <template v-slot:head>
-	    <div class="relative p-6 flex flex-col gap-5">
-        <div class="absolute top-0 right-0 p-2">
-          <button type="button" class="p-2" @click="close">
-            <svg width="24" height="24" viewBox="0 0 24 24" class="fill-text-300 hover:fill-red-500" xmlns="http://www.w3.org/2000/svg">
-              <path d="M6.53034 5.46965C6.23745 5.17676 5.76257 5.17676 5.46968 5.46965C5.17679 5.76255 5.17679 6.23742 5.46968 6.53031L10.9393 12L5.46967 17.4697C5.17678 17.7626 5.17678 18.2374 5.46967 18.5303C5.76256 18.8232 6.23744 18.8232 6.53033 18.5303L12 13.0606L17.4697 18.5303C17.7626 18.8232 18.2375 18.8232 18.5303 18.5303C18.8232 18.2374 18.8232 17.7626 18.5303 17.4697L13.0607 12L18.5303 6.53032C18.8232 6.23743 18.8232 5.76256 18.5303 5.46966C18.2374 5.17677 17.7626 5.17677 17.4697 5.46966L12 10.9393L6.53034 5.46965Z"/>
-            </svg>
-          </button>
-        </div>
-
-	      <h3>Create New Datasource</h3>
-
-        <div>
-          <Textbox placeholder="Name" v-model="instance.name" />
-        </div>
-
-	    </div>
-	  </template>
-	  <template v-slot:foot>
-	    <div class="p-6">
-        <Button ref="saveBtn"
-                class="w-[80px]"
-                :state="canSave ? 1 : -1"
-                @click="save">
-          Save
-        </Button>
-	    </div>
-	  </template>
-	  <div class="flex-1 px-6 flex">
-
-      <div v-if="readyState === 2" class="flex-1 flex items-center justify-center flex-col">
-        <svg class="animate-spin aspect-square" width="36" height="36" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle><path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path></svg>
-      </div>
-
-      <VirtualTable v-else-if="instance?.columns"
-                    class="flex-1"
-                    :columns="instance.columns"
-                    :items="instance.items" />
-
-      <div v-else class="flex-1 flex items-center justify-center flex-col">
-        <button type="button" class="text-primary" @click="$refs.file.click()">
-          Import from File...
-        </button>
-      </div>
-
-      <input ref="file" type="file" class="hidden" accept=".csv,.xls,.xlsx" @change="analyse"/>
-
-      <Modal ref="selectSheets" width="300" height="360">
-        <template v-slot:head>
-          <div class="relative p-5">
-            <h3>Select Worksheet</h3>
-            <div class="absolute top-0 right-0 p-2">
-              <button type="button" class="p-2" @click="$refs.modal.close()">
-                <svg width="24" height="24" viewBox="0 0 24 24" class="fill-text-300 hover:fill-red-500" xmlns="http://www.w3.org/2000/svg">
-                  <path d="M6.53034 5.46965C6.23745 5.17676 5.76257 5.17676 5.46968 5.46965C5.17679 5.76255 5.17679 6.23742 5.46968 6.53031L10.9393 12L5.46967 17.4697C5.17678 17.7626 5.17678 18.2374 5.46967 18.5303C5.76256 18.8232 6.23744 18.8232 6.53033 18.5303L12 13.0606L17.4697 18.5303C17.7626 18.8232 18.2375 18.8232 18.5303 18.5303C18.8232 18.2374 18.8232 17.7626 18.5303 17.4697L13.0607 12L18.5303 6.53032C18.8232 6.23743 18.8232 5.76256 18.5303 5.46966C18.2374 5.17677 17.7626 5.17677 17.4697 5.46966L12 10.9393L6.53034 5.46965Z"/>
-                </svg>
-              </button>
-            </div>
-          </div>
-        </template>
-        <div class="flex-1 p-5">
-
-          <div class="flex flex-col">
-            <div v-for="sheet in multipleSheets"
-                 :class="dashboardStyle.button" @click="analyse({ sheetName:sheet })">
-              {{ sheet }}
-            </div>
-          </div>
-
-        </div>
-      </Modal>
-
-	  </div>
-	</Modal>
-</template>
-
-<script>
-
-export default{
-
-  emits: [ 'save' ],
-
-	inject: [ 'alert', 'dashboardStyle', 'socket', 'toast' ],
-
-  props: {
-
-    analyseSrc: String,
-
-    saveSrc: String
-
-  },
-
-  computed: {
-
-    canSave(){
-      return this.instance &&
-          this.instance.name &&
-          this.instance.columns &&
-          this.instance.items
-    },
-
-    height(){
-      if(Array.isArray(this.instance?.items))
-        return 600
-      return 480
-    },
-
-    width(){
-      if(Array.isArray(this.instance?.items))
-        return 800
-      return 420
-    },
-
-  },
-
-	data(){
-		return {
-      instance: null,
-      readyState: 1,
-      multipleSheets: null
-		}
-	},
-
-	methods: {
-
-    analyse(opt = { sheetName:undefined }){
-      this.instance.name = this.$refs.file.files[0].name
-
-      this.readyState = 2
-      this.$refs.selectSheets?.close()
-      this.socket.send(this.analyseSrc, {
-        file:this.$refs.file.files[0],
-        name:this.$refs.file.files[0].name,
-        mimeType:this.$refs.file.files[0].type,
-        sheetName: opt.sheetName
-      })
-          .then(res => {
-            Object.assign(this.instance, res)
-          })
-          .catch(err => {
-
-            if(err.errors?.multipleSheets){
-              this.multipleSheets = err.errors.multipleSheets
-              this.$refs.selectSheets.open()
-            }
-            else{
-              this.alert(err)
-            }
-          })
-          .finally(_ => {
-            this.readyState = 1
-          })
-    },
-
-		open(){
-      this.instance = {}
-      this.$refs.modal.open()
-		},
-
-		close(){
-      this.$refs.modal.close()
-		},
-
-    save(){
-      this.$refs.saveBtn.setState(2)
-      this.socket.send(this.saveSrc, {
-          ...this.instance,
-          file:this.$refs.file.files[0],
-          name:this.$refs.file.files[0].name,
-          mimeType:this.$refs.file.files[0].type
-        })
-        .then(_ => {
-          this.toast('Datasource created')
-          this.close()
-          this.$emit('save')
-        })
-        .catch(err => this.alert(err))
-        .finally(_ => this.$refs.saveBtn?.resetState())
-    }
-
-	}
-
-}
-
-</script>
-
-<style module>
-
-.comp{
-
-}
-
-</style>