Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gitpod #6

Open
wants to merge 132 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
b53a2a9
Enable gitpod donet
eisnerw May 9, 2021
64af381
add gitpod debugging
eisnerw May 9, 2021
71277d4
minor
eisnerw May 9, 2021
0c87152
Add bin
eisnerw May 11, 2021
8cb0c66
Test libraries
eisnerw May 11, 2021
bf50129
Adding files from obj
eisnerw May 20, 2021
96662c9
Add prod build
eisnerw May 21, 2021
b21b7a6
Adding all packages
eisnerw May 26, 2021
8191eaf
after dotnet clean
eisnerw May 26, 2021
cb66374
added a comment to README
eisnerw May 26, 2021
d9341dc
using local packages file to permit offline operation
eisnerw May 26, 2021
a25af4b
Test of elasticsearch
eisnerw May 29, 2021
fe3f93e
Add birthday entity fed from Elastic
eisnerw Jun 2, 2021
18f228f
Add untracked files for Birthday entity fed by Elastic
eisnerw Jun 2, 2021
78e7187
Remove npm install step from Jhipster.csproj
eisnerw Jun 2, 2021
8573468
Moved elasticsearch/nest to repository; Enabled FindOne
eisnerw Jun 3, 2021
4bfb83b
Autolog based on cert
eisnerw Jun 6, 2021
d955565
Get authenticated user info from external service
eisnerw Jun 7, 2021
6f3b4f9
Switch Birthday grid to PrimeNG
eisnerw Jul 6, 2021
bb25c58
Filter dob
eisnerw Jul 9, 2021
1e6491a
Add checkbox column
eisnerw Jul 17, 2021
7c1abad
Add context menus
eisnerw Aug 1, 2021
7a07bb9
added p-tableheadercheckbox; capture checkbox-selected rows
eisnerw Aug 1, 2021
fb8c88f
Row expansion; Chips
eisnerw Aug 9, 2021
680acc0
Avoid login popup; Change table style for more rows
eisnerw Aug 15, 2021
e5acc0a
Insure login change captured
eisnerw Aug 15, 2021
263e108
Adding ellipsis and tooltip to one column
eisnerw Aug 16, 2021
9c694f5
Add scroll-top
eisnerw Aug 21, 2021
5b15208
Fix scroll-up css
eisnerw Aug 21, 2021
cf14607
Added "Refresh" button
eisnerw Aug 22, 2021
a49b5f6
Fix clearing global filter; Add context and chip menus
eisnerw Aug 22, 2021
e643242
Changed the style to display more data
eisnerw Aug 27, 2021
11463a4
Fix to hide chip menu if mouse leaves
eisnerw Aug 28, 2021
82695c3
Minor changes; clear bu ton only clears filters;
eisnerw Aug 28, 2021
b25b87d
Add (fake) search dialog
eisnerw Aug 29, 2021
c990214
Displays birthday from menu
eisnerw Aug 29, 2021
ab2e794
Add query parm to not show navbar
eisnerw Aug 29, 2021
5e0f340
Minor: change popup border width
eisnerw Sep 3, 2021
1265974
Add query builder
eisnerw Sep 5, 2021
f068477
Add Ok/Cancel buttons to queryBuilder; Pass queryBuilder query to rep…
eisnerw Sep 5, 2021
217886b
Integrated TextTemplate to build lucene query
eisnerw Sep 6, 2021
de3de75
Use birthday atributes for query builder; wire in Lucene search
eisnerw Sep 7, 2021
7890278
Implementing NOT on the query builder
eisnerw Sep 11, 2021
e5761a8
Fixed styles; recurse with extended; fix NOT
eisnerw Sep 11, 2021
7cdba7c
only show active buttons unless hovering
eisnerw Sep 11, 2021
8348cf2
Added "document" to allow full document text search
eisnerw Sep 12, 2021
8946155
Add code workspace to gitignore
eisnerw Sep 18, 2021
0bad6cd
Added EditableMultiSelect; initial categorize dialog
eisnerw Sep 20, 2021
34f2d01
Full subclass of multiselect; make editable
eisnerw Sep 26, 2021
52805f0
Change cities to categories; compute selectedCategories
eisnerw Sep 26, 2021
19d4f3a
Change category to categoryName
eisnerw Sep 26, 2021
1955e9c
Change Region to Category
eisnerw Sep 26, 2021
eb7758c
Wire categories for birthdays to the back end
eisnerw Sep 26, 2021
43308eb
Fix bad header test; sort categories
eisnerw Sep 27, 2021
d787dcf
Generated with JHipster 6.10.5 and generator-jhipster-dotnetcore2.1.0
eisnerw Sep 30, 2021
5c6684d
Merge branch 'jhipster_upgrade'
eisnerw Sep 30, 2021
e6a3c13
Added categories as List/string array to birthday entity; update birt…
eisnerw Sep 30, 2021
abada8a
Change IBirthday.categories to List<ICategory>
eisnerw Sep 30, 2021
a884ce9
Update categories; editable multiselect doesn't require check
eisnerw Oct 2, 2021
944c646
fix 'birhday';change category to use primeng;remove category update;c…
eisnerw Oct 2, 2021
eaabc5e
Minor html cleanup
eisnerw Oct 2, 2021
ebaaa23
Replace p-table with super-table
eisnerw Oct 8, 2021
8df22c0
Remove unused imports; Add birthday text;complete pTable subclass
eisnerw Oct 9, 2021
28e54cb
Minor changes
eisnerw Oct 9, 2021
8bec406
Support for parent/child tables; column resize
eisnerw Oct 11, 2021
3991fce
Set parent in category children
eisnerw Oct 11, 2021
aaf3e48
Remove scrollbar by eliminating height
eisnerw Oct 11, 2021
7cd8927
Fix "loading..."
eisnerw Oct 11, 2021
dd47cf6
Support categorization in categorized view
eisnerw Oct 12, 2021
19129b2
SuperTable support for checkboxes, chips; sort categories
eisnerw Oct 18, 2021
92b9770
SuperTable support for checkboxes, chips; sort categories
eisnerw Oct 18, 2021
33ed188
Fix for too many categories; Add filter, sort to category view
eisnerw Oct 24, 2021
db83ca4
View selection (partial)
eisnerw Oct 25, 2021
8c66340
Fix to properly load category rows
eisnerw Oct 30, 2021
96b8173
Script categorizations; refactor expanded search; new logo
eisnerw Nov 1, 2021
3e84947
Change default category to flat view
eisnerw Nov 7, 2021
a3f562a
Fix failed ellipsis; Fix for category expanded table overflow
eisnerw Nov 8, 2021
eea330a
Change width of expand column
eisnerw Nov 8, 2021
89a82e4
Avoid ellipsis for categories; global search only categories
eisnerw Nov 12, 2021
6952828
Display search; Fixes for global search for catetories
eisnerw Nov 13, 2021
bb2ff89
Minor fixes to fix supertable without children
eisnerw Nov 13, 2021
7f5d2de
Add aria labels; Set child column width to parent after load
eisnerw Nov 13, 2021
a12799b
Implement select all; fix children bug
eisnerw Nov 15, 2021
93137ba
Add a parser to turn the flat query back into JSON
eisnerw Nov 18, 2021
aad79a8
Full editing of query integrated with widget
eisnerw Nov 29, 2021
c778491
Eliminate quotes around literals; provide shorthand for document cont…
eisnerw Nov 29, 2021
509be79
Start of focus; support unquoted phrase (proximity)
eisnerw Dec 6, 2021
6fa018b
Support for unquoted phrases;catch/edit invalid query from widget;def…
eisnerw Dec 11, 2021
758abd2
Remove comment
eisnerw Dec 11, 2021
df5587f
Refactor backend repositories
eisnerw Dec 11, 2021
f2653e1
Change categorize mechanism
eisnerw Dec 11, 2021
f69abdc
Change repositories to use View class; start Focus backend
eisnerw Dec 13, 2021
b3ccad9
Added RefKeys
eisnerw Dec 13, 2021
d748221
Result of removing VS
eisnerw Dec 17, 2021
670faab
Add two level categorization
eisnerw Dec 19, 2021
8c25f45
Two-level focus
eisnerw Dec 20, 2021
5a1bd0c
Click on query to edit
eisnerw Dec 26, 2021
0a39e78
Initial implementation of saved rulesets
eisnerw Jan 10, 2022
0dc3741
Detect toplevel ruleset
eisnerw Jan 12, 2022
f74b24a
Solve compilation issue
eisnerw Jan 15, 2022
8d80cc2
Convert rule to ruleset; change rule to expression, ruleset to query
eisnerw Jan 15, 2022
58133e9
Add simplifyquery
eisnerw Jan 16, 2022
4ede64c
Make query validation async;queryAsString support for named query
eisnerw Jan 18, 2022
0b23b6e
Add list bash script to see files from 2022
eisnerw Jan 22, 2022
18f318b
Detect dirty named queries; add parens to NOT elastic clause
eisnerw Jan 23, 2022
dcb4ab4
Update modified named queries
eisnerw Jan 24, 2022
67b8209
Fxes to rulesetMap; implement "Query" view
eisnerw Jan 31, 2022
5a624b6
Fix rulesetMap; implement "Query" view
eisnerw Jan 31, 2022
9c26e14
Add "list" bash script
eisnerw Jan 31, 2022
a5326e4
Query view tooltips and initial menu implemntatoin
eisnerw Feb 5, 2022
8787b41
Fix for named query not valid when defined
eisnerw Feb 5, 2022
01b3e99
RulesetMap now maps IQuery
eisnerw Feb 6, 2022
102e25a
Fix ruleset uses bug; query parser returns IQuery
eisnerw Feb 6, 2022
4c00af4
Normalizeing rulsesetMap
eisnerw Feb 6, 2022
0ba62d6
Normalize rulesetMap; update all effected rulesets
eisnerw Feb 7, 2022
e5a24e3
Improve query parsing service, normalization.
eisnerw Feb 8, 2022
36acc24
Use common rulesetMap when showing
eisnerw Feb 9, 2022
a19f43c
Add existing named query in query builder
eisnerw Feb 9, 2022
55ba78c
Remove https to allow running in gitpod
eisnerw Feb 13, 2022
8dc010c
Compatibility with gitpad (HTTP)
eisnerw Feb 13, 2022
11cf959
More gitpod compatibility
eisnerw Feb 13, 2022
113c33d
Edit query from menu
eisnerw Feb 14, 2022
83dca5e
Merge branch 'main' into gitpod
eisnerw Feb 14, 2022
9a23268
Fix for edit query menu; minor changes for gitpod
eisnerw Feb 17, 2022
9532dd0
Remove unneeded files
eisnerw Feb 20, 2022
a801e84
Add specific files to gitignore
eisnerw Feb 20, 2022
d7fa199
Fix gitignore
eisnerw Feb 20, 2022
cd6f1af
Fix for editing query from top level category
eisnerw Feb 20, 2022
a829c2f
Check in debug settings
eisnerw Feb 20, 2022
30f8b34
Implement rename query;Disable Search ok if naming
eisnerw Feb 21, 2022
026c332
Fix query view menu icons
eisnerw Feb 21, 2022
6bd2f4d
Rename query; Disable Search ok if naming
eisnerw Feb 21, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ npm-debug.log.*
# Vs & vscode
###########
.vs
.vscode
## .vscode

# Web
**/ClientApp/dist/
Expand Down Expand Up @@ -281,3 +281,12 @@ _Pvt_Extensions

#IntelliJ
.idea/
src/Jhipster/workspace.code-workspace
src/Jhipster/obj/Debug/net5.0/project.razor.json
test/Jhipster.Test/obj/Jhipster.Test.csproj.nuget.dgspec.json
test/Jhipster.Test/obj/Jhipster.Test.csproj.nuget.g.props
test/Jhipster.Test/obj/Jhipster.Test.csproj.nuget.g.targets
test/Jhipster.Test/obj/project.assets.json
test/Jhipster.Test/bin/Debug/net5.0/jhipster.deps.json
test/Jhipster.Test/obj/Debug/net5.0/Jhipster.Test.AssemblyInfo.cs
test/Jhipster.Test/obj/Debug/net5.0/project.razor.json
9 changes: 9 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
image: gitpod/workspace-dotnet

tasks:
- init: dotnet build
command: dotnet run

vscode:
extensions:
- [email protected]:abbce152176cb417d759880513465a5b
34 changes: 34 additions & 0 deletions .theia/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": "${command:pickProcess}" // if this doesn't work, use ps -aux
},
{
"name": ".NET Core Launch (web)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Jhipster/bin/Debug/net5.0/jhipster.dll",
"args": [],
"cwd": "${workspaceFolder}/src/Jhipster",
"stopAtEntry": true,
"serverReadyAction": {
"action": "openExternally",
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
},
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"sourceFileMap": {
"/Views": "${workspaceFolder}/Views"
}
}

]
}
41 changes: 41 additions & 0 deletions .theia/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"tasks": [
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/src/Jhipster/Jhipster.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "publish",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"${workspaceFolder}/src/Jhipster/Jhipster.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "watch",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"${workspaceFolder}/src/Jhipster/Jhipster.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
}
]
}
35 changes: 35 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (web)",
"type": "coreclr",
"request": "launch",
"justMyCode": false,
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/Jhipster/bin/Debug/net5.0/jhipster.dll",
"args": [],
"cwd": "${workspaceFolder}/src/Jhipster",
"stopAtEntry": false,
"serverReadyAction": {
"action": "openExternally",
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
},
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"sourceFileMap": {
"/Views": "${workspaceFolder}/Views"
}
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": "${command:pickProcess}"
}
]
}
42 changes: 42 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/src/Jhipster/Jhipster.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "publish",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"${workspaceFolder}/src/Jhipster/Jhipster.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "watch",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"${workspaceFolder}/src/Jhipster/Jhipster.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
}
]
}
15 changes: 15 additions & 0 deletions Jhipster.sln
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jhipster.Domain.Services",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jhipster.Infrastructure", "src\Jhipster.Infrastructure\Jhipster.Infrastructure.csproj", "{00F45CD8-2046-4B67-983F-4716074A4CEE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextTemplateCSharp", "src\TextTemplate\TextTemplateCSharp.csproj", "{7F7C2841-21B0-4958-B80B-622076ECE4B2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -118,6 +120,18 @@ Global
{00F45CD8-2046-4B67-983F-4716074A4CEE}.Release|x64.Build.0 = Release|Any CPU
{00F45CD8-2046-4B67-983F-4716074A4CEE}.Release|x86.ActiveCfg = Release|Any CPU
{00F45CD8-2046-4B67-983F-4716074A4CEE}.Release|x86.Build.0 = Release|Any CPU
{7F7C2841-21B0-4958-B80B-622076ECE4B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7F7C2841-21B0-4958-B80B-622076ECE4B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7F7C2841-21B0-4958-B80B-622076ECE4B2}.Debug|x64.ActiveCfg = Debug|Any CPU
{7F7C2841-21B0-4958-B80B-622076ECE4B2}.Debug|x64.Build.0 = Debug|Any CPU
{7F7C2841-21B0-4958-B80B-622076ECE4B2}.Debug|x86.ActiveCfg = Debug|Any CPU
{7F7C2841-21B0-4958-B80B-622076ECE4B2}.Debug|x86.Build.0 = Debug|Any CPU
{7F7C2841-21B0-4958-B80B-622076ECE4B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7F7C2841-21B0-4958-B80B-622076ECE4B2}.Release|Any CPU.Build.0 = Release|Any CPU
{7F7C2841-21B0-4958-B80B-622076ECE4B2}.Release|x64.ActiveCfg = Release|Any CPU
{7F7C2841-21B0-4958-B80B-622076ECE4B2}.Release|x64.Build.0 = Release|Any CPU
{7F7C2841-21B0-4958-B80B-622076ECE4B2}.Release|x86.ActiveCfg = Release|Any CPU
{7F7C2841-21B0-4958-B80B-622076ECE4B2}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{092E3A68-F1CD-45A4-A378-A885F9B06564} = {DF511F34-5A8C-42CC-B1F0-6BB6FE6C37A4}
Expand All @@ -127,5 +141,6 @@ Global
{B4596831-ADFA-4B92-A787-1070A59776CD} = {DF511F34-5A8C-42CC-B1F0-6BB6FE6C37A4}
{54A0B109-E458-43C8-B27D-AE17C8046598} = {DF511F34-5A8C-42CC-B1F0-6BB6FE6C37A4}
{00F45CD8-2046-4B67-983F-4716074A4CEE} = {DF511F34-5A8C-42CC-B1F0-6BB6FE6C37A4}
{7F7C2841-21B0-4958-B80B-622076ECE4B2} = {DF511F34-5A8C-42CC-B1F0-6BB6FE6C37A4}
EndGlobalSection
EndGlobal
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ Before you can build this project, you must install and configure the following
After installing Node, you should be able to run the following command to install development tools.
You will only need to run this command when dependencies change in [package.json](package.json).

In the ./ directory run

dotnet restore

In ./src/Jhipster/ClientApp run

npm install
Expand All @@ -21,9 +25,13 @@ We use npm scripts and [Webpack][] as our build system.
Run the following commands in two separate terminals to create a blissful development experience where your browser
auto-refreshes when files change on your hard drive.

dotnet run --verbosity normal --project ./src/Jhipster/Jhipster.csproj
dotnet run --verbosity normal --no-restore --project ./src/Jhipster/Jhipster.csproj
npm --prefix ./src/Jhipster/ClientApp start

To determine which process is running, you can use the powershell command:

get-nettcpconnection | where {($_.State -eq "Listen") -and ($_.RemoteAddress -eq "0.0.0.0")} | Select LocalAddress,LocalPort,RemoteAddress,RemotePort,State,OwningProcess | ft

npm is also used to manage CSS and JavaScript dependencies used in this application. You can upgrade dependencies by
specifying a newer version in [package.json](package.json). You can also run `npm update` and `npm install` to manage dependencies.
Add the `help` flag on any command to see how you can use it. For example, `npm help update`.
Expand Down
16 changes: 13 additions & 3 deletions app.jdl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
entity Region {
regionName String
entity Category {
categoryName String
}

entity Country {
Expand Down Expand Up @@ -28,6 +28,16 @@ entity PieceOfWork {
description String
}

/**
* Ruleset entity.
* @author The JHipster team.
*/
entity Ruleset {
name String,
jsonString String
}


/**
* The Employee entity.
*/
Expand Down Expand Up @@ -63,7 +73,7 @@ enum Language {


relationship OneToOne {
Country{region} to Region
Country{category} to Category
}

relationship OneToOne {
Expand Down
Binary file added app.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions list
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/bash
git ls-tree -r --name-only HEAD -z | TZ=UTC xargs -0n1 -I_ git --no-pager log -1 --date=iso-local --format="%ad _" -- _ | grep "2022"
Loading