Skip to content

Commit

Permalink
added validate page boilerplate
Browse files Browse the repository at this point in the history
  • Loading branch information
sathiyajith committed Sep 17, 2022
1 parent 99e6ba7 commit fdd9f7a
Show file tree
Hide file tree
Showing 15 changed files with 39 additions and 64 deletions.
5 changes: 0 additions & 5 deletions PARS/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,6 @@
<artifactId>json</artifactId>
<version>20220320</version>
</dependency>
<dependency>
<groupId>de.jensd</groupId>
<artifactId>fontawesomefx-fontawesome</artifactId>
<version>4.7.0-9.1.2</version>
</dependency>
</dependencies>
<name>PARS</name>
</project>
3 changes: 2 additions & 1 deletion PARS/src/main/java/com/satks/pars/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ public void start(Stage primaryStage) throws IOException {
root = FXMLLoader.load(getClass().getResource("MainPage.fxml"));
Scene landingScene = new Scene(root, 1500, 800);
primaryStage.setScene(landingScene);
primaryStage.setTitle("PASV");
primaryStage.setTitle("PARS");
primaryStage.setResizable(false);
primaryStage.show();
}

Expand Down
14 changes: 0 additions & 14 deletions PARS/src/main/java/com/satks/pars/FeedbackPageController.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
package com.satks.pars;

import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.ResourceBundle;
import java.util.logging.Level;
import java.util.logging.Logger;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.web.WebView;
Expand All @@ -21,15 +16,6 @@ public class FeedbackPageController implements Initializable {

@Override
public void initialize(URL url, ResourceBundle rb) {
/*
try {
java.awt.Desktop.getDesktop().browse(new URI("www.google.com"));
} catch (URISyntaxException ex) {
Logger.getLogger(FeedbackPageController.class.getName()).log(Level.SEVERE, null, ex);
} catch (IOException ex) {
Logger.getLogger(FeedbackPageController.class.getName()).log(Level.SEVERE, null, ex);
}
*/
webEngine = webView.getEngine();
webEngine.load("file://D:/code/GITHUB_Projects/PARS/PARS/src/main/resources/com/satks/pars/FeedbackPage.html");
}
Expand Down
4 changes: 2 additions & 2 deletions PARS/src/main/java/com/satks/pars/MainPageController.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ private void loadFeedbackPage(MouseEvent event)
}

@FXML
private void loadUpgradePage(MouseEvent event)
private void loadValidatePage(MouseEvent event)
{
loadPage("UpgradePage.fxml");
loadPage("ValidatePage.fxml");
}

private void loadPage(String page)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public List<JSONObject> getMatcherConditions()
public String groupInterval;
public String defaultReceiver;
public final static AlertManager instance = new AlertManager();

public static JSONObject json;

public void setConfig(String config)
{
Expand Down Expand Up @@ -91,7 +91,7 @@ public void ParseConfig()
{
Yaml yaml = new Yaml();
Map<String, Object> obj = yaml.load(this.config);
JSONObject json = new JSONObject(obj);
json = new JSONObject(obj);
//System.out.println(json);
setReceivers(json);
setRoutes(json);
Expand Down
5 changes: 4 additions & 1 deletion PARS/src/main/java/com/satks/pars/UploadPageController.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ public class UploadPageController implements Initializable {
private GridPane uploadpageFx;
@FXML
private VBox ruleBoxFx;

@FXML
private Button plusButtonFx;

@Override
public void initialize(URL url, ResourceBundle rb)
Expand Down Expand Up @@ -121,6 +122,7 @@ private void SubmitThanosFile(MouseEvent event)
rulePath = file.getPath();
Label rulePathFx = (Label)App.root.lookup("#rulePathFx"+App.numRules);
rulePathFx.setText(rulePath);
plusButtonFx.setDisable(false);
}
}

Expand Down Expand Up @@ -173,6 +175,7 @@ public void handle(MouseEvent event) {
ruleBoxFx.getChildren().add(controlBox);
ruleBoxFx.setSpacing(10);
ruleBoxFx.setPadding(new Insets(10,10,10,10));
plusButtonFx.setDisable(true);
}


Expand Down
16 changes: 16 additions & 0 deletions PARS/src/main/java/com/satks/pars/ValidatePageController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

package com.satks.pars;

import com.satks.pars.Prometheus.AlertManager;
import java.net.URL;
import java.util.ResourceBundle;
import javafx.fxml.Initializable;

public class ValidatePageController implements Initializable {

@Override
public void initialize(URL url, ResourceBundle rb) {
System.out.println(AlertManager.json);
}

}
17 changes: 0 additions & 17 deletions PARS/src/main/resources/com/satks/pars/FeedbackPage.js

This file was deleted.

2 changes: 1 addition & 1 deletion PARS/src/main/resources/com/satks/pars/MainPage.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
</font>
</Label>
<Button maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onMouseClicked="#loadUploadPage" prefHeight="150.0" prefWidth="200.0" styleClass="buttons" text="Upload" />
<Button maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onMouseClicked="#loadValidatePage" prefHeight="150.0" prefWidth="200.0" styleClass="buttons" text="Validate" />
<Button layoutX="10.0" layoutY="310.0" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onMouseClicked="#loadVisualizePage" prefHeight="150.0" prefWidth="200.0" styleClass="buttons" text="Visualize" />
<Button layoutX="10.0" layoutY="510.0" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onMouseClicked="#loadFeedbackPage" prefHeight="150.0" prefWidth="200.0" styleClass="buttons" text="Feedback" />
<Button layoutX="10.0" layoutY="710.0" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onMouseClicked="#loadUpgradePage" prefHeight="150.0" prefWidth="200.0" styleClass="buttons" text="Upgrade" />
</children>
</VBox>
</left>
Expand Down
18 changes: 0 additions & 18 deletions PARS/src/main/resources/com/satks/pars/UpgradePage.fxml

This file was deleted.

2 changes: 1 addition & 1 deletion PARS/src/main/resources/com/satks/pars/UploadPage.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<Insets bottom="10.0" right="10.0" top="10.0" />
</HBox.margin>
</Button>
<Button alignment="CENTER" contentDisplay="RIGHT" layoutX="812.0" layoutY="20.0" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onMouseClicked="#addRule" prefHeight="30.0" prefWidth="30.0" styleClass="plus" text="+" textAlignment="CENTER">
<Button fx:id="plusButtonFx" alignment="CENTER" contentDisplay="RIGHT" disable="true" layoutX="812.0" layoutY="20.0" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onMouseClicked="#addRule" prefHeight="30.0" prefWidth="30.0" styleClass="plus" text="+" textAlignment="CENTER">
<font>
<Font size="14.0" />
</font>
Expand Down
5 changes: 5 additions & 0 deletions PARS/src/main/resources/com/satks/pars/ValidatePage.fxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.scene.layout.BorderPane?>

<BorderPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1000.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.satks.pars.ValidatePageController" />
2 changes: 1 addition & 1 deletion res/Architecture Diagram.drawio
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<mxfile host="Electron" modified="2022-08-28T08:41:16.267Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/20.2.3 Chrome/102.0.5005.167 Electron/19.0.11 Safari/537.36" etag="2ET9cQg4VIhf0JXoCLxE" version="20.2.3" type="device"><diagram id="eUohyLS9wrAkjKXuaIY4" name="Page-1">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</diagram></mxfile>
<mxfile host="Electron" modified="2022-09-17T05:55:15.130Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/20.2.3 Chrome/102.0.5005.167 Electron/19.0.11 Safari/537.36" etag="yb4TNIRf4buAtjq40FPh" version="20.2.3" type="device"><diagram id="eUohyLS9wrAkjKXuaIY4" name="Page-1">7V1dc5s4FP01fkyGb+PH2Gna7SS7maaT3e7LjmIUQyMjF5Q47q9fCSRjQMTYBoMTzXSmcC2BuDr3HH1nYE7mr58jsPBvsAfRwNC814F5OTAMXTNd+h+zrFKLY+mpYRYFHk+UGe6C31Dk5NbnwINxLiHBGJFgkTdOcRjCKcnZQBThZT7ZI0b5ty7ADJYMd1OAyta/A4/4qdW1tcz+BQYzX7xZ1/gvcyASc0PsAw8vN0zmp4E5iTAm6dX8dQIRc57wS5rvquLXdcEiGJI6GWb+5+sL7es3NP86/nUdL627e+PMSJ/yAtAz/2BeWLISHojwc+hB9hBtYI6XfkDg3QJM2a9LWufU5pM5onc6vfRA7Cdpxc0tIARGYWIxNGaNnyCZ+jzJDIE45tdrB7Gb8tfxD36BEYGvGyb+tZ8hnkMSrWgS/uuIO54jz7T4/TKrx5GAmb9RhyOREHDszNaPztxLL7iHd/C2KfG2gwhzoZ5zuvPrmcFinLua8f+TDI+Y+oWGFSDgjF2fxdE0l9UnhIXIBSuxccWSxOczjGcIgkUQn0/xnJqnzPlXj2AeIOal7/AJb75Se0zrObOVUpTLnJYmCWT6cs3WFq/SL7m9uLsXX8NLWPxIamaOEcYCMCkMSB59MYnwE5xghCNqCXEIWXkChAqmmOI3CGfUYGd33zHF8uWZUYVyTJH3iBKA+oHnQYrpcT42AApmDOlTilkYcVdwSjNZ+Rh2A8otFzzhnD6Hfc0YgQeIbnEckADnniByXBcSrHM2ECeWY+cDxS4Hij6UBIqutxUo9nZaomyxYJcEPCSO2ICBrPZiAiJRF6yuqF4QEITMyUmeKUYILOIgeViawg+Qdw1W+JmI14i7Qr3niGuT0XZlwyJeHlGwuOcvYddfmiNHY5ivdMstV7qhSSp9bWy80p0dK/0b8/nYx1Hwm1UmErVRqOl4GcwRCKlMA69gGuOkWcJMJIl+doXgI+GXD5gQypPpTcR9oEnR4kV48R1EMyiSSGhngQPKwuxL7DH9R/040c7tgU2/bELv9eye/mPJIzLBISU1ClT2WAhisoTxEQFYBtqb4bodfdvQZbcFrmGl9HIl3Spkhl4hZOJBD8JwgagjNjTsQaJrebmrgDl1PAkA+kYbtiCc1aE53gwGGTA3cTgwzEd3CqfTnQG/Xfxaw2Be1OknPLi2ZWv10ekcBZ38aVld7f44gJhfAKG8RD0blzC/Lun+YSAUW5HsOybZVR5enXGurkvA1mL35S6pIRo34z9CQrsp4+vkI9/s0KzzaGkerZxnf2VIhCAEc9g18fPYOBnOrxkSazZT1E6dYSlq/yjUvh5l7I7bZV30lOTiBQgbaVCfkEikBU9GaeLtg1qph5QGNKIBVu3g+QAa4CrKf6+U331zfqQov1TwJ8jq6IzegjnjYP413ElKCY6pBK5Sgmxit8bMrppCOWgKxXHyE8zSKRRDAof2plAM2QyzahCcQoNgHbC7sZcMX621AAzZEENbsyjfKE9sKmifZlE8G7qedUoaWppFcY0H03F2wKd5FHxuUdc6jzuGuu66QEHx7Any7BvzKMelXdnKiJPrLx2gDZQNYPDCglpNpbQVFvut4Xin9C5bLaLo/X3Su3Qu5bj87krg9tEH1m4AxQKMaAIKPC9Z96pmVo4bSsPaofQBJGGkFODdKkDnLXxTtizvoyuAmlrpT0yNasfU+5cCs3pZ477buMoxQgAgKKAtoDgXTA1Hb8VbtpKNKTZ1ackPS14h7KcQR3Mmf5KPvgGLBdt21b9NX8ly8tPZ9JVrZjQ0m6ULDeKiOJR0i3TZdkmnNVGsMZm10+bURln0qiSBeTnjQMDPUVKaNDwNm8WIzULUrgpSOw1TmlQEKr3M3mILqbWF2OYhpzUEB6sAB8nkpisjZMtoCw+2Vap+6M3gHb+lDVQfz3AI0KfMWgjWLM01TiKf1eZPSMiKuw88U9fmQANfA/IPz86uf7Drc5vfXb5u/HQp2u/U7dEqyXRuWpYwsJxn2rlGxZRbstzJXS77LYwC6rdkdl3rN+aMNzEXi+JUxjkfeiSix1KZkHdIWa2/ieEIIkCCF5grR/N4tLvEo74fHp0iGnVboXE/NLq9QqNZvSC79tx81Vb9pCFCS5WNyaV9M73uZEyG+qpulZLpvWTaKqxBcm2j3GozJTI9bE2lnRNU6TUH/shRoJwQewyrQ7lvWJP7xCE+PeE+e9gp5tY4+7Hxi8Jc05gzmsZckvUiisBqIwEfF8+efMsMg8rTUnRNMwoATh/Z7JhTA+cX1Fd3PsKq9L1zfTeHeX0fmZ3re3mLUU+5tsfwMApaYGVjAmnLRTPMfbplB9CwW5eGnV7QsKMVadgsHH9XyuC8maEd3rbL08b9HyNQLZMdQ6Jf41Jm9XKiFtsKhmordNxWsK2+tRUcvVT7aizgRNhPdPG3s5/ZK/ZzypOER22fDvcaDDD1HOzYwLw23KcFqAB5Zlm9AqQodxtyLDZGqL56D/R3vRZp3cMQO9K3CbDgrOaxZxwFe6rt1zX2LK1/2Ks+7fxg7PETVhXpHQa8qrNhdzlydfeVRcUBdF2X9FPEfrTc0iK3Lag2sK99G1QVR54eVE1dqwNV2Sq41qDa4jIPAVVTQfXkoFo8jKYPUN26bb2RxqdCa9eNT7t/HR/HLFV/T2cpN0ceXWOgBoHeHgSqvVqE62RPBoGcTteuq3nA42CuXyuCrRbXDG3or6X0t2P9dUZF/TUke7ek+uu0hb0W56BFN0UB7/S6KW5xnFLaTZGdodpeN6X6WOPWNk6owaC+cWYPNk4YnXZZVBPxgCai6ABv3zTWr26J3Wk3WXVLjoI5IXB9wVz1WTeHd0vYX9NW0trxcGBhKHo4Ms7teuIq6PEQ0GnwHo09b76a3P33578jbXRz9fvsXfwluhTIMSB+sAI/A+rJmlDf/9CU0ukmlaeZyAIorxQVOJKgrRJao8IhJboh+aPujgxYDbTapMAyFLA6BxYrxV/sPB/CXKQ3hDW70FUdDcs9hIagRm8jplwbW0/od/o32IMsxf8=</diagram></mxfile>
Binary file modified res/Architecture Diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion res/ToDo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ ToDo:
14. Finetune regular expressions
15. Add cool svgs
16. Learn and do the build.
17. Remove json parameter from setReceiver and setRoute functions and refactor them.
18. Enable validate and visualize buttons at right times.


Done:

Expand All @@ -25,4 +28,5 @@ Done:
4. Comment out unnecessary print lines.
5. Refactor to "PARS" (Prometheus Alerts Routing Simulation)
6. Add "+" button and logic to add multiple rule files.
7. Make a lot of input testcases and test with them.
7. Make a lot of input testcases and test with them.
8. Fix the "+" button bug (Shouldnt increment immediately, idea - disable and enable at appropriate time)

0 comments on commit fdd9f7a

Please sign in to comment.