Merge branch 'cluster-order' into 'main'

reordering the generated domain resource file to put clusters before the domain

See merge request weblogic-cloud/weblogic-toolkit-ui!276

Author: robertpatrick

electron/app/locales/en/webui.json

@@ -1498,6 +1498,7 @@
   "k8s-domain-deployer-deploy-failed-error-message":"Unable to deploy WebLogic domain {{domainName}} to Kubernetes namespace {{domainNamespace}}: {{error}}.",
   "k8s-domain-deployer-deploy-catch-all-error-message": "WebLogic domain deployment to Kubernetes failed with an unexpected error: {{error}}",
   "k8s-domain-script-generator-invalid-target-domain-location": "Unknown value for target domain location {{targetDomainLocation}}",
+  "k8s-domain-script-generator-clusters-first-comment": "Create the cluster resources before the domain resource that references them.",
 
   "k8s-domain-undeployer-aborted-error-title": "Undeploying WebLogic Domain from Kubernetes Aborted",
   "k8s-domain-undeployer-remove-namespace-prompt-title": "Undeploy WebLogic Domain from Kubernetes Scope",

webui/src/js/utils/k8s-domain-v9-resource-generator.js

@@ -260,11 +260,15 @@ function(project, K8sDomainConfigMapGenerator, jsYaml, i18n, auxImageHelper) {
 
       let result;
       if (generateYaml) {
-        result = jsYaml.dump(domainResource, {}).split('\n');
+        result = [];
         for (const clusterResource of clusterResources) {
-          result.push('', '---', '');
+          if (result.length === 0) {
+            result.push(`# ${i18n.t('k8s-domain-script-generator-clusters-first-comment')}`, '#');
+          }
           result.push(...jsYaml.dump(clusterResource, {}).split('\n'));
+          result.push('---', '');
         }
+        result.push(...jsYaml.dump(domainResource, {}).split('\n'));
       } else {
         result = { domainResource };