diff --git a/questionnaire/index.html b/questionnaire/index.html
index 1af411e..8062be5 100644
--- a/questionnaire/index.html
+++ b/questionnaire/index.html
@@ -72,22 +72,7 @@
typeof fieldId == "object"
? fieldId
: document.getElementById(fieldId);
- return field && field.checked == true;
- },
- showHideMigrations: function () {
- const labels = document.querySelectorAll(
- 'label[for^="env.products-to-migrate."]'
- );
- for (var i = 0; i < labels.length; ++i) {
- var migration = labels[i].dataset.migration;
- if (migration) {
- if (view.state.migrate) {
- view.show(labels[i]);
- } else {
- view.hide(labels[i]);
- }
- }
- }
+ return field && (field.checked == true || field.selected);
},
};
@@ -146,24 +131,9 @@
entry: "entry.569243513",
},
{
- name: "products-to-migrate.none",
+ name: "products-to-migrate.none.yes",
entry: "entry.1803285821",
- },
- {
- name: "products-to-migrate.labfolder-labregister",
- entry: "entry.907467583",
- },
- {
- name: "products-to-migrate.laboperator",
- entry: "entry.48913136",
- },
- {
- name: "products-to-migrate.laboperator-workflow-editor",
- entry: "entry.319096810",
- },
- {
- name: "products-to-migrate.connector-manager",
- entry: "entry.2112004302",
+ default: "no"
},
{
name: "domain.use-customer-domain",
@@ -173,6 +143,10 @@
name: "domain.use-labfoward-domain",
entry: "entry.1714575381",
},
+ {
+ name: "domain.company-name",
+ entry: "entry.189162875",
+ },
{
name: "identity-provider.use-labforward-identity-provider",
entry: "entry.667719526",
@@ -185,50 +159,6 @@
name: "cloud.aws.region",
entry: "entry.1591949914",
},
- {
- name: "cloud.aws.account.name",
- entry: "entry.1403459674",
- },
- {
- name: "domain.labfolder.primary.fqdn",
- entry: "entry.1241608360",
- },
- {
- name: "domain.labregister.primary.fqdn",
- entry: "entry.9357705",
- },
- {
- name: "domain.laboperator.primary.fqdn",
- entry: "entry.904791097",
- },
- {
- name: "domain.laboperator-workflow-editor.primary.fqdn",
- entry: "entry.130957067",
- },
- {
- name: "domain.connector-manager.primary.fqdn",
- entry: "entry.717855287",
- },
- {
- name: "domain.labfolder.secondary.fqdn",
- entry: "entry.1308652127",
- },
- {
- name: "domain.labregister.secondary.fqdn",
- entry: "entry.142511199",
- },
- {
- name: "domain.laboperator.secondary.fqdn",
- entry: "entry.1609277239",
- },
- {
- name: "domain.laboperator-workflow-editor.secondary.fqdn",
- entry: "entry.1491024097",
- },
- {
- name: "domain.connector-manager.secondary.fqdn",
- entry: "entry.1491866007",
- },
],
};
@@ -264,35 +194,13 @@
if (view.isChecked("env.installation.cloud-based")) {
view.state.cloud_based = true;
- } else if (view.isChecked("env.installation.on-premise")) {
- view.state.cloud_based = false;
} else {
view.state.cloud_based = null;
}
- if (view.isChecked("env.products-to-migrate.none")) {
- view.state.migrate = false;
- } else {
- view.state.migrate = true;
- }
+ view.state.labfolder_labregister = view.isChecked("env.products-to-install.labfolder-labregister")
- if (view.isChecked("env.products-to-install.labfolder-labregister")) {
- view.state.labfolder_labregister = true;
- } else if (
- view.isChecked("env.products-to-migrate.labfolder-labregister")
- ) {
- view.state.labfolder_labregister = true;
- } else {
- view.state.labfolder_labregister = false;
- }
-
- if (view.isChecked("env.products-to-install.laboperator")) {
- view.state.laboperator = true;
- } else if (view.isChecked("env.products-to-migrate.laboperator")) {
- view.state.laboperator = true;
- } else {
- view.state.laboperator = false;
- }
+ view.state.laboperator = view.isChecked("env.products-to-install.laboperator");
laq.render();
},
@@ -300,14 +208,12 @@
view.show("send");
if (view.isChecked("env.installation.cloud-based")) {
- view.show("env.installation-plan.on-cloud");
view.show("env.cloud.aws");
view.hide("env.on-premise");
}
if (view.isChecked("env.installation.on-premise")) {
view.show("env.on-premise");
- view.hide("env.installation-plan.on-cloud");
view.hide("env.cloud.aws");
}
@@ -325,82 +231,7 @@
).checked = false;
}
- if (
- view.isChecked(
- "env.products-to-install.laboperator-workflow-editor"
- ) ||
- view.isChecked(
- "env.products-to-migrate.laboperator-workflow-editor"
- )
- ) {
- view.show(
- "env.domain.laboperator-workflow-editor.primary.fqdn.label"
- );
- if (view.isChecked("env.regulation.no-special-requirements")) {
- view.hide(
- "env.domain.laboperator-workflow-editor.secondary.fqdn.label"
- );
- }
- if (view.isChecked("env.regulation.gxp-operation")) {
- view.show(
- "env.domain.laboperator-workflow-editor.secondary.fqdn.label"
- );
- }
- } else {
- view.hide(
- "env.domain.laboperator-workflow-editor.primary.fqdn.label"
- );
- view.hide(
- "env.domain.laboperator-workflow-editor.secondary.fqdn.label"
- );
- }
-
- if (
- view.isChecked("env.products-to-install.connector-manager") ||
- view.isChecked("env.products-to-migrate.connector-manager")
- ) {
- view.show("env.domain.connector-manager.primary.fqdn.label");
- view.show("env.domain.connector-manager.secondary.fqdn.label");
- } else {
- view.hide("env.domain.connector-manager.primary.fqdn.label");
- view.hide("env.domain.connector-manager.secondary.fqdn.label");
- }
-
- view.showHideMigrations();
-
- if (view.state.regulation_requirements) {
- view.show("env.domain.secondary.fqdns");
- } else {
- view.hide("env.domain.secondary.fqdns");
- }
-
- if (view.state.laboperator) {
- view.show("env.domain.laboperator.primary.fqdn.label");
- view.show("env.domain.laboperator.secondary.fqdn.label");
- } else {
- view.hide("env.domain.laboperator.primary.fqdn.label");
- view.hide("env.domain.laboperator.secondary.fqdn.label");
- }
-
- if (view.state.labfolder_labregister) {
- view.show("env.domain.labfolder.primary.fqdn.label");
- view.show("env.domain.labregister.primary.fqdn.label");
- view.show("env.domain.labfolder.secondary.fqdn.label");
- view.show("env.domain.labregister.secondary.fqdn.label");
- } else {
- view.hide("env.domain.labfolder.primary.fqdn.label");
- view.hide("env.domain.labregister.primary.fqdn.label");
- view.hide("env.domain.labfolder.secondary.fqdn.label");
- view.hide("env.domain.labregister.secondary.fqdn.label");
- }
-
- if (view.state.labfolder_labregister || view.state.laboperator) {
- view.show("env.domain.domain-strategy");
- view.show("env.domain.fqdn");
- } else {
- view.hide("env.domain.domain-strategy");
- view.hide("env.domain.fqdn");
- }
+ view.show("env.domain.domain-strategy");
var products = "";
if (view.state.labfolder_labregister) {
@@ -451,7 +282,7 @@
laq.prepareSubmit();
},
useField: function (field) {
- if (typeof field != "object") {
+ if (typeof field != "object" || null == field) {
return false;
}
var notHidden = !field.classList.contains("laq-hidden");
@@ -465,7 +296,11 @@
var google_field = google_form.map_fields[i];
var field = document.getElementById("env." + google_field.name);
if (laq.useField(field)) {
- payload += google_field.entry + "=" + field.value + "&";
+ var value = field.value;
+ if (value == null){
+ value = google_field.default;
+ }
+ payload += google_field.entry + "=" + value + "&";
}
}
return payload;
@@ -527,11 +362,6 @@
-
- Installation plan
-
-
- The customer has to provide valid certificates for the - selected domains. Options to provide certificates are ---
-- - by automated certificate provisioning via cert-manager - and Let's Encrypt; -
-- or by providing cert files manually.
-
Workpackage | -Step # | -Title | -Description | -|
---|---|---|---|---|
WP1 | -- | Intrastucture | -- Provisioning and configuration of environment - infrastructure. - | -|
WP1 | -1 | -AWS account creation | -- Creation of the AWS account prerequisites for a new - dedicated cloud. - | -|
WP1 | -2 | -Primary EKS cluster provisioning | -- Creation of the primary cluster via our infrastructure - provisioning repository. - | -|
WP1 | -3 | -Secondary EKS cluster provisioning | -- Creation of the secondary cluster via our infrastructure - provisioning repository. - | -|
WP1 | -4 | -Network peering to customer networks | -- Setup of networking rules to connect the cluster to the - customer network. - | -|
WP1 | -5 | -Cluster DNS routing | -- Setup to DNS routing to make the cluster accessible via DNS. - | -|
WP2 | -- | Installation | -Installation of the Labforward Suite. | -|
WP2 | -1 | -Installation secondary environments | -- Installation of the Labforward Suite to environments of the - secondary cluster using Replicated. - | -- |
WP2 | -2 | -Installation primary environment | -- Installation of the Labforward Suite to the primary cluster - using Replicated. - | -|
WP3 | -- | Configuration | -Configuration of the Labforward Suite. | -|
WP3 | -1 | -Application configuration | -- Configuration of the Labforward applications via the Admin - Console. - | -|
WP3 | -2 | -Custom domain and certificate | -- Configuration of the customer-provided domain and - certificates. - | -|
WP3 | -3 | -Custom interface: Email | -Configuration of the customer-provided SMTP server. | -|
WP3 | -4 | -Custom interface: Identity Provider | -- Configuration of the customer-provided identity management. - | -|
WP4 | -- | Migration | -- Migration of application data from previous installations. - | -|
WP4 | -1 | -Migration of Laboperator data | -- Migration of application data from previous Laboperator, - Mender, and Workflow Editor installations. - | -|
WP4 | -2 | -Migration of Labfolder/Labregister data | -- Migration of application data from previous installations. - | -|
WP5 | -- | Validation | -Formal environment validation. | -|
WP5 | -1 | -Completion of validation documentation | -Formal environment validation. | -