Bookworm rebased

app/src/api/api.js

@@ -217,12 +217,12 @@ export default {
       const api = this
 
       function reconnect(n) {
-        api
-          .get('logout', {}, { key: 'reconnecting' })
+        store
+          .dispatch('GET_YUNOHOST_INFOS')
           .then(resolve)
           .catch((err) => {
             if (err.name === 'APIUnauthorizedError') {
-              resolve()
+              reject(err)
             } else if (n < 1) {
               reject(err)
             } else {

app/src/helpers/yunohostArguments.js

@@ -120,18 +120,13 @@ function addEvaluationGetter(prop, obj, expr, ctx, nested) {
  * @return {Object} an formated argument containing formItem props, validation and base value.
  */
 export function formatYunoHostArgument(arg) {
-  let value =
-    arg.value !== undefined
-      ? arg.value
-      : arg.current_value !== undefined
-        ? arg.current_value
-        : null
+  let value = arg.value !== undefined ? arg.value : null
   const validation = {}
   const error = { message: null }
   arg.ask = formatI18nField(arg.ask)
   const field = {
     is: arg.readonly ? 'ReadOnlyField' : 'FormField',
-    visible: [undefined, true, '"true"'].includes(arg.visible),
+    visible: arg.visible,
     props: {
       label: arg.ask,
       component: undefined,
@@ -168,11 +163,11 @@ export function formatYunoHostArgument(arg) {
       name: 'InputItem',
       props: defaultProps.concat(['type', 'min', 'max', 'step']),
       callback: function () {
-        if (!isNaN(parseInt(arg.min))) {
-          validation.minValue = validators.minValue(parseInt(arg.min))
+        if (arg.min !== undefined) {
+          validation.minValue = validators.minValue(arg.min)
         }
-        if (!isNaN(parseInt(arg.max))) {
-          validation.maxValue = validators.maxValue(parseInt(arg.max))
+        if (arg.max !== undefined) {
+          validation.maxValue = validators.maxValue(arg.max)
         }
         validation.numValue = validators.integer
       },
@@ -277,11 +272,12 @@ export function formatYunoHostArgument(arg) {
   ]
 
   // Default type management if no one is filled
-  if (arg.choices && arg.choices.length) {
-    arg.type = 'select'
-  }
   if (arg.type === undefined) {
-    arg.type = 'string'
+    if (arg.choices && arg.choices.length) {
+      arg.type = 'select'
+    } else {
+      arg.type = 'string'
+    }
   }
 
   // Search the component bind to the type
@@ -328,9 +324,6 @@ export function formatYunoHostArgument(arg) {
   }
 
   // Default value if still `null`
-  if (value === null && arg.current_value) {
-    value = arg.current_value
-  }
   if (value === null && arg.default) {
     value = arg.default
   }
@@ -433,12 +426,12 @@ export function formatYunoHostConfigPanels(data) {
       const section = {
         id: _section.id,
         isActionSection: _section.is_action_section,
-        visible: [undefined, true, '"true"'].includes(_section.visible),
+        visible: _section.visible
       }
       if (_section.help) section.help = formatI18nField(_section.help)
       if (_section.name) section.name = formatI18nField(_section.name)
-      if (_section.visible && ![false, '"false"'].includes(_section.visible)) {
-        addEvaluationGetter('visible', section, _section.visible, result.forms)
+      if (typeof _section.visible === "string") {
+        addEvaluationGetter('visible', section, section.visible, result.forms)
       }
 
       const { form, fields, validations, errors } = formatYunoHostArguments(

app/src/i18n/locales/en.json

@@ -31,7 +31,7 @@
                 "unknown": "Connection with the server has been closed for unknown reasons.",
                 "upgrade_system": "Connection with the server has been closed due to YunoHost upgrade. Waiting for the server to be reachable again…"
             },
-            "success": "The server is now reachable! You can try to login",
+            "session_expired": "The server is now reachable! But it looks like your session expired, please login.",
             "title": "Trying to communicate with the server..."
         }
     },

app/src/store/info.js

@@ -179,10 +179,9 @@ export default {
       return api.get('logout')
     },
 
-    TRY_TO_RECONNECT({ commit, dispatch }, args = {}) {
+    TRY_TO_RECONNECT({ commit }, args = {}) {
       // FIXME This is very ugly arguments forwarding, will use proper component way of doing this when switching to Vue 3 (teleport)
       commit('SET_RECONNECTING', args)
-      dispatch('RESET_CONNECTED')
     },
 
     GET_YUNOHOST_INFOS({ commit }) {

app/src/views/_partials/ReconnectingDisplay.vue

@@ -28,8 +28,8 @@
       </div>
     </template>
 
-    <template v-if="status === 'success'">
-      <BAlert variant="success" v-t="'api.reconnecting.success'" />
+    <template v-if="status === 'expired'">
+      <BAlert variant="success" v-t="'api.reconnecting.session_expired'" />
 
       <LoginView force-reload />
     </template>
@@ -66,10 +66,14 @@ export default {
       api
         .tryToReconnect({ ...this.reconnecting, initialDelay })
         .then(() => {
-          this.status = 'success'
+          this.$store.commit('SET_RECONNECTING', null)
         })
-        .catch(() => {
-          this.status = 'failed'
+        .catch((err) => {
+          if (err.name === 'APIUnauthorizedError') {
+            this.status = 'expired'
+          } else {
+            this.status = 'failed'
+          }
         })
     },
   },

debian/changelog

@@ -1,3 +1,9 @@
+yunohost (12.0.0) unstable; urgency=low
+
+  - Tmp changelog to prepare Bookworm
+
+ -- Tagada <[email protected]>  Fri, 12 May 2023 16:20:28 +0000
+
 yunohost-admin (11.2.4.1) stable; urgency=low
 
   - [i18n] Translations updated for Arabic, Basque, Catalan, Chinese (Simplified), English, French, Galician, German, Italian, Kabyle, Korean, Occitan, Spanish, Ukrainian

debian/rules

@@ -17,7 +17,7 @@ TMPDIR = $$(pwd)/debian/yunohost-admin
 override_dh_auto_build:
 	/usr/bin/curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor | tee /usr/share/keyrings/nodesource.gpg >/dev/null
 	/usr/bin/curl -s https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /etc/apt/trusted.gpg.d/yarn.gpg >/dev/null
-	echo 'deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_14.x bullseye main' > /etc/apt/sources.list.d/nodesource.list
+	echo 'deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_14.x bookworm main' > /etc/apt/sources.list.d/nodesource.list
 	echo "deb [signed-by=/etc/apt/trusted.gpg.d/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
 	/usr/bin/apt update
 	/usr/bin/apt install nodejs yarn -y