From 6648141faa44187d01b3bba9636c46970ae0296a Mon Sep 17 00:00:00 2001 From: Martin Weise <martin.weise@tuwien.ac.at> Date: Wed, 23 Apr 2025 19:25:45 +0200 Subject: [PATCH] Updated the primary key composite Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at> --- .../target/create-event-listener.jar | Bin 10141 -> 10141 bytes dbrepo-ui/components/table/TableSchema.vue | 4 +++- .../[database_id]/table/create/dataset.vue | 5 ++--- helm/dbrepo/files/create-event-listener.jar | Bin 10141 -> 10141 bytes 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dbrepo-auth-service/listeners/target/create-event-listener.jar b/dbrepo-auth-service/listeners/target/create-event-listener.jar index 9fb1271c4361841c3d4061e536d23bc16b590d0e..70d8723ddff0b6e19308a52bff647932ef2eb3ad 100644 GIT binary patch delta 664 zcmbR1Ki6L<z?+#xgn@yBgQ0Nd^r+v>JNHZ!QmQ{#bVxy9Z@Sw51N;nz%L0p6f4g9H z>s-d$xf6U3&zQiIll1p@(w4$kCAZ`nT5I1_?@86&a_XQ`Epu|{T4AH4#`n5B94$TP z`Z*)J`Al}2Zwio=FiN|~X_y~6^J40@<+s_E>^A$jH+V^rD(fz<FQJK?oF{{reSKZK zS+^!wsXi2|w=8I{eR+Gyxva?(p6=N;ZHfD)#vU84FMF4-(p<>YTmSj4!+ya{yX8Oq ze{v@`j8juUdUipbh0Kgox`)3la4=S!>9DROuf_GUR}ODP-L&Ji=Otx#r)pXmez0{| z)gs5Y-|Eqt+KpeXG`4hTbuX^_ucP(-&eTh9-S^9XFf6uR@>sBbZ^HIXi@Kw-C){|x zcFm;n*1r$#oOPXT6d7K_?;d$A$)4qm>drU+nOe_fmhmrNx`{*T%+3#NR;A14vSnKI zx*2sW(wXP?#Albn+0Q03jwDK)yQIOdwmD+n`?o%orSHsnWq29Z&uLFs7geR`cfqyW z_|kVfMo>g>F)(m2Fci*YoIZIIqY87*%;}SFGU_tt&zwG)lSvLtYcZ)Z7tWkMIfzLM zOxH7+faz^aUSRdi%xA&$W#(>>`pt<fbC^JkP3+v9AbK;Oz${*7o$1pzua>>f4A$DK zI15Z`DNW{pC4$LEm8`&mOv)x;^DLEZLE0x*D(iviRm!Gd`A5nSb@D1MV1AlP6j=RX pm0&O}shSH`->Di4reCT$f@xi~Fpw)Ix2Yw9^}SNd0MnuB9sp^lATIy_ delta 664 zcmbR1Ki6L<z?+#xgn@yBgCVG(AgXd{`Ll^aO7*w%9xDjcZhun$fSqA^>D?pwzTXqg zU%7hezki&#$8lpJOLF?>@2Y;US6y7SoBzN8nP)QR3i!`m6N%V2iGN%1(itmteDiD> zCr>=>tobfcK|RkV?~OxT%&I>f5#P2M7Nu_cl<6+9K6d#@!%bUVA4GWCMdz&$S@vnm zYn3m1CN};_sGoRlqVV^l5x;C+`aJjE7*(d&@k-%Z$`StuCO@yflgc{zasSVA3*tGh zUXB0s|K!h2`?Qa?Rf>D9{r-FJrqX~r?{zI%S2S!b-P(R&pZhyo*4jzSFRMt!9!X_o z_NlR7vFX9G!~K0O+49XcWeY?u%u<s7&VS+9^Lvrk|4V)s-WRa3z5Y{?+Wn3GH%{F? zXXzyOneq0g?N19cWS{%SYrcuvyOh~XHfOoR(Iv+|>U&5ndiJB>=8XeSPR!?8pSeLj z>I8R0%H}&y0z$$w#6I_Ih;oprG;@zhvAi~Q=KObie>}Uq^Sw#NH<w+#a+CgFG2-fM zy0_Iu`SKH9P(*MsFmNz11QjqAOy0z(!W>voF!?5<E|}(Il4A}kD449pqza~kn6$uj zJ(CHT-p1qwR>#bI7EE7e?goi(PGp(G1QOW9&dmuH;1ig|%iJ(2Z1ZZ_`^+Gb$-RoR zz_gaqWDZy&n0!>p3M|N^Yy#3g*;3gSOjj!FfyGxTn}X>_$`Ez(DlTAtno1N{-C>nr nFfFN?3l{HGjRo^xsyc%Cx@ut{S4?hGO9b;@sbzraP<0OgabqPy diff --git a/dbrepo-ui/components/table/TableSchema.vue b/dbrepo-ui/components/table/TableSchema.vue index 62d88647e4..f7cb3b3eb0 100644 --- a/dbrepo-ui/components/table/TableSchema.vue +++ b/dbrepo-ui/components/table/TableSchema.vue @@ -152,7 +152,6 @@ <v-checkbox v-model="c.unique" :disabled="disabled || c.type === 'serial'" - :hidden="c.primary_key" :label="$t('pages.table.subpages.schema.unique.label')" /> </v-col> <v-col @@ -250,6 +249,9 @@ export default { return this.$vuetify.theme.global.name.toLowerCase().endsWith('contrast') ? runtimeConfig.public.variant.button.contrast : runtimeConfig.public.variant.button.normal }, showPrimaryKeyWarning () { + if (this.disabled) { + return false + } return this.columns.filter(c => c.primary_key).length === 0 } }, diff --git a/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue b/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue index 56db5fdc37..54d539ed17 100644 --- a/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue +++ b/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue @@ -155,12 +155,11 @@ </v-stepper-header> <v-stepper-window direction="vertical"> - <v-container - v-if="step >= 4"> + <v-container> <TableSchema ref="schema" :back="false" - :disabled="step > 4" + :disabled="step !== 4" :loading="loading" :submit-text="$t('navigation.continue')" :columns="tableCreate.columns" diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar index 9fb1271c4361841c3d4061e536d23bc16b590d0e..70d8723ddff0b6e19308a52bff647932ef2eb3ad 100644 GIT binary patch delta 664 zcmbR1Ki6L<z?+#xgn@yBgQ0Nd^r+v>JNHZ!QmQ{#bVxy9Z@Sw51N;nz%L0p6f4g9H z>s-d$xf6U3&zQiIll1p@(w4$kCAZ`nT5I1_?@86&a_XQ`Epu|{T4AH4#`n5B94$TP z`Z*)J`Al}2Zwio=FiN|~X_y~6^J40@<+s_E>^A$jH+V^rD(fz<FQJK?oF{{reSKZK zS+^!wsXi2|w=8I{eR+Gyxva?(p6=N;ZHfD)#vU84FMF4-(p<>YTmSj4!+ya{yX8Oq ze{v@`j8juUdUipbh0Kgox`)3la4=S!>9DROuf_GUR}ODP-L&Ji=Otx#r)pXmez0{| z)gs5Y-|Eqt+KpeXG`4hTbuX^_ucP(-&eTh9-S^9XFf6uR@>sBbZ^HIXi@Kw-C){|x zcFm;n*1r$#oOPXT6d7K_?;d$A$)4qm>drU+nOe_fmhmrNx`{*T%+3#NR;A14vSnKI zx*2sW(wXP?#Albn+0Q03jwDK)yQIOdwmD+n`?o%orSHsnWq29Z&uLFs7geR`cfqyW z_|kVfMo>g>F)(m2Fci*YoIZIIqY87*%;}SFGU_tt&zwG)lSvLtYcZ)Z7tWkMIfzLM zOxH7+faz^aUSRdi%xA&$W#(>>`pt<fbC^JkP3+v9AbK;Oz${*7o$1pzua>>f4A$DK zI15Z`DNW{pC4$LEm8`&mOv)x;^DLEZLE0x*D(iviRm!Gd`A5nSb@D1MV1AlP6j=RX pm0&O}shSH`->Di4reCT$f@xi~Fpw)Ix2Yw9^}SNd0MnuB9sp^lATIy_ delta 664 zcmbR1Ki6L<z?+#xgn@yBgCVG(AgXd{`Ll^aO7*w%9xDjcZhun$fSqA^>D?pwzTXqg zU%7hezki&#$8lpJOLF?>@2Y;US6y7SoBzN8nP)QR3i!`m6N%V2iGN%1(itmteDiD> zCr>=>tobfcK|RkV?~OxT%&I>f5#P2M7Nu_cl<6+9K6d#@!%bUVA4GWCMdz&$S@vnm zYn3m1CN};_sGoRlqVV^l5x;C+`aJjE7*(d&@k-%Z$`StuCO@yflgc{zasSVA3*tGh zUXB0s|K!h2`?Qa?Rf>D9{r-FJrqX~r?{zI%S2S!b-P(R&pZhyo*4jzSFRMt!9!X_o z_NlR7vFX9G!~K0O+49XcWeY?u%u<s7&VS+9^Lvrk|4V)s-WRa3z5Y{?+Wn3GH%{F? zXXzyOneq0g?N19cWS{%SYrcuvyOh~XHfOoR(Iv+|>U&5ndiJB>=8XeSPR!?8pSeLj z>I8R0%H}&y0z$$w#6I_Ih;oprG;@zhvAi~Q=KObie>}Uq^Sw#NH<w+#a+CgFG2-fM zy0_Iu`SKH9P(*MsFmNz11QjqAOy0z(!W>voF!?5<E|}(Il4A}kD449pqza~kn6$uj zJ(CHT-p1qwR>#bI7EE7e?goi(PGp(G1QOW9&dmuH;1ig|%iJ(2Z1ZZ_`^+Gb$-RoR zz_gaqWDZy&n0!>p3M|N^Yy#3g*;3gSOjj!FfyGxTn}X>_$`Ez(DlTAtno1N{-C>nr nFfFN?3l{HGjRo^xsyc%Cx@ut{S4?hGO9b;@sbzraP<0OgabqPy -- GitLab