@eui/tools 6.5.6 → 6.6.0

package/.prettierrc.json

@@ -0,0 +1,19 @@
+{
+    "arrowParens": "always",
+    "bracketSameLine": true,
+    "bracketSpacing": true,
+    "embeddedLanguageFormatting": "auto",
+    "htmlWhitespaceSensitivity": "css",
+    "insertPragma": false,
+    "jsxSingleQuote": false,
+    "printWidth": 140,
+    "proseWrap": "preserve",
+    "quoteProps": "as-needed",
+    "requirePragma": false,
+    "semi": true,
+    "singleQuote": false,
+    "tabWidth": 4,
+    "trailingComma": "es5",
+    "useTabs": false,
+    "vueIndentScriptAndStyle": false
+}

package/.version.properties

@@ -1 +1 @@
-6.5.6
+6.6.0

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.6.0 (2023-03-05)
+
+##### New Features
+
+* **other:**
+  * added package init interactive for new v15 remote and pkg creation - removed all v10 v13 v7 skeleton code - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([17eaea2c](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/17eaea2c1ac869bf3efa5bf74e542f37e9628c29))
+
+* * *
+* * *
 ## 6.5.6 (2023-03-03)
 
 ##### Chores

package/bin/eui-scripts.js

@@ -31,6 +31,7 @@ const scriptIndex = args.findIndex(
     x === 'test-package' ||
     x === 'csdr-app' ||
     x === 'csdr-app-stats' ||
+    x === 'csdr-app-package-init' ||
     x === 'csdr-init' ||
     x === 'csdr-upgrade-deps' ||
     x === 'csdr-serve-app' ||
@@ -76,6 +77,7 @@ switch (script) {
     case 'generate-translations':
     case 'csdr-app':
     case 'csdr-app-stats':
+    case 'csdr-app-package-init':
     case 'csdr-init':
     case 'csdr-upgrade-deps':
     case 'csdr-serve-app':

package/bin/scripts/csdr-app-package-init.js

@@ -0,0 +1,16 @@
+'use strict';
+
+const tools = require('../../scripts/utils/tools');
+const initUtils = require('../../scripts/csdr/init/init-utils');
+
+Promise.resolve()
+  .then(() => {
+    return initUtils.remotes.initRemotesConfig();
+  })
+  .then(() => {
+    return tools.runScript('node ./node_modules/@eui/tools/scripts/app/server.js --prod --packageInit');
+  })
+  .catch((e) => {
+    console.log(e);
+    process.exit(1);
+  })

package/bin/scripts/csdr-cli.js

@@ -4,7 +4,7 @@ const cliUtils = require('../../scripts/csdr/cli/cli-utils');
 
 Promise.resolve()
   .then(() => {
-    return cliUtils.run();
+    return cliUtils.package.generate();
   })
   .catch((e) => {
     console.log(e);

package/package.json

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

package/scripts/app/public/index.html

@@ -4,9 +4,7 @@
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <script src="https://unpkg.com/vue@2"></script>
-        <link
-            rel="stylesheet"
-            href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" />
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" />
         <style>
             .full-height-flex {
                 display: flex;
@@ -29,37 +27,27 @@
         <div id="app" class="container-fluid">
             <div class="row">
                 <div class="col-4 full-height-flex">
-                    <h3 class="mt-2 mb-4">
-                        CSDR custom installation (experimental)
-                    </h3>
+                    <h3 class="mt-2 mb-4">CSDR custom installation (experimental)</h3>
 
                     <div class="header-flex">
                         <h5 class="mb-3">Choose an app / euiVersion</h5>
                         <form>
                             <div class="row mb-3">
-                                <label class="col-sm-2 col-form-label"
-                                    >App</label
-                                >
+                                <label class="col-sm-2 col-form-label">App</label>
                                 <div class="col-sm-10">
                                     <select disabled class="form-select">
                                         <option>Open this select menu</option>
-                                        <option selected value="my-workplace">
-                                            MyWorkplace
-                                        </option>
+                                        <option selected value="my-workplace">MyWorkplace</option>
                                         <!-- <option value="sedia">Sedia</option> -->
                                     </select>
                                 </div>
                             </div>
                             <div class="row mb-3">
-                                <label class="col-sm-2 col-form-label"
-                                    >eUI Version</label
-                                >
+                                <label class="col-sm-2 col-form-label">eUI Version</label>
                                 <div class="col-sm-10">
                                     <select disabled class="form-select">
                                         <option>Open this select menu</option>
-                                        <option selected value="15.x">
-                                            eUI 15
-                                        </option>
+                                        <option selected value="15.x">eUI 15</option>
                                         <!-- <option value="10.x">eUI 10</option> -->
                                     </select>
                                 </div>
@@ -70,18 +58,12 @@
                         <div class="d-flex align-items-center mt-2">
                             <h5>Select the remote(s) you want to work with:</h5>
                             <div class="ms-auto me-2">
-                                <button class="btn btn-light" @click="reset()">
-                                    reset
-                                </button>
+                                <button class="btn btn-light" @click="reset()">reset</button>
                             </div>
                         </div>
 
-                        <p class="text-warning fw-bold">
-                            select at least one remote to work on
-                        </p>
-                        <table
-                            class="table table-striped"
-                            v-show="remotes.length !== 0">
+                        <p class="text-warning fw-bold">select at least one remote to work on</p>
+                        <table class="table table-striped" v-show="remotes.length !== 0">
                             <thead>
                                 <tr>
                                     <th scope="col">&nbsp;</th>
@@ -93,9 +75,7 @@
                             <tbody>
                                 <tr v-for="remote in remotes">
                                     <td>
-                                        <div
-                                            class="form-check"
-                                            :key="remote.name">
+                                        <div class="form-check" :key="remote.name">
                                             <input
                                                 class="form-check-input"
                                                 type="checkbox"
@@ -107,14 +87,10 @@
                                     </td>
                                     <td>{{ remote.name }}</td>
                                     <td>
-                                        <div
-                                            :class="{ 'text-primary fw-bold': remote.participant }">
-                                            {{ remote.participant }}
-                                        </div>
+                                        <div :class="{ 'text-primary fw-bold': remote.participant }">{{ remote.participant }}</div>
                                     </td>
                                     <td>
-                                        <div
-                                            :class="{ 'text-success fw-bold': remote.fullSkeletonSources }">
+                                        <div :class="{ 'text-success fw-bold': remote.fullSkeletonSources }">
                                             {{ remote.fullSkeletonSources }}
                                         </div>
                                     </td>
@@ -127,66 +103,46 @@
                 <div class="col-8">
                     <h5 class="mt-5 mb-3">
                         Selected remotes :
-                        <span class="text-primary fw-bold">{{
-                            selectedRemotes.length
-                        }}</span>
+                        <span class="text-primary fw-bold">{{ selectedRemotes.length }}</span>
                     </h5>
                     {{ selectedRemotes }}
 
                     <h5 class="mt-5 mb-3">
                         Derived dependencies:
-                        <span class="text-primary fw-bold">{{
-                            deps.length
-                        }}</span>
+                        <span class="text-primary fw-bold">{{ deps.length }}</span>
                     </h5>
                     {{ deps }}
 
                     <h5 class="mt-5 mb-3">
                         Derived UI packages to be locally cloned :
-                        <span class="text-primary fw-bold">{{
-                            packages.length
-                        }}</span>
+                        <span class="text-primary fw-bold">{{ packages.length }}</span>
                     </h5>
                     {{ packages }}
 
                     <h5 class="mt-5 mb-3">
                         Remotes to install as dependencies :
-                        <span class="text-primary fw-bold">{{
-                            remotesToInstall.length
-                        }}</span>
+                        <span class="text-primary fw-bold">{{ remotesToInstall.length }}</span>
                     </h5>
                     {{ remotesToInstall }}
 
                     <hr />
 
-                    <button
-                        class="btn btn-primary"
-                        type="button"
-                        :disabled="selectedRemotes.length === 0"
-                        @click="saveConfig()">
+                    <button class="btn btn-primary" type="button" :disabled="selectedRemotes.length === 0" @click="saveConfig()">
                         Save configuration
                     </button>
 
                     <div v-if="saveConfigSubmitted" class="mt-2">
-                        <div v-if="saveConfigOK" class="alert alert-success">
-                            Configuration successfully saved
-                        </div>
-                        <div v-if="!saveConfigOK" class="alert alert-danger">
-                            Error saving configuration
-                        </div>
+                        <div v-if="saveConfigOK" class="alert alert-success">Configuration successfully saved</div>
+                        <div v-if="!saveConfigOK" class="alert alert-danger">Error saving configuration</div>
 
                         <div class="alert alert-info mt-2">
                             <p>
-                                <span class="fw-bold"
-                                    >./csdr/.euirc-csdr-custom.json</span
-                                >
+                                <span class="fw-bold">./csdr/.euirc-csdr-custom.json</span>
                                 generated
                             </p>
                             <p>
                                 Execute after the
-                                <strong>npm run init -- --custom</strong> from
-                                your command line to follow progress of
-                                installation
+                                <strong>npm run init -- --custom</strong> from your command line to follow progress of installation
                             </p>
                         </div>
                     </div>
@@ -195,109 +151,5 @@
         </div>
     </body>
 
-    <script>
-        const getRequestBody = (items) => {
-            return {
-                method: "POST",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                body: JSON.stringify(items),
-            };
-        };
-
-        new Vue({
-            el: "#app",
-            data() {
-                return {
-                    remotes: [],
-                    selectedRemotes: [],
-                    deps: [],
-                    packages: [],
-                    remotesToInstall: [],
-                    saveConfigSubmitted: false,
-                    saveConfigOK: false,
-                };
-            },
-            created() {
-                this.getRemotes();
-                this.getConfig();
-            },
-            methods: {
-                async getRemotes() {
-                    const res = await fetch(
-                        "http://localhost:3000/api/remotes"
-                    );
-                    const finalRes = await res.json();
-                    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",
-                        getRequestBody(this.selectedRemotes)
-                    );
-                    const finalRes = await res.json();
-                    this.packages = finalRes.packages.filter(
-                        (p) =>
-                            p.indexOf("csdr-") < 0 &&
-                            p.indexOf("cc-shared-ui") < 0 &&
-                            p.indexOf("mywp-shared-ui") < 0
-                    );
-                    this.deps = finalRes.deps;
-                    this.getRemotesToInstall();
-                },
-                remoteSelected(event) {
-                    this.getPackages();
-                    this.saveConfigSubmitted = false;
-                },
-                getRemotesToInstall() {
-                    this.remotesToInstall = this.remotes
-                        .map((r) => r.name)
-                        .filter((r) => {
-                            return !this.selectedRemotes.includes(r);
-                        });
-                },
-                reset() {
-                    this.selectedRemotes = [];
-                    this.packages = [];
-                    this.deps = [];
-                    this.remotesToInstall = [];
-                    this.saveConfigOK = false;
-                    this.saveConfigSubmitted = false;
-                },
-                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,
-                        })
-                    );
-
-                    if (res.status !== 200) {
-                        this.saveConfigOK = false;
-                    } else {
-                        this.saveConfigOK = true;
-                    }
-                    this.saveConfigSubmitted = true;
-
-                    const finalRes = await res.json();
-                },
-            },
-        });
-    </script>
+    <script src="index.js"></script>
 </html>

package/scripts/app/public/index.js

@@ -0,0 +1,95 @@
+const getRequestBody = (items) => {
+    return {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify(items),
+    };
+};
+
+new Vue({
+    el: "#app",
+    data() {
+        return {
+            remotes: [],
+            selectedRemotes: [],
+            deps: [],
+            packages: [],
+            remotesToInstall: [],
+            saveConfigSubmitted: false,
+            saveConfigOK: false,
+        };
+    },
+    created() {
+        this.getRemotes();
+        this.getConfig();
+    },
+    methods: {
+        async getRemotes() {
+            const res = await fetch("http://localhost:3000/api/remotes");
+            const finalRes = await res.json();
+            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", getRequestBody(this.selectedRemotes));
+            const finalRes = await res.json();
+            this.packages = finalRes.packages.filter(
+                (p) => p.indexOf("csdr-") < 0 && p.indexOf("cc-shared-ui") < 0 && p.indexOf("mywp-shared-ui") < 0
+            );
+            this.deps = finalRes.deps;
+            this.getRemotesToInstall();
+        },
+        remoteSelected(event) {
+            this.getPackages();
+            this.saveConfigSubmitted = false;
+        },
+        getRemotesToInstall() {
+            this.remotesToInstall = this.remotes
+                .map((r) => r.name)
+                .filter((r) => {
+                    return !this.selectedRemotes.includes(r);
+                });
+        },
+        reset() {
+            this.selectedRemotes = [];
+            this.packages = [];
+            this.deps = [];
+            this.remotesToInstall = [];
+            this.saveConfigOK = false;
+            this.saveConfigSubmitted = false;
+        },
+        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,
+                })
+            );
+
+            if (res.status !== 200) {
+                this.saveConfigOK = false;
+            } else {
+                this.saveConfigOK = true;
+            }
+            this.saveConfigSubmitted = true;
+
+            const finalRes = await res.json();
+        },
+    },
+});