toolbar

lastupdate.tmp

@@ -1 +1 @@
-{"/home/pierre/oc-search/controllers":1697618043343849928}
+{"/home/pierre/open-cloud/oc-search/controllers":1698307784301209722}

main.go

@@ -9,10 +9,22 @@ import (
 	beego "github.com/beego/beego/v2/server/web"
 )
 
-const defaultConfigFile = "/etc/oc/search.json"
-const localConfigFile = "./local_search.json"
 
 func main() {
+
+	loadConfig()
+
+	beego.BConfig.WebConfig.Session.SessionOn = true
+	beego.SetStaticPath("/favicon.ico", "/static/favicon.ico")
+	beego.BConfig.WebConfig.DirectoryIndex = true
+	beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
+
+	beego.Run()
+}
+
+// Initialising the config in the init so that the oc-catalog API receives it 
+
+func loadConfig(){
 	log := logs.NewLogger(10000)
 	log.SetLogger("console")
 

routers/commentsRouter_controllers.go

@@ -1,107 +0,0 @@
-package routers
-
-import (
-	beego "github.com/beego/beego/v2/server/web"
-	"github.com/beego/beego/v2/server/web/context/param"
-)
-
-func init() {
-
-    beego.GlobalControllerRouter["oc-search/controllers:DetailsController"] = append(beego.GlobalControllerRouter["oc-search/controllers:DetailsController"],
-        beego.ControllerComments{
-            Method: "SubmitToWorkspace",
-            Router: "/computing/:id",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(
-				param.New("id", param.InPath),
-			),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["oc-search/controllers:DetailsController"] = append(beego.GlobalControllerRouter["oc-search/controllers:DetailsController"],
-        beego.ControllerComments{
-            Method: "GetElementInfo",
-            Router: "/computing/:id",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(
-				param.New("id", param.InPath),
-			),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["oc-search/controllers:DetailsController"] = append(beego.GlobalControllerRouter["oc-search/controllers:DetailsController"],
-        beego.ControllerComments{
-            Method: "SubmitToWorkspace",
-            Router: "/data/:id",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(
-				param.New("id", param.InPath),
-			),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["oc-search/controllers:DetailsController"] = append(beego.GlobalControllerRouter["oc-search/controllers:DetailsController"],
-        beego.ControllerComments{
-            Method: "GetElementInfo",
-            Router: "/data/:id",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(
-				param.New("id", param.InPath),
-			),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["oc-search/controllers:DetailsController"] = append(beego.GlobalControllerRouter["oc-search/controllers:DetailsController"],
-        beego.ControllerComments{
-            Method: "SubmitToWorkspace",
-            Router: "/datacenter/:id",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(
-				param.New("id", param.InPath),
-			),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["oc-search/controllers:DetailsController"] = append(beego.GlobalControllerRouter["oc-search/controllers:DetailsController"],
-        beego.ControllerComments{
-            Method: "GetElementInfo",
-            Router: "/datacenter/:id",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(
-				param.New("id", param.InPath),
-			),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["oc-search/controllers:DetailsController"] = append(beego.GlobalControllerRouter["oc-search/controllers:DetailsController"],
-        beego.ControllerComments{
-            Method: "SubmitToWorkspace",
-            Router: "/storage/:id",
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(
-				param.New("id", param.InPath),
-			),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["oc-search/controllers:DetailsController"] = append(beego.GlobalControllerRouter["oc-search/controllers:DetailsController"],
-        beego.ControllerComments{
-            Method: "GetElementInfo",
-            Router: "/storage/:id",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(
-				param.New("id", param.InPath),
-			),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["oc-search/controllers:WorkspaceController"] = append(beego.GlobalControllerRouter["oc-search/controllers:WorkspaceController"],
-        beego.ControllerComments{
-            Method: "GetWorkspace",
-            Router: "/",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-}

static/mxgraph/examples/grapheditor/www/js/Dialogs.js

@@ -1638,6 +1638,11 @@ var EditDataDialog = function(ui, cell)
 /**
  * Constructs a new settings dialog.
  */
+/*
+	TODO 
+		- [ ] create a function to fill an input label with its current value if it has one
+		- [ ] create a function to create a different window for each type of component (check cell.rType ?)  
+ */
  var EditSettingsDialog = function(ui, cell)
  {
 	 var div = document.createElement('div');
@@ -1645,6 +1650,10 @@ var EditDataDialog = function(ui, cell)
 
 	 var values = graph.getModel().getValue(cell);
 
+	 var getCurrentValue =  function(labelName) {
+		return values.getAttribute(labelName)
+	 }
+
 	 // Converts the value to an XML node
 	 if (!mxUtils.isNode(values))
 	 {
@@ -1694,7 +1703,9 @@ var EditDataDialog = function(ui, cell)
 
 	 var coreLabel = document.createTextNode(mxResources.get('core'));
 	 var coreInput = document.createElement('input');
+	 coreInput.value = getCurrentValue('core')
 	 coreInput.setAttribute('type', 'text');
+	 coreInput.style.fontSize = '13px'
 	 coreInput.style.boxSizing = 'border-box';
 	 coreInput.style.marginLeft = '2px';
 	 coreInput.style.width = '20%';
@@ -1706,6 +1717,8 @@ var EditDataDialog = function(ui, cell)
 	 var ramLabel = document.createTextNode(mxResources.get('ram'));
 	 var ramInput = document.createElement('input');
 	 ramInput.setAttribute('type', 'text');
+	 ramInput.value = getCurrentValue('ram')
+	 ramInput.style.fontSize = '13px'
 	 ramInput.style.boxSizing = 'border-box';
 	 ramInput.style.marginLeft = '2px';
 	 ramInput.style.width = '20%';
@@ -1718,6 +1731,8 @@ var EditDataDialog = function(ui, cell)
 	 var durationInput = document.createElement('input');
 	 durationInput.setAttribute('type', 'text');
 	 durationInput.placeholder = 'in seconds'
+	 durationInput.value = getCurrentValue('estDuration')
+	 durationInput.style.fontSize = '13px'
 	 durationInput.style.boxSizing = 'border-box';
 	 durationInput.style.marginLeft = '2px';
 	 durationInput.style.width = '20%';
@@ -1727,6 +1742,8 @@ var EditDataDialog = function(ui, cell)
 	 var commandLabel = document.createTextNode(mxResources.get('command'));
 	 var commandInput = document.createElement('input');
 	 commandInput.setAttribute('type', 'text');
+	 commandInput.value = getCurrentValue('command')
+	 commandInput.style.fontSize = '13px'
 	 commandInput.style.boxSizing = 'border-box';
 	 commandInput.style.marginLeft = '2px';
 	 commandInput.style.width = '100%';
@@ -1737,6 +1754,8 @@ var EditDataDialog = function(ui, cell)
 	 var argsInput = document.createElement('input');
 	 argsInput.setAttribute('type', 'text');
 	 argsInput.placeholder = '"arg1","arg2",...'
+	 argsInput.value = getCurrentValue('args')
+	 argsInput.style.fontSize = '13px'
 	 argsInput.style.boxSizing = 'border-box';
 	 argsInput.style.marginLeft = '2px';
 	 argsInput.style.width = '100%';
@@ -1747,6 +1766,9 @@ var EditDataDialog = function(ui, cell)
 	 var envInput = document.createElement('input');
 	 envInput.setAttribute('type', 'text');
 	 envInput.placeholder = '"env1"="value1","env2"="value2",...'
+	 console.log("THIS IS THE TEST " + values)
+	 envInput.value = getCurrentValue('env')
+	 envInput.style.fontSize = '13px'
 	 envInput.style.boxSizing = 'border-box';
 	 envInput.style.marginLeft = '2px';
 	 envInput.style.width = '100%';
@@ -1757,6 +1779,8 @@ var EditDataDialog = function(ui, cell)
 	 var portsInput = document.createElement('input');
 	 portsInput.setAttribute('type', 'text');
 	 portsInput.placeholder = '8080,8443,...'
+	 portsInput.value = getCurrentValue('ports')
+	 portsInput.style.fontSize = '13px'
 	 portsInput.style.boxSizing = 'border-box';
 	 portsInput.style.marginLeft = '2px';
 	 portsInput.style.width = '100%';