Merge pull request #81 from ITxPT/refactor/fixes

merge refactor/fixes into develop

Author: lekotros

app/components/FileUpload.tsx

@@ -82,14 +82,15 @@ const FileUpload = (props: FileUploadProps): JSX.Element => {
     event: React.ChangeEvent<HTMLInputElement>
   ): Promise<void> => {
     if (event.target.files == null) {
-      return // TODO handle
+      return
     }
 
     for (const file of (event.target.files as any)) {
       const fileContext = {
         name: file.name,
         status: 'uploading',
-        progress: 0
+        progress: 0,
+        errorMessage: ''
       }
 
       await onUpload(file, (p) => {
@@ -98,7 +99,8 @@ const FileUpload = (props: FileUploadProps): JSX.Element => {
       }).then(res => {
         fileContext.progress = 100
         fileContext.status = 'uploaded'
-      }).catch(() => {
+      }).catch((err) => {
+        fileContext.errorMessage = err.response.statusText
         fileContext.status = 'error'
       }).finally(() => {
         updateFileContext(fileContext)

app/pages/jobs/[id]/files.tsx

@@ -119,8 +119,8 @@ const Profiles: NextPage = () => {
             disabled={disabled}
             onUpload={handleOnUpload}
             onChange={handleOnChange}
-            onError={() => {
-              return 'File will not be included in the validation'
+            onError={({ errorMessage }: { errorMessage: string }) => {
+              return `Error caught uploading file, message: ${errorMessage}`
             }}
           />
           <Button

app/public/profiles.json

@@ -36,7 +36,7 @@
         "name": "locationsAreReferencingTheSamePoint"
       },
       {
-        "name": "passingTimesHaveIncreasingTimes"
+        "name": "passingTimesIsNotDecreasing"
       },
       {
         "name": "stopPlaceQuayDistanceIsReasonable"
@@ -100,7 +100,7 @@
         "name": "locationsAreReferencingTheSamePoint"
       },
       {
-        "name": "passingTimesHaveIncreasingTimes"
+        "name": "passingTimesIsNotDecreasing"
       },
       {
         "name": "stopPlaceQuayDistanceIsReasonable"
@@ -152,7 +152,7 @@
         "name": "locationsAreReferencingTheSamePoint"
       },
       {
-        "name": "passingTimesHaveIncreasingTimes"
+        "name": "passingTimesIsNotDecreasing"
       },
       {
         "name": "stopPlaceQuayDistanceIsReasonable"

app/public/scripts.json

@@ -62,10 +62,10 @@
     ]
   },
   {
-    "name": "passingTimesHaveIncreasingTimes",
+    "name": "passingTimesIsNotDecreasing",
     "version": "0.0.1",
-    "description": "Passing times have increasing times",
-    "longDescription": "Make sure passing times have increasing times and day offsets"
+    "description": "Passing times don't have decreasing times",
+    "longDescription": "Make sure passing times don't have decreasing times and day offsets"
   },
   {
     "name": "stopPlaceQuayDistanceIsReasonable",

builtin/everyLineIsReferenced.js

@@ -8,12 +8,7 @@ const errors = require("errors");
 const types = require("types");
 const xpath = require("xpath");
 const linesPath = xpath.join(xpath.path.FRAMES, "ServiceFrame", "lines", "Line");
-const journeyLinePath = xpath.join(
-  xpath.path.FRAMES,
-  "TimetableFrame",
-  "vehicleJourneys",
-  "ServiceJourney",
-);
+
 /**
  * Make sure every Line is referenced from another element
  * @param {types.Context} ctx
@@ -32,10 +27,12 @@ function main(ctx) {
         return res;
       }
 
-      const lineRefsPath = xpath.join(journeyLinePath, `LineRef[@ref='${id}']`);
-      const refs = ctx.document.find(lineRefsPath).get();
+      const refExist = ctx.document
+        .find(".//LineRef")
+        .getOrElse(() => [])
+        .find((/** @type {types.Node} n */ n) => n.attr("ref").get() === id);
 
-      if (!refs || !refs.length) {
+      if (!refExist) {
         res.push(errors.ConsistencyError(
           `Missing reference for Line(@id=${id})`,
           { line: node.line() },

builtin/passingTimesHaveIncreasingTimes.js

@@ -1,9 +1,9 @@
 /**
- * @name passingTimesHaveIncreasingTimes
- * @overview Makes sure passing times have increasing times and day offsets
+ * @name passingTimesIsNotDecreasing
+ * @overview Makes sure passing times don't have decreasing times and day offsets
  * @author Concrete IT
  */
-const name = "passingTimesHaveIncreasingTimes";
+const name = "passingTimesIsNotDecreasing";
 const errors = require("errors");
 const types = require("types");
 const xpath = require("xpath");
@@ -17,7 +17,7 @@ const departureTimePath = xpath.join("DepartureTime");
 const departureOffsetPath = xpath.join("DepartureDayOffset");
 
 /**
- * Makes sure passing times have increasing times and day offsets
+ * Makes sure passing times don't have decreasing times and day offsets
  * @param {types.Context} ctx
  * @return {errors.ScriptError[]?}
  */
@@ -46,9 +46,9 @@ function worker(ctx) {
     const departureDayOffset = node.textAt(departureOffsetPath).get();
 
     if (i !== 0) {
-      if (prevDepartureTime >= arrivalTime && arrivalDayOffset === prevArrivalDayOffset) {
+      if (prevDepartureTime > arrivalTime && arrivalDayOffset === prevArrivalDayOffset) {
         res.push(errors.ConsistencyError(
-          `Expected passing time to increase in ServiceJourney(@id=${id}), TimetabledPassingTime(@id=${tid})`,
+          `Expected passing time to not decrease in ServiceJourney(@id=${id}), TimetabledPassingTime(@id=${tid})`,
           { line: node.line() },
         ));
       }

cmd/mqtt.go

@@ -8,14 +8,10 @@ import (
 	"fmt"
 	"log"
 	"net/http"
-	"net/url"
 	"sort"
 	"time"
 
 	"github.com/caarlos0/env/v6"
-	"github.com/concreteit/greenlight/internal"
-	"github.com/gorilla/websocket"
-	"github.com/koding/websocketproxy"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/spf13/cobra"
@@ -57,10 +53,8 @@ type WebConfig struct {
 
 func init() {
 	serverCmd.Flags().StringP("port", "p", "8080", "Which port to listen http server on")
-	serverCmd.Flags().StringP("mqtt-port", "", "1883", "Which port to listen mqtt server on")
 
 	viper.BindPFlag("port", serverCmd.Flags().Lookup("port"))
-	viper.BindPFlag("mqtt-port", serverCmd.Flags().Lookup("mqtt-port"))
 
 	rootCmd.AddCommand(serverCmd)
 
@@ -75,13 +69,6 @@ func startServer(cmd *cobra.Command, args []string) {
 		port = "8080"
 	}
 
-	broker, err := NewMQTTBroker(DefaultBrokerConfig())
-	if err != nil {
-		log.Fatalln(err)
-	}
-
-	broker.Start()
-
 	fs := http.FileServer(StaticDir{http.Dir("app/out")})
 	e := echo.New()
 	e.HTTPErrorHandler = func(err error, c echo.Context) {
@@ -214,15 +201,6 @@ func startServer(cmd *cobra.Command, args []string) {
 			return err
 		}
 
-		v.Subscribe(func(event internal.Event) {
-			switch event.Type {
-			case internal.EventTypeValidateDocumentStart, internal.EventTypeValidateDocumentStop:
-				broker.PublishMessage(fmt.Sprintf("sessions/%s/documents/%s", session.ID, event.Data["document"]), event)
-			case internal.EventTypeScriptStart, internal.EventTypeScriptStop:
-				broker.PublishMessage(fmt.Sprintf("sessions/%s/documents/%s/scripts/%s", session.ID, event.Data["document"], event.Data["script"]), event)
-			}
-		})
-
 		res, err := v.Validate(context.Background())
 		if err != nil {
 			session.Stopped = time.Now()
@@ -331,20 +309,6 @@ func startServer(cmd *cobra.Command, args []string) {
 		return c.String(http.StatusBadRequest, "unsupported file format")
 	})
 
-	u, err := url.Parse("ws://localhost:1888/ws")
-	if err != nil {
-		log.Fatalln(err)
-	}
-
-	wsProxy := websocketproxy.NewProxy(u)
-	wsProxy.Upgrader = &websocket.Upgrader{}
-	wsProxy.Upgrader.CheckOrigin = func(r *http.Request) bool { return true }
-
-	e.GET("/ws", func(c echo.Context) error {
-		wsProxy.ServeHTTP(c.Response(), c.Request())
-		return nil
-	})
-
 	e.Any("*", func(c echo.Context) error {
 		fs.ServeHTTP(c.Response(), c.Request())
 		return nil