Skip to content

Commit 5ac9b22

Browse files
committed
refactor(libs): move all datahub common components to a new mel lib
1 parent 4dbcae0 commit 5ac9b22

File tree

47 files changed

+271
-39
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+271
-39
lines changed

apps/datahub/src/app/app.module.ts

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -41,28 +41,11 @@ import { HomePageComponent } from './home/home-page/home-page.component'
4141
import { AppRouterService } from './app.router.service'
4242
import { HomeHeaderComponent } from './home/home-header/home-header.component'
4343
import { MatIconModule } from '@angular/material/icon'
44-
import { MelEmbeddedTranslateLoader } from './common/embedded.translate.loader'
45-
import { ResultsListComponent } from './common/results-list/results-list.component'
46-
import { ResultsListItemComponent } from './common/results-list-item/results-list-item.component'
47-
import { ResultsListCarouselComponent } from './common/results-list/results-list-carousel/results-list-carousel.component'
48-
import { ResultsListGridComponent } from './common/results-list/results-list-grid/results-list-grid.component'
49-
import { ResultsCardFavoriteComponent } from './common/results-list-item/results-card-favorite/results-card-favorite.component'
50-
import { ResultsCardLastCreatedComponent } from './common/results-list-item/results-card-last-created/results-card-last-created.component'
51-
import { ResultsCardSearchComponent } from './common/results-list-item/results-card-search/results-card-search.component'
5244
import { MatTabsModule } from '@angular/material/tabs'
5345
import { DatasetApisComponent } from './dataset/dataset-apis/dataset-apis.component'
54-
import { MelDatahubMetadataQualityComponent } from './common/metadata-quality/mel-datahub-metadata-quality.component'
5546
import { DatasetHeaderComponent } from './dataset/dataset-header/dataset-header.component'
56-
import { ButtonComponent } from './common/button/button.component'
5747
import { DatasetDownloadsComponent } from './dataset/dataset-downloads/dataset-downloads.component'
58-
import { FavoriteHeartComponent } from './common/favorites/favorite-heart/favorite-heart.component'
59-
import { HeartToggleComponent } from './common/favorites/heart-toggle/heart-toggle.component'
60-
import { TextExpandComponent } from './common/text-expand/text-expand.component'
61-
import { MelDatahubFooterComponent } from './common/footer/mel-datahub-footer.component'
62-
import { CustomCarouselComponent } from './common/custom-carousel/custom-carousel.component'
6348
import { DatasetInformationComponent } from './dataset/dataset-information/dataset-information.component'
64-
import { MelFuzzySearchComponent } from './common/fuzzy-search/fuzzy-search.component'
65-
import { MelAutocompleteComponent } from './common/autocomplete/autocomplete.component'
6649
import { ReactiveFormsModule } from '@angular/forms'
6750
import { MatAutocompleteModule } from '@angular/material/autocomplete'
6851
import { SearchFormComponent } from './search/search-form/search-form.component'
@@ -80,7 +63,7 @@ import { DatasetVisualisationComponent } from './dataset/dataset-visualisation/d
8063
import { MelMapViewComponent } from './dataset/dataset-visualisation/map-view/map-view.component'
8164
import { MelDataViewComponent } from './dataset/dataset-visualisation/data-view/data-view.component'
8265
import { environment } from '../environments/environnment'
83-
import { StripHtmlPipe } from './common/strip-html.pipe'
66+
import { MelModule, MelEmbeddedTranslateLoader } from '@mel-dataplatform/mel'
8467

8568
@NgModule({
8669
declarations: [
@@ -90,27 +73,11 @@ import { StripHtmlPipe } from './common/strip-html.pipe'
9073
SearchResultsComponent,
9174
HomePageComponent,
9275
HomeHeaderComponent,
93-
ResultsListComponent,
94-
ResultsListCarouselComponent,
95-
ResultsListGridComponent,
96-
ResultsListItemComponent,
97-
ResultsCardFavoriteComponent,
98-
ResultsCardLastCreatedComponent,
99-
ResultsCardSearchComponent,
10076
DatasetPageComponent,
10177
DatasetApisComponent,
102-
MelDatahubMetadataQualityComponent,
10378
DatasetHeaderComponent,
104-
ButtonComponent,
10579
DatasetDownloadsComponent,
106-
FavoriteHeartComponent,
107-
HeartToggleComponent,
108-
TextExpandComponent,
109-
MelDatahubFooterComponent,
110-
CustomCarouselComponent,
11180
DatasetInformationComponent,
112-
MelFuzzySearchComponent,
113-
MelAutocompleteComponent,
11481
SearchFormComponent,
11582
SearchFiltersComponent,
11683
MelFilterDropdownComponent,
@@ -122,9 +89,9 @@ import { StripHtmlPipe } from './common/strip-html.pipe'
12289
DatasetVisualisationComponent,
12390
MelMapViewComponent,
12491
MelDataViewComponent,
125-
StripHtmlPipe,
12692
],
12793
imports: [
94+
MelModule,
12895
BrowserModule,
12996
BrowserAnimationsModule,
13097
UiWidgetsModule,

apps/datahub/tsconfig.editor.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": "./tsconfig.json",
3-
"include": ["src/**/*.ts"],
3+
"include": ["src/**/*.ts", "../../libs/mel/src/lib/strip-html.pipe.ts"],
44
"compilerOptions": {
55
"types": ["jest", "node"]
66
}

libs/mel/.eslintrc.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"extends": ["../../.eslintrc.json"],
3+
"ignorePatterns": ["!**/*"],
4+
"overrides": [
5+
{
6+
"files": ["*.ts"],
7+
"extends": [
8+
"plugin:@nx/angular",
9+
"plugin:@angular-eslint/template/process-inline-templates"
10+
],
11+
"rules": {
12+
"@angular-eslint/directive-selector": [
13+
"error",
14+
{
15+
"type": "attribute",
16+
"prefix": "melDataplatform",
17+
"style": "camelCase"
18+
}
19+
],
20+
"@angular-eslint/component-selector": [
21+
"error",
22+
{
23+
"type": "element",
24+
"prefix": "mel-datahub",
25+
"style": "kebab-case"
26+
}
27+
]
28+
}
29+
},
30+
{
31+
"files": ["*.html"],
32+
"extends": ["plugin:@nx/angular-template"],
33+
"rules": {}
34+
}
35+
]
36+
}

libs/mel/README.md

Lines changed: 7 additions & 0 deletions

libs/mel/jest.config.ts

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/* eslint-disable */
2+
export default {
3+
displayName: 'mel',
4+
preset: '../../jest.preset.js',
5+
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
6+
coverageDirectory: '../../coverage/libs/mel',
7+
transform: {
8+
'^.+\\.(ts|mjs|js|html)$': [
9+
'jest-preset-angular',
10+
{
11+
tsconfig: '<rootDir>/tsconfig.spec.json',
12+
stringifyContentPathRegex: '\\.(html|svg)$',
13+
},
14+
],
15+
},
16+
transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
17+
snapshotSerializers: [
18+
'jest-preset-angular/build/serializers/no-ng-attributes',
19+
'jest-preset-angular/build/serializers/ng-snapshot',
20+
'jest-preset-angular/build/serializers/html-comment',
21+
],
22+
}

libs/mel/project.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"name": "mel",
3+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
4+
"sourceRoot": "libs/mel/src",
5+
"prefix": "mel-datahub",
6+
"tags": [],
7+
"projectType": "library",
8+
"targets": {
9+
"test": {
10+
"executor": "@nx/jest:jest",
11+
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
12+
"options": {
13+
"jestConfig": "libs/mel/jest.config.ts"
14+
}
15+
},
16+
"lint": {
17+
"executor": "@nx/eslint:lint",
18+
"outputs": ["{options.outputFile}"]
19+
}
20+
}
21+
}

libs/mel/src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export * from './lib/mel.module'
2+
export * from './lib/embedded.translate.loader'

apps/datahub/src/app/common/autocomplete/autocomplete.component.html renamed to libs/mel/src/lib/autocomplete/autocomplete.component.html

File renamed without changes.

apps/datahub/src/app/common/autocomplete/autocomplete.component.ts renamed to libs/mel/src/lib/autocomplete/autocomplete.component.ts

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)