diff --git a/lib/core/models/workspace_local.dart b/lib/core/models/workspace_local.dart index df9b307..7c4b65f 100644 --- a/lib/core/models/workspace_local.dart +++ b/lib/core/models/workspace_local.dart @@ -42,7 +42,6 @@ class WorkspaceLocal { } else { WorkspaceLocal.createWorkspace("main", null); } - print("qsdqsd $current"); }); } @@ -103,7 +102,6 @@ class WorkspaceLocal { } static void changeWorkspace(String id) { - print("WORKSPACES ID $id"); _service.put(null, id, { "active" : true }, {}); current = id; fill(); diff --git a/lib/core/services/api_service.dart b/lib/core/services/api_service.dart index 3cabe4c..8d88e2f 100644 --- a/lib/core/services/api_service.dart +++ b/lib/core/services/api_service.dart @@ -78,8 +78,6 @@ class APIService { _dio.options.headers["authorization"] = auth; _dio.interceptors.clear(); var response = await _request(url, method, body, options); - print(response.data); - print(url); if (response.statusCode != null && response.statusCode! < 400) { if (method == "delete") { cache.remove(url); return APIResponse(); } APIResponse resp = APIResponse().deserialize(response.data); diff --git a/lib/core/services/specialized_services/abstract_service.dart b/lib/core/services/specialized_services/abstract_service.dart index 814618d..9ad9d6d 100644 --- a/lib/core/services/specialized_services/abstract_service.dart +++ b/lib/core/services/specialized_services/abstract_service.dart @@ -15,7 +15,6 @@ abstract class AbstractService { return service.get("$subPath$id", true, context); } Future> post(BuildContext? context, Map body, Map params) { - print("Creating workspace $body"); return service.post(subPath, body, context); } Future> put(BuildContext? context, String id, Map body, Map params) { diff --git a/lib/models/workflow.dart b/lib/models/workflow.dart index a644831..d56d4f1 100644 --- a/lib/models/workflow.dart +++ b/lib/models/workflow.dart @@ -76,11 +76,13 @@ class WorkflowExecution extends SerializerDeserializer { @override deserialize(dynamic json) { try { json = json as Map; } catch (e) { return WorkflowExecution(); } + print("qsdqdqssd"); + print(json); return WorkflowExecution( id: json.containsKey("id") ? json["id"] : "", endDate: json.containsKey("end_date") ? json["end_date"] : "", executionData: json.containsKey("execution_date") ? json["execution_date"] : "", - status: json.containsKey("status") ? json["status"] : 1, + status: json.containsKey("state") ? json["state"] : 1, workflowId: json.containsKey("workflow_id") ? json["workflow_id"] : "", name: json.containsKey("name") ? json["name"] : "", ); diff --git a/lib/widgets/forms/scheduler_forms.dart b/lib/widgets/forms/scheduler_forms.dart index e3d2a56..0e68c58 100644 --- a/lib/widgets/forms/scheduler_forms.dart +++ b/lib/widgets/forms/scheduler_forms.dart @@ -50,13 +50,15 @@ class SchedulerFormsWidgetState extends State { GlobalKey(), GlobalKey()]; var shallow = ShallowTextInputWidget( width: 250 - 1, - current: dash.name, + current: widget.item.name, type: SharedWorkspaceType.workflow, - canRemove: (p0) => p0 != null && p0.isEmpty, + canRemove: (p0) => p0 != null && p0.isNotEmpty, remove: (p0) async { await WorflowService().delete(context, widget.item.id ?? "", {}).then((value) { - dash.clear(); + dash.id = null; + dash.name = ""; dash.isOpened = false; + dash.clear(); dash.chartKey.currentState?.widget.flowChart.setState(() { }); }); }, @@ -75,7 +77,7 @@ class SchedulerFormsWidgetState extends State { Text("WORKFLOW INFO", style: TextStyle(fontSize: 15, fontWeight: FontWeight.bold), textAlign: TextAlign.center), Text("", style: TextStyle(fontSize: 12), textAlign: TextAlign.center), ])), - Container( + widget.item.name == "" ? Container() : Container( decoration: BoxDecoration( border: Border( left: BorderSide(color: Colors.grey.shade300, width: 1), bottom: const BorderSide(color: Colors.grey))), diff --git a/lib/widgets/inputs/shallow_dropdown_input.dart b/lib/widgets/inputs/shallow_dropdown_input.dart index 587fe5f..f949650 100644 --- a/lib/widgets/inputs/shallow_dropdown_input.dart +++ b/lib/widgets/inputs/shallow_dropdown_input.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:oc_front/models/response.dart'; import 'package:oc_front/pages/shared.dart'; + class ShallowDropdownInputWidget extends StatefulWidget { double? width; SharedWorkspaceType type = SharedWorkspaceType.workspace; @@ -50,7 +51,7 @@ class ShallowDropdownInputWidgetState extends State Tooltip( message: widget.hint ?? "current $t", child: Theme( data: Theme.of(context).copyWith( - canvasColor: Colors.grey.shade300, + canvasColor: widget.filled ??Colors.white, ), child: Container( height: 50, width: (widget.width ?? MediaQuery.of(context).size.width) - (widget.load == null ? 0 : 50) - (widget.remove == null ? 0 : 50), decoration: const BoxDecoration( diff --git a/lib/widgets/inputs/shallow_text_input.dart b/lib/widgets/inputs/shallow_text_input.dart index 820a8c1..1311b89 100644 --- a/lib/widgets/inputs/shallow_text_input.dart +++ b/lib/widgets/inputs/shallow_text_input.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:oc_front/models/response.dart'; import 'package:oc_front/pages/shared.dart'; + class ShallowTextInputWidget extends StatefulWidget { double? width; SharedWorkspaceType type = SharedWorkspaceType.workspace; @@ -69,9 +69,7 @@ class ShallowTextInputWidgetState extends State { canvasColor: Colors.grey.shade300, ), child: Container( height: 50, width: (widget.width ?? MediaQuery.of(context).size.width) - (widget.load == null ? 0 : 50) - (widget.remove == null ? 0 : 50), - decoration: BoxDecoration( - color: Colors.white, - ), + decoration: const BoxDecoration( color: Colors.white ), child: TextFormField( onChanged: (value) { setState(() { diff --git a/lib/widgets/sheduler_items/schedule.dart b/lib/widgets/sheduler_items/schedule.dart index 30e9880..308383f 100644 --- a/lib/widgets/sheduler_items/schedule.dart +++ b/lib/widgets/sheduler_items/schedule.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_box_transform/flutter_box_transform.dart'; import 'package:oc_front/core/sections/header/header.dart'; -import 'package:oc_front/core/services/specialized_services/logs_service.dart'; import 'package:oc_front/models/logs.dart'; import 'package:oc_front/models/workflow.dart'; import 'package:oc_front/widgets/logs.dart'; @@ -26,7 +24,6 @@ class ScheduleWidget extends StatefulWidget { String? selected; String? selectedReal; class ScheduleWidgetState extends State { - LogsService _service = LogsService(); String search = ""; String? level; List colors = [Colors.blue, Colors.orange, Colors.red, Colors.green]; diff --git a/library/flutter_flow_chart/lib/src/dashboard.dart b/library/flutter_flow_chart/lib/src/dashboard.dart index b369246..4a4a4e0 100755 --- a/library/flutter_flow_chart/lib/src/dashboard.dart +++ b/library/flutter_flow_chart/lib/src/dashboard.dart @@ -34,8 +34,7 @@ class Dashboard extends ChangeNotifier { Map info = {}; bool scheduleActive = false; String? id; - String name; - String defaultName = ""; + String name = ""; bool isMenu = true; bool isInfo = true; bool isOpened = false; @@ -76,7 +75,6 @@ class Dashboard extends ChangeNotifier { // This is a workaround to set the handlerFeedbackOffset // to improve the user experience on devices with touch screens // This will prevent the handler being covered by user's finger - defaultName = name; if (loadedGraph != null) { deserialize(loadedGraph!); } if (handlerFeedbackOffset != null) { this.handlerFeedbackOffset = handlerFeedbackOffset; @@ -266,6 +264,7 @@ class Dashboard extends ChangeNotifier { } catch (e) { print(e); } elements.add(flow); } + print("DASH " + name); selectedMenuKey.currentState?.setState(() { }); chartMenuKey.currentState?.setState(() { }); addToHistory(); @@ -336,7 +335,10 @@ class Dashboard extends ChangeNotifier { if (tempHistory.length >= 50) { tempHistory.removeAt(0); } tempHistory.add(toMap()); history = tempHistory.map((e) => e).toList(); - chartMenuKey.currentState?.setState(() { }); + Future.delayed(Duration(seconds: 1), () { + chartMenuKey.currentState?.setState(() { }); + }); + ; } bool isBack = false; void back() { diff --git a/library/flutter_flow_chart/lib/src/elements/flow_element.dart b/library/flutter_flow_chart/lib/src/elements/flow_element.dart index 53d9a69..467740e 100755 --- a/library/flutter_flow_chart/lib/src/elements/flow_element.dart +++ b/library/flutter_flow_chart/lib/src/elements/flow_element.dart @@ -107,7 +107,6 @@ class FlowElement extends ChangeNotifier { return false; } factory FlowElement.fromMap(Dashboard dashboard, Map map) { - print("FlowElement.fromMap ${map}"); final e = FlowElement( element: (dashboard.transformToData != null ? dashboard.transformToData!(map['element'] ?? {}) diff --git a/library/flutter_flow_chart/lib/src/flow_chart_left_menu.dart b/library/flutter_flow_chart/lib/src/flow_chart_left_menu.dart index 409f865..98b303f 100644 --- a/library/flutter_flow_chart/lib/src/flow_chart_left_menu.dart +++ b/library/flutter_flow_chart/lib/src/flow_chart_left_menu.dart @@ -36,8 +36,15 @@ class FlowChartLeftMenuState extends State extends State { Padding( padding: EdgeInsets.only(right: 15), child: InkWell( mouseCursor: SystemMouseCursors.click, onTap: () { - widget.dashboard.defaultName = "graph_${DateTime.now().toString().replaceAll(" ", "_").substring(0, DateTime.now().toString().length - 7)}"; + widget.dashboard.name = "graph_${DateTime.now().toString().replaceAll(" ", "_").substring(0, DateTime.now().toString().length - 7)}"; widget.dashboard.isOpened = true; showDialog( barrierDismissible: false, diff --git a/library/flutter_flow_chart/lib/src/flow_chart_selected_menu.dart b/library/flutter_flow_chart/lib/src/flow_chart_selected_menu.dart index 76f9d9d..027e3fa 100644 --- a/library/flutter_flow_chart/lib/src/flow_chart_selected_menu.dart +++ b/library/flutter_flow_chart/lib/src/flow_chart_selected_menu.dart @@ -21,8 +21,7 @@ class FlowChartSelectedMenuState extends State { height: widget.height, color: Colors.grey.shade300, child: SingleChildScrollView( child: Column( children: [ ...widget.dashboard.infoItemWidget != null ? - widget.dashboard.infoItemWidget!(widget.dashboard.elementSelected.first.element) - : [], + widget.dashboard.infoItemWidget!(widget.dashboard.elementSelected.first.element) : [], widget.dashboard.arrowsSelected.isNotEmpty || widget.dashboard.elementSelected.isNotEmpty ? Container( width: 250, margin: EdgeInsets.only(top: 15), @@ -59,7 +58,7 @@ class FlowChartSelectedMenuState extends State { Future.delayed(Duration(milliseconds: 100), () { widget.dashboard.chartKey.currentState?.setState(() { }); }); - }, child: Container( margin: EdgeInsets.only(left: 10, right: 10), + }, child: Container( margin: EdgeInsets.only(left: 10, right: 10, bottom: 10), decoration: BoxDecoration(borderRadius: BorderRadius.circular(5), border: Border.all(color: Colors.black, width: 1)), width: 200, height: 30, child: Icon(Icons.copy, color: Colors.black),