From 6d2d8f895b23f424d1270cbda26852ffd3d62a88 Mon Sep 17 00:00:00 2001 From: Martin Weise <martin.weise@tuwien.ac.at> Date: Sat, 22 Feb 2025 11:15:24 +0100 Subject: [PATCH] Updated semantics Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at> --- .../target/create-event-listener.jar | Bin 10142 -> 10140 bytes dbrepo-ui/components/dialogs/Semantics.vue | 19 +++++++++++++++--- dbrepo-ui/components/table/TableHistory.vue | 4 ++-- dbrepo-ui/locales/en-US.json | 2 +- helm/dbrepo/files/create-event-listener.jar | Bin 10142 -> 10140 bytes 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dbrepo-auth-service/listeners/target/create-event-listener.jar b/dbrepo-auth-service/listeners/target/create-event-listener.jar index 3230bc2de1aa82754770364457fda657e7db3279..8da93ba40f621cea1db4e46414fd28ef77856fc4 100644 GIT binary patch delta 925 zcmbQ|KgVA>z?+#xgn@yBgJDHbSX8}+#+o8V28J_C3=ATZ?<$Gc_XeHLJFFnEC;F59 z2WE#kOLlx*>&c&crG1LsyX-xA0XZ@UZ)N`5cf>Q+bk!}nhF00Kw#at}X9?MU3@^E7 zVwT(~arELLMFFvzedll3mSo(VdO7>@!en7XTZLz9S90ysG5eF*Z58AF_=UjCOBo9S zI_;%b86>;DE4W>dk$Kj3*SY!(8+X1tkN174yd>6p`bN>ciu0drqZ1G2H9UH;?Os^K z;-&k4o?CFA<LFWTpY=ui*1R*?rgrO>&#Ak4>OL=7w^}!cHHbM}x^byd{d!iGY*pnH z^~V|#YY%N|;bYsEeTMhO!w;L458iS=&o6sI;!5kRZ@<}B94>y}lY9U7--d9dFB9th zh3XF3y_}^ll^qy7|NE|U_jtZKpE6i~JLbi*Y0`IIuWCFi&@o}kuK(OJyBAp6%n3gx z9944skoKE1onr1<dnJ6icI@%FY%=p)+F~KoC!Ue#PPu5B`ic5n{dli?^}ad3eVbL< zHC{hZ+@-I(cY?x;C8`pV?((2G;bLImU|?9m6cjdjGouRg@}RKEw-|MqR|JJk=3<fq z)7ng`U^<vd3rsgKnSkl-OkQC1EX-%Y^cCiAkoe{#mN`sd1|vH+Cz!!6P$LLpOzu;h z1*Wx?CUe5m!Q|sgmhvDT0}|kbvjrI5Ixd+kuPgz!#7bG3@$}>{Wks+#Rm#$0zZn@A z5=-<0ycwB9n4#VY3Y)xIS(;sj2`n`^P(>KS0)7+=TqgflhWJ)NMVhIQX>vc4?BpmF zE(LUV>7!^{0a7SEdA^F0{PLi%s6X@CoVpko7(OsCFlfLPGB7M@{5tu8iaFQ=QmWF7 zM<<)927*1%r7F!7%rd!<#bokrRUWX=D^+QxPi&I~*d->*t3ibH)TEgh1SS`<s823Z zGhmu4JGq}pdh&iXO|XX7YSK*gicle`$+qfZV9yGBgq%xeU|`tDz`!7k;ux99Me1s7 I8<aqT0RGKO<p2Nx delta 1020 zcmbQ^KhIw{z?+#xgn@yBgQ2=6B&t-dxvylRuwuP$@gW6)z3FQI8|@h+J||9&-r9cc zVwqd^`<5K7WG9&$M}EEUzIbfq<;-dZv2PpSf1I}T!YY>TFT6dWz2`g*xa~7HRuJH_ zvQ10Tw7T%*-ifuZ4osNfs(xfkXsF}!qkZeXE8N}M`F^fasFvo1&_(OHv`=_Ul)hme zvSr6oF`wlscj}ec-xbFHGF#bwEG5M*ca7@LiE9=p^fT4IUwJP)p!wMTpLq-Jb431e z{x^Tl?5j%3(MR^4wXm1r^O-s=u{vPE%n3dU;k!%@Ey`5g#-?L``tiQ!J$`qL#OF%< zkW&bE;%|?aExfibqUx1{n@g-p;Qo5Ct<~?GUVdAApZ`b8PPt14^$Wz`L|rSnmcc9Z zd(YI;Z|gS5&)Hph`<aiK>HUL&VZAqa8H+vje(!f!SUl_Q;moBvO>D(_dz$>_W<K6+ z!gcwg##|LgiKRxJ?@uWRv7RvDJLYKO`KUyw_2AEY$3nuN*Ihnvk>SIwN{(l%mWn@O ziQQtMT>Bmz6<iDq91INAOf?~sH!`X)SJi|}zQL#qra748z_cclDsy#B$mBpKEihfj zWCEtQGI@dJnV8Rl=}XMrAbN8G%N!;!<3AfWCz!!2P$LM|(xW&FOlvAl=7dN8<fBTK zU{OY8X~t!fWtAlqs%k=_7?6MvoGrlc*6}Rk<cG{6lQWfhOwbiFqbU5#$iR?Tq95SR z$RxrH@hQlIE0v{X<(R-yC8gz=sd*?WKwf>QEY0XP`LD7Z*j;ie(u~EE8&zbqkxc@* zA8s211A{)C19Ic4$&D&@V1N9X*XGp4z`*c<fq_8-u7-hON#l2>$%4#UlQ~s+zzThS zv#io%U|`T;U|?`UQFxqr@<V2q$(2xr|35YF_Ge;XxW>xBV1%MDlx1>0i^=4hP=(z8 z1pnOPU|?7$z`!7eqVNmbWIlF@$+BuZpa`0*qbAM7BrrLjMSXICngQed$qUt7!Crr< zCe75SIJuWedh&fHvB_r?`JiEd$il)NA?K1A7#KD(Ffa(CSRyyMKwXV(lM+Y}0FzNu A9{>OV diff --git a/dbrepo-ui/components/dialogs/Semantics.vue b/dbrepo-ui/components/dialogs/Semantics.vue index ff59effa95..5c028cbcb6 100644 --- a/dbrepo-ui/components/dialogs/Semantics.vue +++ b/dbrepo-ui/components/dialogs/Semantics.vue @@ -55,6 +55,7 @@ v-if="recommendations.length === 0"> <v-col> <v-btn + v-if="finishedRecommendations" color="secondary" variant="flat" size="small" @@ -165,6 +166,7 @@ export default { uri: null, valid: false, loading: false, + finishedRecommendations: false, loadingOntologies: false, loadingSemantics: false, cacheStore: useCacheStore() @@ -172,7 +174,7 @@ export default { }, computed: { title () { - return this.$t('pages.table.subpages.semantics.title') + ' ' + this.column.internal_name + return this.$t('pages.table.subpages.semantics.title', { type: this.mode }) + ' ' + this.column.internal_name }, ontologies () { return this.cacheStore.getOntologies.filter(o => o.sparql || o.rdf) @@ -243,6 +245,13 @@ export default { action: 'assign' }) }) + .catch(({code, message}) => { + const toast = useToastInstance() + if (typeof code !== 'string') { + return + } + toast.error(message) + }) .finally(() => { this.recommendation = null this.$refs.form.reset() @@ -255,10 +264,14 @@ export default { tableService.suggest(this.database.id, this.tableId, this.column.id) .then((recommendations) => { this.recommendations = recommendations + this.finishedRecommendations = true }) - .catch((error) => { + .catch(({code, message}) => { const toast = useToastInstance() - toast.error(this.$t('error.semantics.timeout')) + if (typeof code !== 'string') { + return + } + toast.error(message) }) .finally(() => { this.loadingSemantics = false diff --git a/dbrepo-ui/components/table/TableHistory.vue b/dbrepo-ui/components/table/TableHistory.vue index ccc270c46c..c0e2bd7c7a 100644 --- a/dbrepo-ui/components/table/TableHistory.vue +++ b/dbrepo-ui/components/table/TableHistory.vue @@ -167,8 +167,8 @@ export default { // labels: history ? history.map(d => format(new UTCDate(d.timestamp), 'yyyy-MM-dd HH:mm:ss.SSS')) : [], labels: history ? history.map(d => format(new UTCDate(d.timestamp), 'yyyy-MM-dd HH:mm:ss')) : [], datasets: [ - { backgroundColor: this.$vuetify.theme.current.colors.success, data: this.filterHistoryEventType(history, 'INSERT') }, - { backgroundColor: this.$vuetify.theme.current.colors.error, data: this.filterHistoryEventType(history, 'DELETE') } + { backgroundColor: this.$vuetify.theme.current.colors.success, data: this.filterHistoryEventType(history, 'insert') }, + { backgroundColor: this.$vuetify.theme.current.colors.error, data: this.filterHistoryEventType(history, 'delete') } ] } }) diff --git a/dbrepo-ui/locales/en-US.json b/dbrepo-ui/locales/en-US.json index c3da75d79b..a42a56411b 100644 --- a/dbrepo-ui/locales/en-US.json +++ b/dbrepo-ui/locales/en-US.json @@ -541,7 +541,7 @@ } }, "semantics": { - "title": "Assign semantic instance for table column", + "title": "Assign semantic {type} for table column", "subtitle": "Semantic instances help machines to get the proper context of your dataset", "recommended": "Recommended semantic instances", "bullet": "●", diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar index 3230bc2de1aa82754770364457fda657e7db3279..8da93ba40f621cea1db4e46414fd28ef77856fc4 100644 GIT binary patch delta 925 zcmbQ|KgVA>z?+#xgn@yBgJDHbSX8}+#+o8V28J_C3=ATZ?<$Gc_XeHLJFFnEC;F59 z2WE#kOLlx*>&c&crG1LsyX-xA0XZ@UZ)N`5cf>Q+bk!}nhF00Kw#at}X9?MU3@^E7 zVwT(~arELLMFFvzedll3mSo(VdO7>@!en7XTZLz9S90ysG5eF*Z58AF_=UjCOBo9S zI_;%b86>;DE4W>dk$Kj3*SY!(8+X1tkN174yd>6p`bN>ciu0drqZ1G2H9UH;?Os^K z;-&k4o?CFA<LFWTpY=ui*1R*?rgrO>&#Ak4>OL=7w^}!cHHbM}x^byd{d!iGY*pnH z^~V|#YY%N|;bYsEeTMhO!w;L458iS=&o6sI;!5kRZ@<}B94>y}lY9U7--d9dFB9th zh3XF3y_}^ll^qy7|NE|U_jtZKpE6i~JLbi*Y0`IIuWCFi&@o}kuK(OJyBAp6%n3gx z9944skoKE1onr1<dnJ6icI@%FY%=p)+F~KoC!Ue#PPu5B`ic5n{dli?^}ad3eVbL< zHC{hZ+@-I(cY?x;C8`pV?((2G;bLImU|?9m6cjdjGouRg@}RKEw-|MqR|JJk=3<fq z)7ng`U^<vd3rsgKnSkl-OkQC1EX-%Y^cCiAkoe{#mN`sd1|vH+Cz!!6P$LLpOzu;h z1*Wx?CUe5m!Q|sgmhvDT0}|kbvjrI5Ixd+kuPgz!#7bG3@$}>{Wks+#Rm#$0zZn@A z5=-<0ycwB9n4#VY3Y)xIS(;sj2`n`^P(>KS0)7+=TqgflhWJ)NMVhIQX>vc4?BpmF zE(LUV>7!^{0a7SEdA^F0{PLi%s6X@CoVpko7(OsCFlfLPGB7M@{5tu8iaFQ=QmWF7 zM<<)927*1%r7F!7%rd!<#bokrRUWX=D^+QxPi&I~*d->*t3ibH)TEgh1SS`<s823Z zGhmu4JGq}pdh&iXO|XX7YSK*gicle`$+qfZV9yGBgq%xeU|`tDz`!7k;ux99Me1s7 I8<aqT0RGKO<p2Nx delta 1020 zcmbQ^KhIw{z?+#xgn@yBgQ2=6B&t-dxvylRuwuP$@gW6)z3FQI8|@h+J||9&-r9cc zVwqd^`<5K7WG9&$M}EEUzIbfq<;-dZv2PpSf1I}T!YY>TFT6dWz2`g*xa~7HRuJH_ zvQ10Tw7T%*-ifuZ4osNfs(xfkXsF}!qkZeXE8N}M`F^fasFvo1&_(OHv`=_Ul)hme zvSr6oF`wlscj}ec-xbFHGF#bwEG5M*ca7@LiE9=p^fT4IUwJP)p!wMTpLq-Jb431e z{x^Tl?5j%3(MR^4wXm1r^O-s=u{vPE%n3dU;k!%@Ey`5g#-?L``tiQ!J$`qL#OF%< zkW&bE;%|?aExfibqUx1{n@g-p;Qo5Ct<~?GUVdAApZ`b8PPt14^$Wz`L|rSnmcc9Z zd(YI;Z|gS5&)Hph`<aiK>HUL&VZAqa8H+vje(!f!SUl_Q;moBvO>D(_dz$>_W<K6+ z!gcwg##|LgiKRxJ?@uWRv7RvDJLYKO`KUyw_2AEY$3nuN*Ihnvk>SIwN{(l%mWn@O ziQQtMT>Bmz6<iDq91INAOf?~sH!`X)SJi|}zQL#qra748z_cclDsy#B$mBpKEihfj zWCEtQGI@dJnV8Rl=}XMrAbN8G%N!;!<3AfWCz!!2P$LM|(xW&FOlvAl=7dN8<fBTK zU{OY8X~t!fWtAlqs%k=_7?6MvoGrlc*6}Rk<cG{6lQWfhOwbiFqbU5#$iR?Tq95SR z$RxrH@hQlIE0v{X<(R-yC8gz=sd*?WKwf>QEY0XP`LD7Z*j;ie(u~EE8&zbqkxc@* zA8s211A{)C19Ic4$&D&@V1N9X*XGp4z`*c<fq_8-u7-hON#l2>$%4#UlQ~s+zzThS zv#io%U|`T;U|?`UQFxqr@<V2q$(2xr|35YF_Ge;XxW>xBV1%MDlx1>0i^=4hP=(z8 z1pnOPU|?7$z`!7eqVNmbWIlF@$+BuZpa`0*qbAM7BrrLjMSXICngQed$qUt7!Crr< zCe75SIJuWedh&fHvB_r?`JiEd$il)NA?K1A7#KD(Ffa(CSRyyMKwXV(lM+Y}0FzNu A9{>OV -- GitLab