@eui/tools 6.5.1 → 6.5.3

package/.version.properties

@@ -1 +1 @@
-6.5.1
+6.5.3

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 6.5.3 (2023-03-02)
+
+##### Chores
+
+* **other:**
+  * Apply SonarQube Citnet naming convention MWP-9366 [MWP-9366](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9366)  ([3f31397d](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/3f31397d90c20deab0060dc3e71087b96fc6b390))
+  * SonarQube Citnet nameing convention  ([bc50d5c3](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/bc50d5c3bab190a975e862f9b55d4a0af6628c30))
+  * Change name for soanrqube template for project key. Name remains the same, key has to be changed to comply  ([5a1a420e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/5a1a420eb3991eeab2b99ed8a5a74af86d416e20))
+
+* * *
+* * *
+## 6.5.2 (2023-03-02)
+
+##### Chores
+
+* **other:**
+  * enhanced csdr-app for custom installation of MWP - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([f457624e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f457624e91b20020bc47704e5a5fd27589026f35))
+
+* * *
+* * *
 ## 6.5.1 (2023-03-01)
 
 ##### Chores

package/LICENSE

@@ -293,3 +293,4 @@ Appendix
 * Common Public License v. 1.0
 * Eclipse Public License v. 1.0
 * Cecill v. 2.0
+

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.5.1",
+    "version": "6.5.3",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/scripts/app/public/index.html

@@ -156,7 +156,8 @@
                     <button
                         class="btn btn-primary"
                         type="button"
-                        :disabled="selectedRemotes.length === 0">
+                        :disabled="selectedRemotes.length === 0"
+                        @click="saveConfig()">
                         Save configuration
                     </button>
 
@@ -202,6 +203,7 @@
             },
             created() {
                 this.getRemotes();
+                this.getConfig();
             },
             methods: {
                 async getRemotes() {
@@ -212,6 +214,18 @@
                     this.remotes = finalRes;
                     this.getRemotesToInstall();
                 },
+                async getConfig() {
+                    const res = await fetch(
+                        "http://localhost:3000/api/config"
+                    );
+                    const finalRes = await res.json();
+                    if (finalRes.selectedRemotes) {
+                        this.selectedRemotes = finalRes.selectedRemotes;
+                        this.deps = finalRes.deps;
+                        this.packages = finalRes.packages;
+                        this.remotesToInstall = finalRes.remotesToInstall;
+                    }
+                },
                 async getPackages() {
                     const res = await fetch(
                         "http://localhost:3000/api/remotes/packages",
@@ -237,6 +251,19 @@
                             return !this.selectedRemotes.includes(r);
                         });
                 },
+                async saveConfig() {
+                    console.log('Saving configuration...');
+                    const res = await fetch(
+                        "http://localhost:3000/api/config",
+                        getRequestBody({
+                            selectedRemotes: this.selectedRemotes,
+                            deps: this.deps,
+                            packages: this.packages,
+                            remotesToInstall: this.remotesToInstall
+                        })
+                    );
+                    const finalRes = await res.json();
+                },
             },
         });
     </script>

package/scripts/app/routes/index.js

@@ -60,6 +60,31 @@ router.post('/remotes/stats', function (req, res) {
 });
 
 
+router.get('/config', function (req, res) {
+  return Promise.resolve()
+    .then(() => {
+      return configUtils.global.getCustomConfig();
+    })
+    .then((customConfig) => {
+      res.send(customConfig);
+    })
+    .catch((e) => {
+      console.log(e);
+    })
+});
+
+
+
+router.post('/config', function (req, res) {
+  return Promise.resolve()
+    .then(() => {
+      return configUtils.global.generateCustomConfig(req.body);
+    })
+    .catch((e) => {
+      console.log(e);
+    })
+});
+
 
 // Export API routes
 module.exports = router;

package/scripts/csdr/config/global.js

@@ -405,3 +405,17 @@ module.exports.getLocalEuiVersion = () => {
     return null;
   }
 }
+
+
+module.exports.generateCustomConfig = (customConfig) => {
+  const configFile = path.join(process.cwd(), '.csdr', '.euirc-csdr-custom.json');
+
+  return tools.writeJsonFileSync(configFile, customConfig);
+}
+
+
+module.exports.getCustomConfig = () => {
+  const configFile = path.join(process.cwd(), '.csdr', '.euirc-csdr-custom.json');
+
+  return tools.getJsonFileContent(configFile) || null;
+}

package/scripts/csdr/templates/sonar-project-backend.template

@@ -1,4 +1,4 @@
-sonar.projectKey=@project.groupid@.@project.name@
+sonar.projectKey=CSDR-@project.groupid@.@project.name@
 sonar.projectName=@project.name@
 sonar.projectVersion=@project.version@
 

package/scripts/csdr/templates/sonar-project.template

@@ -1,4 +1,4 @@
-sonar.projectKey=eu.europa.ec.digit.eui.@project.name@
+sonar.projectKey=CSDR-@project.name@
 sonar.projectName=@project.name@
 sonar.projectVersion=@project.version@