Merge branch 'master' into release/v1.0.0

WIFI-1669 TIP 1.0 Update default container image tags in rel 1.0

.github/workflows/dockerpublish.yml

@@ -58,12 +58,11 @@ jobs:
 
           # Strip "v" prefix from tag name
           [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-
           # Create a release snapshot if we are on release branch
           [[ "${{ github.ref }}" == "refs/heads/release/"* ]] && VERSION=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\/release\/[v]//' | awk '{print $1"-SNAPSHOT"}')
 
           # Use Docker `latest` tag convention
-          [ "$VERSION" == "master" ] && VERSION=1.2.0-SNAPSHOT
+          [ "$VERSION" == "master" ] && VERSION=0.0.1-SNAPSHOT
 
           TIMESTAMP=$(date +'%Y-%m-%d')
           echo date=$TIMESTAMP > commit.properties
@@ -97,7 +96,7 @@ jobs:
           [[ "${{ github.ref }}" == "refs/heads/release/"* ]] && VERSION=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\/release\/[v]//' | awk '{print $1"-SNAPSHOT"}')
 
           # Use Docker `latest` tag convention
-          [ "$VERSION" == "master" ] && VERSION=1.2.0-SNAPSHOT
+          [ "$VERSION" == "master" ] && VERSION=0.0.1-SNAPSHOT
 
           echo IMAGE_ID=$IMAGE_ID
           echo VERSION=$VERSION

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wlan-cloud-graphql-apollo",
-  "version": "1.0.1",
+  "version": "0.3.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2181,9 +2181,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "version": "4.17.19",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
       "dev": true
     },
     "lodash.sortby": {

src/resolvers.js

@@ -381,22 +381,7 @@ const resolvers = {
   },
   Equipment: {
     baseMacAddress: ({ baseMacAddress }) => baseMacAddress && baseMacAddress.addressAsString,
-    manufacturer: async ({ customerId, id, baseMacAddress }, args, { dataSources }) => {
-      const manufacturerData = await dataSources.api.getEquipmentStatus(
-        customerId,
-        [id],
-        ['EQUIPMENT_MANUFACTURER_DATA']
-      );
-
-      if (
-        manufacturerData &&
-        manufacturerData[0] &&
-        manufacturerData[0].details &&
-        manufacturerData[0].details.manufacturerName
-      ) {
-        return manufacturerData[0].details.manufacturerName;
-      }
-
+    manufacturer: ({ baseMacAddress }, args, { dataSources }) => {
       return (
         baseMacAddress &&
         baseMacAddress.addressAsString &&