Merge pull request #311 from smartdevicelink/develop

RaedAlmomani · web-flow · commit 3d66fd1e470a · 2022-10-26T11:09:27.000-04:00
sdl_server - Release 3.1.0
diff --git a/app/v1/messages/helper.js b/app/v1/messages/helper.js
@@ -26,6 +26,7 @@ function validatePost (req, res) {
         return;
     }
     for (let i = 0; i < req.body.messages.length; i++) {
+        let foundEnUsObj = false;
         const msg = req.body.messages[i];
         if (!check.string(msg.message_category) || !check.boolean(msg.is_deleted) ) {
             res.parcel
@@ -35,24 +36,26 @@ function validatePost (req, res) {
         }
         for (let j = 0; j < msg.languages.length; j++) {
             const lang = msg.languages[j];
+            if (lang.language_id === 'en-us' && lang.selected === true) {
+                foundEnUsObj = true;
+            }
             if (
                 !check.string(lang.language_id)
                 || !check.boolean(lang.selected)
-                || (
-                    !check.string(lang.line1)
-                    && !check.string(lang.line2)
-                    && !check.string(lang.tts)
-                    && !check.string(lang.text_body)
-                    && !check.string(lang.label)
-                    )
                 )
                 {
                     res.parcel
                         .setStatus(400)
-                        .setMessage("Required for language: language_id, selected, and at least one of the following: line1, line2, tts, text_body, label");
+                        .setMessage("Required for language: language_id, selected");
                     return;
             }
         }
+        if (!foundEnUsObj) {
+            res.parcel
+                .setStatus(400)
+                .setMessage("There must be a en-us language object defined");
+            return;
+        }
     }
 }
 
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.9"
+version: "2.1"
 services:
   server:
     build:
@@ -36,4 +36,4 @@ services:
       POSTGRES_USER: "${DB_USER:-postgres}"
       POSTGRES_DB: "${DB_DATABASE:-postgres}"
 volumes:
-  data:
+  data:
diff --git a/index.js b/index.js
@@ -40,7 +40,11 @@ function start (overrideApp) {
     }
 
     //load up the html, js and css content that makes up the UI
-    app.use(express.static(__dirname + '/dist'));
+    // do not serve the compiled version of the code if we are running in dev mode
+    // we want hot reloading managed by the webpack dev server instead
+    if (process.env.RUN_STATE !== 'dev') {
+        app.use(express.static(__dirname + '/dist'));
+    }
     //expose everything in the static folder
     app.use(express.static(__dirname + '/static'));
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sdl_policy_server",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "license": "BSD-3-Clause",
   "description": "Integrates with SHAID to allow managing app permissions through policy tables",
   "author": "Livio",
@@ -27,7 +27,7 @@
     "bootstrap": "4.5.2",
     "bootstrap-vue": "2.17.3",
     "check-types": "7.3.0",
-    "core-js": "^3.6.5",
+    "core-js": "^3.22.8",
     "cors": "^2.8.5",
     "cron": "1.3.0",
     "db-migrate": "^0.11.10",
@@ -37,7 +37,7 @@
     "helmet": "^3.15.1",
     "jquery": "^3.4.1",
     "lodash": "^4.17.21",
-    "moment": "^2.29.3",
+    "moment": "^2.29.4",
     "mustache": "^3.0.1",
     "nodemailer": "^6.6.1",
     "pem": "^1.14.2",
@@ -53,25 +53,25 @@
     "vue": "^2.6.11",
     "vue-json-pretty": "1.3.5",
     "vue-ladda": "0.0.13",
-    "vue-resource": "1.3.4",
+    "vue-resource": "1.5.3",
     "vue-router": "2.7.0",
     "vue-scrollto": "2.11.0",
     "vue-session": "0.9.10",
     "winston": "2.3.1",
     "xml2js": "0.4.19"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-eslint": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
+    "@vue/cli-plugin-babel": "5.0.4",
+    "@vue/cli-plugin-eslint": "5.0.4",
+    "@vue/cli-service": "5.0.4",
     "babel-eslint": "^10.1.0",
     "chai": "^4.2.0",
     "chai-http": "^4.2.1",
     "chai-json-schema": "^1.5.0",
     "chalk": "2.0.1",
     "connect-history-api-fallback": "1.3.0",
     "cssnano": "^5.0.17",
-    "eslint": "^6.7.2",
+    "eslint": "^7.32.0",
     "eslint-plugin-vue": "^6.2.2",
     "eventsource-polyfill": "0.9.6",
     "express": "4.16.0",
diff --git a/src/components/ConsumerMessageDetails.vue b/src/components/ConsumerMessageDetails.vue
@@ -184,6 +184,11 @@
                             if (parsed.data.messages && parsed.data.messages.length) {
                                 this.message = parsed.data.messages[0];
                                 console.log(this.message);
+                                // force en-us to exist in the webpage
+                                if (this.message && this.message.languages) {
+                                    const lang = this.message.languages.find(element => element.language_id === 'en-us');
+                                    lang.selected = true;
+                                }
                             } else {
                                 console.log("No message data returned");
                             }
diff --git a/src/components/common/MessageItem.vue b/src/components/common/MessageItem.vue
@@ -2,9 +2,10 @@
     <div v-if="item.selected" class="white-box rpc-container">
         <h5></h5>
         <h5>{{ item.language_id }}
+            <!-- Do not allow en-us to be deletable. It is required by core -->
             <i
                 v-on:click="removeLanguage()"
-                v-if="!fieldsDisabled"
+                v-if="!fieldsDisabled && item.language_id !== 'en-us'"
                 class="pointer pull-right fa fa-times hover-color-red"
                 aria-hidden="true">
             </i>
diff --git a/src/components/common/VehicleDataItem.vue b/src/components/common/VehicleDataItem.vue
@@ -21,7 +21,8 @@
                 <div class="form-group row">
                     <label class="col-sm-2 col-form-label">{{ propsDisplay[propName].display.toUpperCase() }}</label>
                     <div class="col-sm-10">
-                        <input v-model="item[propName]" :disabled="fieldsDisabled || (level === 1 && item.id)" class="form-control">
+                        <input v-model="item[propName]" :disabled="fieldsDisabled || (level === 1 && item.id)" class="form-control"
+                            @input="updateNameOrKey(propName, $event.target.value)">
                     </div>
                     <p v-if="findCommonParams(item[propName]) === 'CUSTOM'">
                         <br>A parent or top level vehicle data item with this name already exists! By saving, you will overwrite the previously existing vehicle data.
@@ -55,7 +56,8 @@
                 <div class="form-group row">
                     <label class="col-sm-2 col-form-label">{{ propsDisplay[propName].display.toUpperCase() }}</label>
                     <div class="col-sm-10">
-                        <input v-model="item[propName]" :disabled="fieldsDisabled" class="form-control">
+                        <input v-model="item[propName]" :disabled="fieldsDisabled" class="form-control"
+                            @input="updateNameOrKey(propName, $event.target.value)">
                     </div>
                 </div>
             </template>
@@ -170,6 +172,12 @@
                 }
                 this.item[propName] = Math.max(0, Math.round(val));
             },
+            updateNameOrKey: function (propName, val) {
+                // Checks for the invalid characters "!@#$%^&*", and whitespace characters that would be rejected by SDL Core
+                if (/[!@#$%^&*\s]/g.test(val)) {
+                    return this.item[propName] = null;
+                }
+            },
             updateIntegerNumber: function (propName, val) {
                 if (val === "-") {
                     return val;
diff --git a/test/api/v1/messages/messages.js b/test/api/v1/messages/messages.js
@@ -26,7 +26,11 @@ common.startTest('should create new message', async function () {
             {
                 message_category: 'Blarg',
                 is_deleted: false,
-                languages: []
+                languages: [{
+                    language_id: 'en-us',
+                    selected: true,
+                    line1: ''
+                }]
             }
         ]
     });
diff --git a/vue.config.js b/vue.config.js
@@ -7,7 +7,10 @@ const app = require('./index.js');
 
 module.exports = {
     devServer: {
-        before: app,
+        setupMiddlewares: (middleware, server) => {
+            app(server.app);
+            return middleware;
+        },
         port: settings.policyServerPort
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ function validatePost (req, res) {`
`26`	`26`	`return;`
`27`	`27`	`}`
`28`	`28`	`for (let i = 0; i < req.body.messages.length; i++) {`
	`29`	`+ let foundEnUsObj = false;`
`29`	`30`	`const msg = req.body.messages[i];`
`30`	`31`	`if (!check.string(msg.message_category) \|\| !check.boolean(msg.is_deleted) ) {`
`31`	`32`	`res.parcel`
`@@ -35,24 +36,26 @@ function validatePost (req, res) {`
`35`	`36`	`}`
`36`	`37`	`for (let j = 0; j < msg.languages.length; j++) {`
`37`	`38`	`const lang = msg.languages[j];`
	`39`	`+ if (lang.language_id === 'en-us' && lang.selected === true) {`
	`40`	`+ foundEnUsObj = true;`
	`41`	`+ }`
`38`	`42`	`if (`
`39`	`43`	`!check.string(lang.language_id)`
`40`	`44`	`\|\| !check.boolean(lang.selected)`
`41`		`- \|\| (`
`42`		`- !check.string(lang.line1)`
`43`		`- && !check.string(lang.line2)`
`44`		`- && !check.string(lang.tts)`
`45`		`- && !check.string(lang.text_body)`
`46`		`- && !check.string(lang.label)`
`47`		`- )`
`48`	`45`	`)`
`49`	`46`	`{`
`50`	`47`	`res.parcel`
`51`	`48`	`.setStatus(400)`
`52`		`- .setMessage("Required for language: language_id, selected, and at least one of the following: line1, line2, tts, text_body, label");`
	`49`	`+ .setMessage("Required for language: language_id, selected");`
`53`	`50`	`return;`
`54`	`51`	`}`
`55`	`52`	`}`
	`53`	`+ if (!foundEnUsObj) {`
	`54`	`+ res.parcel`
	`55`	`+ .setStatus(400)`
	`56`	`+ .setMessage("There must be a en-us language object defined");`
	`57`	`+ return;`
	`58`	`+ }`
`56`	`59`	`}`
`57`	`60`	`}`
`58`	`61`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,11 @@ common.startTest('should create new message', async function () {`
`26`	`26`	`{`
`27`	`27`	`message_category: 'Blarg',`
`28`	`28`	`is_deleted: false,`
`29`		`- languages: []`
	`29`	`+ languages: [{`
	`30`	`+ language_id: 'en-us',`
	`31`	`+ selected: true,`
	`32`	`+ line1: ''`
	`33`	`+ }]`
`30`	`34`	`}`
`31`	`35`	`]`
`32`	`36`	`});`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,10 @@ const app = require('./index.js');`
`7`	`7`
`8`	`8`	`module.exports = {`
`9`	`9`	`devServer: {`
`10`		`- before: app,`
	`10`	`+ setupMiddlewares: (middleware, server) => {`
	`11`	`+ app(server.app);`
	`12`	`+ return middleware;`
	`13`	`+ },`
`11`	`14`	`port: settings.policyServerPort`
`12`	`15`	`}`
`13`	`16`	`}`