Almost done get-configuration and previous ldap_domain selected | don…

…e ui with block if user already selected a domain and saved successfully | WIP
innovyou · Apr 15, 2024 · d0c1524 · d0c1524
1 parent 0029b3a
commit d0c1524
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 69 deletions.
diff --git a/imageroot/actions/configure-module/20Configure b/imageroot/actions/configure-module/20Configure
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import os
 import json
 import sys
@@ -7,9 +9,9 @@ import agent
 # If parsing fails, output everything to stderr
 data = json.load(sys.stdin)
 
-# Setup default values
-host = data.get("host")
 
+# TODO move this part to 90ldap. if an error occurs during set ldap on odoo
+# we need to set ODOO_LDAP_DOMAIN = "" otherwise user can't select anymore a domain!
 ldap_domain = data.get("ldap_domain", "")
 agent.set_env("ODOO_LDAP_DOMAIN", ldap_domain)
 
diff --git a/ui/public/i18n/en/translation.json b/ui/public/i18n/en/translation.json
@@ -29,6 +29,7 @@
         "odoo_fqdn": "Odoo FQDN",
         "ldap_domain": "LDAP domain",
         "no_domain": "No domain",
+        "change_ldap_domain_already_set": "Modify not available, a LDAP domain is already configured.",
         "save": "Save",
         "lets_encrypt": "Let's Encrypt",
         "http_to_https": "HTTP to HTTPS",

diff --git a/ui/public/i18n/it/translation.json b/ui/public/i18n/it/translation.json
@@ -11,6 +11,7 @@
         "odoo_fqdn": "FQDN Odoo",
         "ldap_domain": "Dominio LDAP",
         "no_domain": "Nessun dominio",
+        "change_ldap_domain_already_set": "Modifica non disponibile, un dominio LDAP è stato già configurato.",
         "disabled": "Disabilitato",
         "email_format": "Indirizzo e-mail non valido"
     },

diff --git a/ui/src/views/Settings.vue b/ui/src/views/Settings.vue
@@ -7,89 +7,63 @@
     </div>
     <div v-if="error.getConfiguration" class="bx--row">
       <div class="bx--col">
-        <NsInlineNotification
-          kind="error"
-          :title="$t('action.get-configuration')"
-          :description="error.getConfiguration"
-          :showCloseButton="false"
-        />
+        <NsInlineNotification kind="error" :title="$t('action.get-configuration')" :description="error.getConfiguration"
+          :showCloseButton="false" />
       </div>
     </div>
     <div class="bx--row">
       <div class="bx--col-lg-16">
         <cv-tile :light="true">
           <cv-form @submit.prevent="configureModule">
-            <cv-text-input
-              :label="$t('settings.odoo_fqdn')"
-              placeholder="odoo.example.org"
-              v-model.trim="host"
-              class="mg-bottom"
-              :invalid-message="$t(error.host)"
-              :disabled="loading.getConfiguration || loading.configureModule"
-              ref="host"
-            >
+            <cv-text-input :label="$t('settings.odoo_fqdn')" placeholder="odoo.example.org" v-model.trim="host"
+              class="mg-bottom" :invalid-message="$t(error.host)"
+              :disabled="loading.getConfiguration || loading.configureModule" ref="host">
             </cv-text-input>
-            <cv-toggle
-              value="letsEncrypt"
-              :label="$t('settings.lets_encrypt')"
-              v-model="isLetsEncryptEnabled"
-              :disabled="loading.getConfiguration || loading.configureModule"
-              class="mg-bottom"
-            >
+            <cv-toggle value="letsEncrypt" :label="$t('settings.lets_encrypt')" v-model="isLetsEncryptEnabled"
+              :disabled="loading.getConfiguration || loading.configureModule" class="mg-bottom">
               <template slot="text-left">{{
-                $t("settings.disabled")
-              }}</template>
+          $t("settings.disabled")
+        }}</template>
               <template slot="text-right">{{
-                $t("settings.enabled")
-              }}</template>
+            $t("settings.enabled")
+          }}</template>
             </cv-toggle>
-            <cv-toggle
-              value="httpToHttps"
-              :label="$t('settings.http_to_https')"
-              v-model="isHttpToHttpsEnabled"
-              :disabled="loading.getConfiguration || loading.configureModule"
-              class="mg-bottom"
-            >
+            <cv-toggle value="httpToHttps" :label="$t('settings.http_to_https')" v-model="isHttpToHttpsEnabled"
+              :disabled="loading.getConfiguration || loading.configureModule" class="mg-bottom">
               <template slot="text-left">{{
-                $t("settings.disabled")
-              }}</template>
+          $t("settings.disabled")
+        }}</template>
               <template slot="text-right">{{
-                $t("settings.enabled")
-              }}</template>
+            $t("settings.enabled")
+          }}</template>
             </cv-toggle>
-            <cv-select
-              :label="$t('settings.ldap_domain')"
-              v-model.trim="host"
-              v-model="selectedDomain"
-              class="mg-bottom"
-              :invalid-message="$t(error.host)"
-              :disabled="loading.getConfiguration || loading.configureModule"
-              ref="host"
-            >
-              <option v-for="(item, index) in ldapDomainOptions"
-                v-bind:value="item"
-                v-bind:key="index"
-              >
-                  {{item != "" ? item : $t("settings.no_domain")}}
-              </option>
-            </cv-select>
+            <div>
+              <label class="bx--toggle-input__label" for="selectedDomain" v-if="ldap_domain === ''">
+                {{ $t('settings.ldap_domain') }}
+              </label>
+              <label class="bx--toggle-input__label" for="selectedDomain" v-if="ldap_domain !== ''">
+                {{ $t('settings.ldap_domain') }} ({{$t('settings.change_ldap_domain_already_set')}})
+              </label>
+              <cv-select id="selectedDomain" v-model.trim="selectedDomain"
+                :label="''"
+                :title="ldap_domain === '' ? '' : $t('settings.change_ldap_domain_already_set')"
+                class="mg-bottom" :invalid-message="$t(error.ldap_domain)"
+                :disabled="loading.getConfiguration || loading.configureModule || ldap_domain !== ''"
+                ref="selectedDomain">
+                <option v-for="(item, index) in ldapDomainOptions" v-bind:value="item" v-bind:key="index"
+                  v-bind:selected="item === selectedDomain">
+                  {{ item !== "" ? item : $t("settings.no_domain") }}
+                </option>
+              </cv-select>
+            </div>
             <div v-if="error.configureModule" class="bx--row">
               <div class="bx--col">
-                <NsInlineNotification
-                  kind="error"
-                  :title="$t('action.configure-module')"
-                  :description="error.configureModule"
-                  :showCloseButton="false"
-                />
+                <NsInlineNotification kind="error" :title="$t('action.configure-module')"
+                  :description="error.configureModule" :showCloseButton="false" />
               </div>
             </div>
-            <NsButton
-              kind="primary"
-              :icon="Save20"
-              :loading="loading.configureModule"
-              :disabled="loading.getConfiguration || loading.configureModule"
-              >{{ $t("settings.save") }}</NsButton
-            >
+            <NsButton kind="primary" :icon="Save20" :loading="loading.configureModule"
+              :disabled="loading.getConfiguration || loading.configureModule">{{ $t("settings.save") }}</NsButton>
           </cv-form>
         </cv-tile>
       </div>
@@ -120,6 +94,7 @@ export default {
       },
       urlCheckInterval: null,
       host: "",
+      ldap_domain: "",
       isLetsEncryptEnabled: false,
       isHttpToHttpsEnabled: false,
       loading: {
@@ -201,6 +176,7 @@ export default {
     getConfigurationCompleted(taskContext, taskResult) {
       const config = taskResult.output;
       this.host = config.host;
+      this.ldap_domain = config.ldap_domain ? config.ldap_domain : "";
       this.selectedDomain = config.ldap_domain ? config.ldap_domain : "";
       this.ldapDomainOptions = config.ldap_available_domains ? config.ldap_available_domains : [""];
       this.isLetsEncryptEnabled = config.lets_encrypt;
@@ -245,6 +221,8 @@ export default {
         return;
       }
 
+      this.ldap_domain = this.selectedDomain;
+
       this.loading.configureModule = true;
       const taskAction = "configure-module";
 
@@ -274,7 +252,7 @@ export default {
           action: taskAction,
           data: {
             host: this.host,
-            ldap_domain: this.selectedDomain,
+            ldap_domain: this.ldap_domain,
             lets_encrypt: this.isLetsEncryptEnabled,
             http2https: this.isHttpToHttpsEnabled,
           },
@@ -292,13 +270,15 @@ export default {
         console.error(`error creating task ${taskAction}`, err);
         this.error.configureModule = this.getErrorMessage(err);
         this.loading.configureModule = false;
+        this.ldap_domain = "";
         return;
       }
     },
     configureModuleAborted(taskResult, taskContext) {
       console.error(`${taskContext.action} aborted`, taskResult);
       this.error.configureModule = this.core.$t("error.generic_error");
       this.loading.configureModule = false;
+      this.ldap_domain = "";
     },
     configureModuleCompleted() {
       this.loading.configureModule = false;
@@ -312,6 +292,7 @@ export default {
 
 <style scoped lang="scss">
 @import "../styles/carbon-utils";
+
 .mg-bottom {
   margin-bottom: $spacing-06;
 }

diff --git a/utils/README_DEV b/utils/README_DEV
@@ -7,6 +7,11 @@
 
 - bash build-images.sh && buildah push ghcr.io/innovyou/odoo:latest docker://ghcr.io/innovyou/odoo:development && add-module ghcr.io/innovyou/odoo:development 1
 
+- GITHUB PERSONAL TOKEN
+- - buildah login ghcr.io
+- - generate personal token on github (nardellu/innovyou | secret_key)
+
+
 ## remove module 
 
 - remove-module --no-preserve odoo106