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

[DO NOT MERGE] Hra-ui migration #1232

Open
wants to merge 30 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
75bc10a
Migrate to nx (WIP)
axdanbol Jan 25, 2024
4910762
Remove libraries that should not be migrated
axdanbol Jan 25, 2024
6ab76d5
Remove scripts (will be executed by nx instead)
axdanbol Jan 25, 2024
0a3b2f6
Remove non-migrated files
axdanbol Jan 25, 2024
4eea643
Update build for triple-store-utils
axdanbol Jan 25, 2024
89f3f2a
Fix body ui build
axdanbol Jan 25, 2024
549a64c
Fix ccf-database build
axdanbol Jan 25, 2024
35b949a
Fix ccf-shared build
axdanbol Jan 25, 2024
efc9344
Fix eui build
axdanbol Jan 26, 2024
06ba7d6
Fix rui build
axdanbol Jan 29, 2024
080d1ae
More rui build fixes
axdanbol Jan 29, 2024
b1335ff
Fix ccf-organ-info build
axdanbol Jan 30, 2024
1f617d6
Fix ccf-body-ui-wc build
axdanbol Jan 30, 2024
74c095e
Tweak tsconfig files
axdanbol Jan 30, 2024
66bba49
Fix triple-store-utils test runner
axdanbol Jan 30, 2024
fe6b664
Fix ccf-shared tests
axdanbol Jan 31, 2024
d6ea3aa
Fix ccf-database testing
axdanbol Feb 1, 2024
f34f0c0
Fix ccf-body-ui testing
axdanbol Feb 1, 2024
d78961c
Fix ccf-body-ui-wc testing
axdanbol Feb 1, 2024
a85ba60
Fix ccf-eui testing
axdanbol Feb 1, 2024
b7f1745
Fix ccf-organ-info testing
axdanbol Feb 1, 2024
d586e79
Fix ccf-rui testing
axdanbol Feb 1, 2024
095564b
Remove unused e2e apps
axdanbol Feb 2, 2024
193719f
Fix ccf-body-ui-wc webcomponent build
axdanbol Feb 2, 2024
5882373
Fix build webcomponent
axdanbol Feb 5, 2024
69a74b4
Fix compodoc builds
axdanbol Feb 5, 2024
8393277
Merge branch 'develop' of https://github.com/hubmapconsortium/ccf-ui …
axdanbol Feb 5, 2024
318c1dd
Remove old data generation files
axdanbol Feb 5, 2024
85ed739
Fix longstanding angular injection warning
axdanbol Feb 5, 2024
964471f
Cache compodoc output
axdanbol Feb 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 0 additions & 7 deletions .dockerignore

This file was deleted.

1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true
max_line_length = 120

[*.md]
max_line_length = off
Expand Down
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
92 changes: 30 additions & 62 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
{
"root": true,
"ignorePatterns": [
"projects/**/*"
],
"ignorePatterns": ["**/*"],
"overrides": [
{
"files": [
"*.ts"
],
"files": ["*.ts"],
"parserOptions": {
"project": [
"tsconfig.json",
"e2e/tsconfig.json"
],
"createDefaultProgram": true
},
"extends": [
Expand All @@ -22,17 +14,10 @@
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
// Eslint rules
"arrow-body-style": "error",
"curly": [
"error",
"all"
],
"curly": ["error", "all"],
"default-case-last": "error",
"eol-last": [
"error",
"always"
],
"eol-last": ["error", "always"],
"grouped-accessor-pairs": "error",
"guard-for-in": "warn",
"no-alert": "error",
Expand Down Expand Up @@ -62,9 +47,6 @@
"no-whitespace-before-property": "error",
"prefer-object-spread": "warn",
"require-atomic-updates": "error",


// Disabled eslint rules superseded by @typescript-eslint rules or the TS compiler itself
"brace-style": "off",
"func-call-spacing": "off",
"indent": "off",
Expand All @@ -79,15 +61,9 @@
"quotes": "off",
"semi": "off",
"space-before-function-paren": "off",


// @typescript-eslint rules
"@typescript-eslint/array-type": "error",
"@typescript-eslint/ban-tslint-comment": "warn",
"@typescript-eslint/brace-style": [
"error",
"1tbs"
],
"@typescript-eslint/brace-style": ["error", "1tbs"],
"@typescript-eslint/consistent-type-assertions": [
"error",
{
Expand Down Expand Up @@ -124,27 +100,17 @@
"default": [
"static-field",
"static-method",

"public-decorated-field",
"public-instance-field",
"public-abstract-field",

"signature",

"protected-field",
"private-field",
"field",

"constructor",

"method"
],
"interfaces": [
"field",
"signature",
"constructor",
"method"
]
"interfaces": ["field", "signature", "constructor", "method"]
}
],
"@typescript-eslint/naming-convention": [
Expand All @@ -153,7 +119,6 @@
"selector": "default",
"format": ["camelCase"]
},

{
"selector": "classProperty",
"modifiers": ["readonly"],
Expand Down Expand Up @@ -216,14 +181,8 @@
"@typescript-eslint/prefer-nullish-coalescing": "error",
"@typescript-eslint/prefer-optional-chain": "error",
"@typescript-eslint/prefer-reduce-type-parameter": "error",
"@typescript-eslint/quotes": [
"error",
"single"
],
"@typescript-eslint/return-await": [
"error",
"in-try-catch"
],
"@typescript-eslint/quotes": ["error", "single"],
"@typescript-eslint/return-await": ["error", "in-try-catch"],
"@typescript-eslint/semi": "error",
"@typescript-eslint/space-before-function-paren": [
"error",
Expand All @@ -235,18 +194,12 @@
],
"@typescript-eslint/switch-exhaustiveness-check": "error",
"@typescript-eslint/type-annotation-spacing": "error",


// @angular-eslint rules
"@angular-eslint/no-queries-metadata-property": "error",
"@angular-eslint/prefer-on-push-component-change-detection": "warn",
"@angular-eslint/prefer-output-readonly": "warn",
"@angular-eslint/relative-url-prefix": "error",
"@angular-eslint/use-component-selector": "error",
"@angular-eslint/use-component-view-encapsulation": "error",


// Per repo @angular-eslint rules
"@angular-eslint/component-selector": [
"error",
{
Expand All @@ -266,13 +219,28 @@
}
},
{
"files": [
"*.html"
],
"extends": [
"plugin:@angular-eslint/template/recommended"
],
"files": ["*.html"],
"extends": ["plugin:@angular-eslint/template/recommended"],
"rules": {}
},
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
"allow": [],
"depConstraints": [
{
"sourceTag": "*",
"onlyDependOnLibsWithTags": ["*"]
}
]
}
]
}
}
]
],
"plugins": ["@nx"]
}
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ yarn-error.log
testem.log
/typings
svgo.config.js
.nx

# System Files
.DS_Store
Expand All @@ -59,4 +58,7 @@ Thumbs.db
.scannerwork/

# Development data
projects/ccf-eui/src/assets/dev-data
apps/ccf-eui/src/assets/dev-data


.nx/cache
1 change: 0 additions & 1 deletion .nvmrc

This file was deleted.

4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Add files here to ignore them from prettier formatting
/dist
/coverage
/.nx/cache
3 changes: 3 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"singleQuote": true
}
Loading
Loading