dbm-graph-api 1.1.7 → 1.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm-graph-api",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -13,7 +13,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.741.0",
     "@aws-sdk/s3-request-presigner": "^3.741.0",
-    "dbm": "^1.1.4",
+    "dbm": "^1.1.5",
     "mime": "^4.0.6",
     "sharp": "^0.33.5",
     "ws": "^8.18.0"

package/src/dbm-graph-api/index.js

@@ -565,15 +565,19 @@ export const setupSite = function(aServer) {
                     }
                 }
 
-				returnString += `<link rel="preconnect" href="${process.env.S3_BUCKET_PUBLIC_PATH}" crossorigin>
-				<!-- Google Tag Manager -->
-				<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-				new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-				j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-				'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-				})(window,document,'script','dataLayer','GTM-K8BL9Q5S');</script>
-				<!-- End Google Tag Manager -->
-				<link rel="stylesheet" type="text/css" href="${assetsUri}css/main.css?version=${version}" />
+                if(site.disableSearchEngines) {
+                    returnString += `<meta name="robots" content="noindex, nofollow" />`;
+                }
+
+                {
+                    let currentArray = site.injectCodeSnippets;
+                    let currentArrayLength = currentArray.length;
+                    for(let i = 0; i < currentArrayLength; i++) {
+                        returnString += currentArray[i];
+                    }
+                }
+
+				returnString += `<link rel="stylesheet" type="text/css" href="${assetsUri}css/main.css?version=${version}" />
 				<meta name="viewport" content="initial-scale=1,user-scalable=yes" />
 				<meta name="HandheldFriendly" content="true" />
 				<link rel="icon" type="image/png" href="${assetsUri}img/favicon.png">
@@ -609,6 +613,7 @@ export const setupSite = function(aServer) {
 		<meta name="HandheldFriendly" content="true" />
 
         `;
+
 		{
             let currentArray = site.preconnectUrls;
             let currentArrayLength =currentArray.length;
@@ -616,23 +621,39 @@ export const setupSite = function(aServer) {
                 returnString += `<link rel="preconnect" href="${currentArray[i]}" crossorigin>`;
             }
         }
+
+        if(site.disableSearchEngines) {
+            returnString += `<meta name="robots" content="noindex, nofollow" />`;
+        }
+        else {
+            let robotsSettings = ["index", "follow"];
+            if(fields["seo/noIndex"]) {
+                robotsSettings[0] = "noindex";
+            }
+            if(fields["seo/nofollow"]) {
+                robotsSettings[1] = "nofollow";
+            }
+
+            let content = robotsSettings.join(", ");
+            returnString += `<meta name="robots" content="${content}" />`;
+        }
             
         returnString += `<title>${fields.title} - ${siteName}</title>
 
 		<meta property="og:type" content="website" />
 		<meta property="og:locale" content="${language}" />
 		<meta property="og:site_name" content="${siteName}" />
-		<meta property="og:title" content="${fields.title}" />
-
-		<!-- Google Tag Manager -->
-		<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-		new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-		j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-		'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-		})(window,document,'script','dataLayer','GTM-K8BL9Q5S');</script>
-		<!-- End Google Tag Manager -->
+		<meta property="og:title" content="${fields.title}" />`;
+
+		{
+                    let currentArray = site.injectCodeSnippets;
+                    let currentArrayLength = currentArray.length;
+                    for(let i = 0; i < currentArrayLength; i++) {
+                        returnString += currentArray[i];
+                    }
+                }
 		
-		<link rel="stylesheet" type="text/css" href="${assetsUri}css/main.css?version=${version}" />
+		returnString += `<link rel="stylesheet" type="text/css" href="${assetsUri}css/main.css?version=${version}" />
 		
 		<link rel="icon" type="image/png" href="${assetsUri}img/favicon.png">`;
 

package/src/dbm-graph-api/taskrunner/ExternalTaskRunner.js

@@ -10,6 +10,7 @@ export default class ExternalTaskRunner extends Dbm.core.BaseObject {
         this._intervalId = -1;
         this._timeBetween = 5;
 
+        this.item.requireProperty("name", "Unnamed task");
         this.item.requireProperty("url", null);
         this.item.requireProperty("method", "GET");
         this.item.requireProperty("headers", {});
@@ -28,7 +29,7 @@ export default class ExternalTaskRunner extends Dbm.core.BaseObject {
     }
 
     async _runNextTask() {
-        console.log("_runNextTask");
+        //console.log("_runNextTask");
 
         let runDirect = false;
 
@@ -47,7 +48,7 @@ export default class ExternalTaskRunner extends Dbm.core.BaseObject {
             let data = await response.json();
 
             let continueData = Dbm.objectPath(data, this.item.continueField);
-            console.log(continueData);
+            console.log(this.item.name + " " + continueData);
 
             if(continueData > 0) {
                 runDirect = true;