Skip to content

Commit

Permalink
UI: Improved handling of progress bar updates when handling the files
Browse files Browse the repository at this point in the history
  • Loading branch information
jfudickar committed Nov 16, 2024
1 parent 8daf3ab commit eb7e9ab
Show file tree
Hide file tree
Showing 23 changed files with 506 additions and 272 deletions.
90 changes: 88 additions & 2 deletions samples/json2puml/json2puml_definition.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,97 @@
"displayName": "json2puml service definition",
"description": "Definition file to visualize the static json2puml service results"
},
"defaultOption": "default",
"defaultOption": "all",
"options": [
{
"option": "inputlist",
"definition": {
"continueAfterUnhandledObjects": null,
"groupDetailObjectsTogether": null,
"hideDuplicateRelations": null,
"identifyObjectsByTypeAndIdent": null,
"legendShowInfo": null,
"legendShowObjectCount": null,
"legendShowObjectFormats": null,
"legendShowFileInfos": null,
"attributeProperties": [
],
"objectProperties": [
"-service"
],
"objectTypeProperties": [
],
"objectTypeRenames": [
],
"objectIdentifierProperties": [
],
"objectTitleProperties": [
],
"objectDetailProperties": [
],
"relationshipProperties": [
],
"relationshipTypeProperties": [
],
"relationshipTypeArrowFormats": [
],
"groupProperties": [
],
"characteristicProperties": [
],
"hiddenProperties": [
],
"pumlHeaderLines": [
]
}
},
{
"option": "serviceinformation",
"definition": {
"continueAfterUnhandledObjects": null,
"groupDetailObjectsTogether": null,
"hideDuplicateRelations": null,
"identifyObjectsByTypeAndIdent": null,
"legendShowInfo": null,
"legendShowObjectCount": null,
"legendShowObjectFormats": null,
"legendShowFileInfos": null,
"attributeProperties": [
],
"objectProperties": [
"-inputlist",
"-definitionfile",
"-curlParameter"
],
"objectTypeProperties": [
],
"objectTypeRenames": [
],
"objectIdentifierProperties": [
],
"objectTitleProperties": [
],
"objectDetailProperties": [
],
"relationshipProperties": [
],
"relationshipTypeProperties": [
],
"relationshipTypeArrowFormats": [
],
"groupProperties": [
],
"characteristicProperties": [
],
"hiddenProperties": [
],
"pumlHeaderLines": [
]
}
}
],
"baseOption": {
"continueAfterUnhandledObjects": true,
"continueAfterUnhandledObjects": false,
"groupDetailObjectsTogether": null,
"hideDuplicateRelations": false,
"identifyObjectsByTypeAndIdent": false,
Expand Down
52 changes: 52 additions & 0 deletions samples/jsonplaceholder/albums_1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
[
{
"userId": 1,
"id": 1,
"title": "quidem molestiae enim"
},
{
"userId": 1,
"id": 2,
"title": "sunt qui excepturi placeat culpa"
},
{
"userId": 1,
"id": 3,
"title": "omnis laborum odio"
},
{
"userId": 1,
"id": 4,
"title": "non esse culpa molestiae omnis sed optio"
},
{
"userId": 1,
"id": 5,
"title": "eaque aut omnis a"
},
{
"userId": 1,
"id": 6,
"title": "natus impedit quibusdam illo est"
},
{
"userId": 1,
"id": 7,
"title": "quibusdam autem aliquid et et quia"
},
{
"userId": 1,
"id": 8,
"title": "qui fuga est a eum"
},
{
"userId": 1,
"id": 9,
"title": "saepe unde necessitatibus rem"
},
{
"userId": 1,
"id": 10,
"title": "distinctio laborum qui"
}
]
2 changes: 1 addition & 1 deletion samples/jsonplaceholder/placeholder_inputlist_curl.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
{
"name": "${postid}",
"value": "id",
"maxValues": 2
"maxValues": 10
}
],
"splitIdentifier": null,
Expand Down
1 change: 1 addition & 0 deletions samples/service/curl_json2pumlrequest_error_vm.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
curl -X POST http://192.168.178.240:8080/api/json2pumlRequest -d @error_parameter_curl.json -v -o result\curl_json2pumlrequest_error.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
curl -X POST http://192.168.178.241:8080/api/json2pumlRequestSvg -d @jsonplaceholder_parameter_curl.json -v -o result\jsonplaceholder_reducedparameter_result.svg
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
curl -X POST http://192.168.178.240:8080/api/json2pumlRequestZip -d @jsonplaceholder_parameter_curl.json -v -o result\jsonplaceholder_reducedparameter_result.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
for /l %%x in (1, 1, 10) do (
echo loop %%x
curl_json2pumlrequestzip_jsonplaceholder_vm.cmd
)
35 changes: 23 additions & 12 deletions source/json2puml.deployproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,27 @@
<ProjectExtensions>
<ProjectFileVersion>12</ProjectFileVersion>
</ProjectExtensions>
<PropertyGroup/>
<PropertyGroup>
<DeviceId Condition="'$(Platform)'=='Android'"/>
<DeviceId Condition="'$(Platform)'=='Android64'"/>
<DeviceId Condition="'$(Platform)'=='iOSDevice64'"/>
<DeviceId Condition="'$(Platform)'=='iOSSimARM64'"/>
</PropertyGroup>
<ItemGroup Condition="'$(Platform)'=='OSX64'"/>
<ItemGroup Condition="'$(Platform)'=='Win32'">
<DeployFile Include="..\documentation\icons\json2puml_icon.png" Condition="'$(Config)'=='Debug'">
<RemoteDir>json2puml\Assets\</RemoteDir>
<RemoteName>Logo44x44.png</RemoteName>
<DeployClass>UWP_DelphiLogo44</DeployClass>
<Operation>1</Operation>
<LocalCommand/>
<RemoteCommand/>
<Overwrite>True</Overwrite>
</DeployFile>
</ItemGroup>
<ItemGroup Condition="'$(Platform)'=='Android64'"/>
<ItemGroup Condition="'$(Platform)'=='Android'"/>
<ItemGroup Condition="'$(Platform)'=='OSXARM64'"/>
<ItemGroup Condition="'$(Platform)'=='Win64'">
<DeployFile Include="Win64\Debug\json2puml.exe" Condition="'$(Config)'=='Debug'">
<RemoteDir>json2puml\</RemoteDir>
Expand Down Expand Up @@ -47,15 +67,6 @@
<Required>True</Required>
</DeployFile>
</ItemGroup>
<ItemGroup Condition="'$(Platform)'=='Win32'">
<DeployFile Include="..\documentation\icons\json2puml_icon.png" Condition="'$(Config)'=='Debug'">
<RemoteDir>json2puml\Assets\</RemoteDir>
<RemoteName>Logo44x44.png</RemoteName>
<DeployClass>UWP_DelphiLogo44</DeployClass>
<Operation>1</Operation>
<LocalCommand/>
<RemoteCommand/>
<Overwrite>True</Overwrite>
</DeployFile>
</ItemGroup>
<ItemGroup Condition="'$(Platform)'=='iOSDevice64'"/>
<ItemGroup Condition="'$(Platform)'=='iOSSimARM64'"/>
</Project>
80 changes: 37 additions & 43 deletions source/json2puml.dproj

Large diffs are not rendered by default.

Binary file modified source/json2puml.res
Binary file not shown.
79 changes: 40 additions & 39 deletions source/json2pumlapps.dsk
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,30 @@ File_12=TSourceModule,'c:\program files (x86)\embarcadero\studio\22.0\source\rtl
File_13=TSourceModule,'c:\program files (x86)\embarcadero\studio\22.0\SOURCE\RTL\SYS\System.SysUtils.pas',0,1,12768,1,12791,0,0,,

[Modules]
Module0=E:\Delphi\Projects\json2puml\source\json2pumlservicecontroller.pas
Module1=E:\Delphi\Projects\json2puml\source\json2pumlpuml.pas
Module0=E:\Delphi\Projects\json2puml\source\commandlinetools.pas
Module1=E:\Delphi\Projects\json2puml\source\jsontools.pas
Module2=E:\Delphi\Projects\json2puml\source\json2puml.dproj
Module3=E:\Delphi\Projects\json2puml\source\json2pumlservice.dproj
Module4=E:\Delphi\Projects\json2puml\unittests\json2pumlunittests.dproj
Module5=E:\Delphi\Projects\json2puml\source\json2pumlconst.pas
Module5=E:\Delphi\Projects\json2puml\source\json2pumltools.pas
Module6=E:\Delphi\Projects\json2puml\source\json2pumldefinition.pas
Module7=E:\Delphi\Projects\json2puml\source\json2pumltools.pas
Module8=E:\Delphi\Projects\json2puml\source\json2pumlinputhandler.pas
Module9=E:\Delphi\Projects\json2puml\source\json2pumlconverterdefinition.pas
Module10=E:\Delphi\Projects\json2puml\source\commandlinetools.pas
Module11=E:\Delphi\Projects\json2puml\source\json2pumlloghandler.pas
Module12=E:\Delphi\Projects\json2puml\source\json2pumlconverter.pas
Module13=E:\Delphi\Projects\json2puml\source\json2pumlbasedefinition.pas
Module14=E:\Delphi\Projects\json2puml\unittests\utJson2PumlBasePropertyList.pas
Module15=E:\Delphi\Projects\json2puml\source\jsontools.pas
Module7=E:\Delphi\Projects\json2puml\source\json2pumlconst.pas
Module8=E:\Delphi\Projects\json2puml\source\json2pumlservicecontroller.pas
Module9=E:\Delphi\Projects\json2puml\source\json2pumlpuml.pas
Module10=E:\Delphi\Projects\json2puml\source\json2pumlinputhandler.pas
Module11=E:\Delphi\Projects\json2puml\source\json2pumlconverterdefinition.pas
Module12=E:\Delphi\Projects\json2puml\source\json2pumlloghandler.pas
Module13=E:\Delphi\Projects\json2puml\source\json2pumlconverter.pas
Module14=E:\Delphi\Projects\json2puml\source\json2pumlbasedefinition.pas
Module15=E:\Delphi\Projects\json2puml\unittests\utJson2PumlBasePropertyList.pas
Module16=E:\Delphi\Projects\json2puml\source\json2pumlvcltools.pas
Count=17
EditWindowCount=1

[E:\Delphi\Projects\json2puml\source\json2pumlservicecontroller.pas]
[E:\Delphi\Projects\json2puml\source\commandlinetools.pas]
ModuleType=TSourceModule

[E:\Delphi\Projects\json2puml\source\json2pumlpuml.pas]
[E:\Delphi\Projects\json2puml\source\jsontools.pas]
ModuleType=TSourceModule

[E:\Delphi\Projects\json2puml\source\json2puml.dproj]
Expand All @@ -50,22 +50,25 @@ ModuleType=TBaseProject
[E:\Delphi\Projects\json2puml\unittests\json2pumlunittests.dproj]
ModuleType=TBaseProject

[E:\Delphi\Projects\json2puml\source\json2pumlconst.pas]
[E:\Delphi\Projects\json2puml\source\json2pumltools.pas]
ModuleType=TSourceModule

[E:\Delphi\Projects\json2puml\source\json2pumldefinition.pas]
ModuleType=TSourceModule

[E:\Delphi\Projects\json2puml\source\json2pumltools.pas]
[E:\Delphi\Projects\json2puml\source\json2pumlconst.pas]
ModuleType=TSourceModule

[E:\Delphi\Projects\json2puml\source\json2pumlinputhandler.pas]
[E:\Delphi\Projects\json2puml\source\json2pumlservicecontroller.pas]
ModuleType=TSourceModule

[E:\Delphi\Projects\json2puml\source\json2pumlconverterdefinition.pas]
[E:\Delphi\Projects\json2puml\source\json2pumlpuml.pas]
ModuleType=TSourceModule

[E:\Delphi\Projects\json2puml\source\commandlinetools.pas]
[E:\Delphi\Projects\json2puml\source\json2pumlinputhandler.pas]
ModuleType=TSourceModule

[E:\Delphi\Projects\json2puml\source\json2pumlconverterdefinition.pas]
ModuleType=TSourceModule

[E:\Delphi\Projects\json2puml\source\json2pumlloghandler.pas]
Expand All @@ -80,15 +83,12 @@ ModuleType=TSourceModule
[E:\Delphi\Projects\json2puml\unittests\utJson2PumlBasePropertyList.pas]
ModuleType=TSourceModule

[E:\Delphi\Projects\json2puml\source\jsontools.pas]
ModuleType=TSourceModule

[E:\Delphi\Projects\json2puml\source\json2pumlvcltools.pas]
ModuleType=TSourceModule

[EditWindow0]
ViewCount=17
CurrentEditView=E:\Delphi\Projects\json2puml\source\json2pumlservicecontroller.pas
CurrentEditView=E:\Delphi\Projects\json2puml\source\commandlinetools.pas
View0=0
View1=1
View2=2
Expand Down Expand Up @@ -149,9 +149,9 @@ EditViewName=E:\Delphi\Projects\json2puml\source\jsontools.pas
[View1]
CustomEditViewType=TEditView
Module=E:\Delphi\Projects\json2puml\source\commandlinetools.pas
CursorX=11
CursorY=156
TopLine=125
CursorX=13
CursorY=213
TopLine=199
LeftCol=1
Elisions=
Bookmarks=
Expand All @@ -160,9 +160,9 @@ EditViewName=E:\Delphi\Projects\json2puml\source\commandlinetools.pas
[View2]
CustomEditViewType=TEditView
Module=E:\Delphi\Projects\json2puml\source\json2pumlservicecontroller.pas
CursorX=97
CursorY=323
TopLine=302
CursorX=31
CursorY=226
TopLine=198
LeftCol=1
Elisions=
Bookmarks=
Expand Down Expand Up @@ -237,8 +237,8 @@ EditViewName=E:\Delphi\Projects\json2puml\source\json2pumlconverterdefinition.pa
[View9]
CustomEditViewType=TEditView
Module=E:\Delphi\Projects\json2puml\source\json2pumlconst.pas
CursorX=126
CursorY=189
CursorX=32
CursorY=199
TopLine=157
LeftCol=1
Elisions=
Expand All @@ -248,9 +248,9 @@ EditViewName=E:\Delphi\Projects\json2puml\source\json2pumlconst.pas
[View10]
CustomEditViewType=TEditView
Module=E:\Delphi\Projects\json2puml\source\json2pumltools.pas
CursorX=17
CursorY=379
TopLine=356
CursorX=67
CursorY=1283
TopLine=1333
LeftCol=1
Elisions=
Bookmarks=
Expand All @@ -259,9 +259,9 @@ EditViewName=E:\Delphi\Projects\json2puml\source\json2pumltools.pas
[View11]
CustomEditViewType=TEditView
Module=E:\Delphi\Projects\json2puml\source\json2pumldefinition.pas
CursorX=166
CursorY=2684
TopLine=2672
CursorX=145
CursorY=4208
TopLine=4173
LeftCol=1
Elisions=
Bookmarks=
Expand Down Expand Up @@ -354,8 +354,9 @@ Dockable=1
StayOnTop=0

[Breakpoints]
Count=1
Count=2
Breakpoint0='E:\Delphi\Projects\json2puml\source\json2pumlconverter.pas',352,'iinfo.propertyname = ''actionReason''',0,0,'',1,0,0,'',1,'','','',0,''
Breakpoint1='E:\Delphi\Projects\json2puml\source\commandlinetools.pas',304,'',0,1,'',1,0,0,'',1,'','','',0,''

[EmbarcaderoWin32Debugger_AddressBreakpoints]
Count=0
Expand Down Expand Up @@ -1045,5 +1046,5 @@ ActiveTabID=ToolForm
TabDockClients=ToolForm,TemplateView

[ActiveProject]
ActiveProject=3
ActiveProject=1

Loading

0 comments on commit eb7e9ab

Please sign in to comment.