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

enable importing fwdata projects as crdts #863

Merged
merged 46 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
8f796d6
use async scopes when creating project scopes to allow disposing of I…
hahn-kev Jun 5, 2024
77564fb
implement fwdata file import to FW lite, switch to new performance pa…
hahn-kev Jun 5, 2024
39a0cda
make CreateEntryLite method to improve import performance, tweak some…
hahn-kev Jun 5, 2024
043ce42
show fieldworks projects in project list, allow importing them by cli…
hahn-kev Jun 5, 2024
4695630
remove sena-3 automatic project creation
hahn-kev Jun 5, 2024
bc815ac
correct import parameter expectations
hahn-kev Jun 5, 2024
cdc22d5
change tests to use async service scope
hahn-kev Jun 5, 2024
c408824
fix a bug where proxy updates wouldn't work on multi strings
hahn-kev Jun 6, 2024
681569c
rename and move LexboxApiHub.cs to CrdtMiniLcmApiHub.cs
hahn-kev Jun 6, 2024
8704561
allow editing fwdata files directly without importing them
hahn-kev Jun 6, 2024
5a40534
cache LcmCache project service between requests to avoid loading it e…
hahn-kev Jun 7, 2024
8ca3b03
don't log user provided value
hahn-kev Jun 7, 2024
97c2f0a
Merge remote-tracking branch 'refs/remotes/origin/develop' into feat/…
hahn-kev Jun 7, 2024
b8d1f15
refactor db init in tests to avoid wiping out the in memory db. Fix c…
hahn-kev Jun 7, 2024
3d2a624
Merge branch 'refs/heads/develop' into feat/import-fwdata-project-as-…
hahn-kev Jun 7, 2024
7763062
use application lifetime to cancel oauth tasks to prevent the app fro…
hahn-kev Jun 7, 2024
1defd3e
change default authority to develop for now
hahn-kev Jun 7, 2024
2e6126b
Merge branch 'refs/heads/develop' into feat/import-fwdata-project-as-…
hahn-kev Jun 7, 2024
ad477f6
fix system threading package version mismatch
hahn-kev Jun 7, 2024
15d7204
Merge branch 'refs/heads/develop' into feat/import-fwdata-project-as-…
hahn-kev Jun 11, 2024
8f19776
init Icu on startup for dev, add an Icu binary project reference
hahn-kev Jun 11, 2024
f52c59f
move crdt sync in lexbox into a controller, update the path in the sy…
hahn-kev Jun 11, 2024
f7ce0db
rework project list, list projects from lexbox.
hahn-kev Jun 11, 2024
ef6f8ca
run vite over https when running out of docker. Fix some forwarding i…
hahn-kev Jun 11, 2024
aee2e3d
make list lexbox projects work while offline
hahn-kev Jun 11, 2024
5ea6664
remove required crdt commit hash fields
hahn-kev Jun 11, 2024
c314054
wire up project upload button from home page. This will upload a CRDT…
hahn-kev Jun 11, 2024
b24d2b6
update harmony to fix a sync bug related to commits getting synced wh…
hahn-kev Jun 11, 2024
90f01b3
setup download crdt project workflow
hahn-kev Jun 11, 2024
d3bd34c
local-web-app and viewer fixups and styling
myieye Jun 12, 2024
71f8013
Fix invalid cast
myieye Jun 13, 2024
638b29c
Fix: changes are diffed against the first viewed or last changed entry
myieye Jun 13, 2024
19cd4c9
Set correct api features
myieye Jun 13, 2024
7bc9bb1
Adds https-proxy as oauth authority for local or k8s
myieye Jun 13, 2024
27008d5
Add fwdata support for example sentnce translations
myieye Jun 13, 2024
c43742c
enable https in k8s
hahn-kev Jun 13, 2024
7d06e9b
Use correct writing-system type in crd-api query
myieye Jun 14, 2024
f3f0a98
Add exemplars and implementing querying for FwData API
myieye Jun 14, 2024
77e8f5c
Update svelte-ux so the app doesn't crash when you navigate away from…
myieye Jun 14, 2024
ace5961
Merge branch 'refs/heads/develop' into feat/import-fwdata-project-as-…
hahn-kev Jun 14, 2024
2fe3718
fix lockfile conflicts
hahn-kev Jun 14, 2024
c2ebf16
catch auth errors when trying to acquire token silently so we don't t…
hahn-kev Jun 14, 2024
7246d65
fix unit tests failing because there was no vernacular writing system
hahn-kev Jun 14, 2024
386af71
fix `pnpm run -r build` faliing by removing build script from https-p…
hahn-kev Jun 14, 2024
64c53e7
fix security issue caused by passing the project file name directly i…
hahn-kev Jun 14, 2024
fef78c6
sanitize create project name
hahn-kev Jun 14, 2024
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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "backend/harmony"]
path = backend/harmony
url = https://github.com/hahn-kev/harmony.git
branch = add-crdt
branch = chore/performance-pass
7 changes: 7 additions & 0 deletions LexBox.sln
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crdt", "backend\harmony\src
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crdt.Core", "backend\harmony\src\Crdt.Core\Crdt.Core.csproj", "{8B54FFB5-0BDF-403E-83CC-A3B3861EC507}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FwDataMiniLcmBridge", "backend\FwDataMiniLcmBridge\FwDataMiniLcmBridge.csproj", "{279197B6-EC06-4DE0-94F8-625379C3AD83}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -95,6 +97,10 @@ Global
{8B54FFB5-0BDF-403E-83CC-A3B3861EC507}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8B54FFB5-0BDF-403E-83CC-A3B3861EC507}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8B54FFB5-0BDF-403E-83CC-A3B3861EC507}.Release|Any CPU.Build.0 = Release|Any CPU
{279197B6-EC06-4DE0-94F8-625379C3AD83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{279197B6-EC06-4DE0-94F8-625379C3AD83}.Debug|Any CPU.Build.0 = Debug|Any CPU
{279197B6-EC06-4DE0-94F8-625379C3AD83}.Release|Any CPU.ActiveCfg = Release|Any CPU
{279197B6-EC06-4DE0-94F8-625379C3AD83}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{E8BB768B-C3DC-4BE6-9B9F-82319E05AF86} = {7B6E21C4-5AF4-4505-B7D9-59A3886C5090}
Expand All @@ -104,5 +110,6 @@ Global
{7D874D9B-1CA9-49E9-8B03-91B5C324E938} = {7B6E21C4-5AF4-4505-B7D9-59A3886C5090}
{740C8FF5-8006-4047-8C52-53873C2DD7C4} = {7B6E21C4-5AF4-4505-B7D9-59A3886C5090}
{8B54FFB5-0BDF-403E-83CC-A3B3861EC507} = {7B6E21C4-5AF4-4505-B7D9-59A3886C5090}
{279197B6-EC06-4DE0-94F8-625379C3AD83} = {7B6E21C4-5AF4-4505-B7D9-59A3886C5090}
EndGlobalSection
EndGlobal
6 changes: 5 additions & 1 deletion Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ tasks:
- echo "GOOGLE_OAUTH_CLIENT_ID=__REPLACE__.apps.googleusercontent.com" >> deployment/local-dev/local.env
- echo "GOOGLE_OAUTH_CLIENT_SECRET=__REPLACE__" >> deployment/local-dev/local.env
- kubectl --context=docker-desktop apply -f deployment/setup/namespace.yaml
- kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.15.0/cert-manager.yaml
- docker build -t local-dev-init data/
setup-win:
platforms: [ windows ]
Expand Down Expand Up @@ -78,5 +79,8 @@ tasks:
deps: [ infra-up, api:only, k8s:infra-forward ]
interactive: true

local-web-app-for-develop:
deps: [ ui:viewer-dev, api:local-web-app-for-develop, ui:https-oauth-authority ]

local-web-app:
deps: [ ui:viewer-dev, api:local-web-app ]
deps: [ ui:viewer-dev, api:local-web-app, ui:https-oauth-authority ]
Loading
Loading