Skip to content

Commit

Permalink
Merge pull request #3297 from dzhw/moellerth/issue3216-pre-release
Browse files Browse the repository at this point in the history
Embargo date & Pre-Release
  • Loading branch information
tilovillwock authored Jun 11, 2024
2 parents 1752312 + 414a50d commit 4498f6e
Show file tree
Hide file tree
Showing 164 changed files with 4,928 additions and 820 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
echo $BUILD_COMMIT_HASH
sed -i "s/\"buildHash\": \".*\"/\"buildHash\": \"$BUILD_COMMIT_HASH\"/" mdm-frontend/src/assets/config.json
cat mdm-frontend/src/assets/config.json
- name: Set up JDK 15
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: 15
java-version: 17
- name: Cache maven artifacts
uses: actions/cache@v3
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:
echo $BUILD_COMMIT_HASH
sed -i "s/\"buildHash\": \".*\"/\"buildHash\": \"$BUILD_COMMIT_HASH\"/" mdm-frontend/src/assets/config.json
cat mdm-frontend/src/assets/config.json
- name: Set up JDK 15
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: 15
java-version: 17
- name: Cache maven artifacts
uses: actions/cache@v3
env:
Expand Down
26 changes: 25 additions & 1 deletion buildconfig/spotbugs-exclude.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,28 @@
<Match>
<Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
</Match>
</FindBugsFilter>
<!--
There are about a thousand EI_EXPOSE_REP warnings prompted by
lomboks getter annotation used all over the place because the
returned lists or objects aren't immutable.
There is no point in fixing those by writing boilerplate code
(e.g. adding and removing items to a list individually) or
by adding suppression annotations.
-->
<Match>
<Bug pattern="EI_EXPOSE_REP"/>
</Match>
<Match>
<Bug pattern="EI_EXPOSE_REP2"/>
</Match>

<!--
Fixing all CT_CONSTRUCTOR_THROW warnings is also pointless
because most exceptions will bubble up anyway and terminate
either the app or at the very least the spawned thread
-->
<Match>
<Bug pattern="CT_CONSTRUCTOR_THROW"/>
</Match>
</FindBugsFilter>
74 changes: 74 additions & 0 deletions mdm-frontend/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"root": true,
"ignorePatterns": [
"projects/**/*",
"**/configuration/*",
"**/legacy/variablemanagement/directives/create-variable-links.directive.js"
],
"overrides": [
{
"files": [
"*.ts"
],
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
"@angular-eslint/directive-selector": [
"error",
{
"type": "attribute",
"prefix": "app",
"style": "camelCase"
}
],
"@angular-eslint/component-selector": [
"error",
{
"type": "element",
"prefix": "app",
"style": "kebab-case"
}
],
"max-len": [
"error",
{
"code": 120
}
],
"semi": ["error", "always"]
}
},
{
"files": [
"*.html"
],
"extends": [
"plugin:@angular-eslint/template/recommended",
"plugin:@angular-eslint/template/accessibility"
],
"rules": {}
},
{
"files": [
"*.js"
],
"extends": [
"plugin:@angular-eslint/template/recommended",
"plugin:@angular-eslint/template/accessibility"
],
"rules": {
"max-len": [
"error",
{
"code": 120
}
],
"semi": ["error", "always"]
}
}
]
}
92 changes: 55 additions & 37 deletions mdm-frontend/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
"src/manifest.json",
"src/assets",
{
"glob": "**/*.html.tmpl",
"input": "src/app/legacy",
"output": "scripts/"
"glob": "**/*.html.tmpl",
"input": "src/app/legacy",
"output": "scripts/"
},
{
"glob": "**/*",
Expand All @@ -38,12 +38,30 @@
"./node_modules/bootstrap/dist/css/bootstrap.min.css",
"src/scss/main.scss",
"src/scss/fdz.scss",
{ "input": "./node_modules/angular-material/angular-material.css", "bundleName": "vendor-styles"},
{ "input": "./node_modules/angular-block-ui/dist/angular-block-ui.css", "bundleName": "vendor-styles"},
{ "input": "./node_modules/highlightjs/styles/default.css", "bundleName": "vendor-styles"},
{ "input": "./node_modules/angular-jk-carousel/dist/jk-carousel.css", "bundleName": "vendor-styles"},
{ "input": "./node_modules/jsonformatter/dist/json-formatter.css", "bundleName": "vendor-styles"},
{ "input": "./node_modules/fdz-paginator/dest/fdz-paginator.css", "bundleName": "vendor-styles"}
{
"input": "./node_modules/angular-material/angular-material.css",
"bundleName": "vendor-styles"
},
{
"input": "./node_modules/angular-block-ui/dist/angular-block-ui.css",
"bundleName": "vendor-styles"
},
{
"input": "./node_modules/highlightjs/styles/default.css",
"bundleName": "vendor-styles"
},
{
"input": "./node_modules/angular-jk-carousel/dist/jk-carousel.css",
"bundleName": "vendor-styles"
},
{
"input": "./node_modules/jsonformatter/dist/json-formatter.css",
"bundleName": "vendor-styles"
},
{
"input": "./node_modules/fdz-paginator/dest/fdz-paginator.css",
"bundleName": "vendor-styles"
}
],
"scripts": [
"./node_modules/jquery/dist/jquery.js",
Expand Down Expand Up @@ -108,15 +126,12 @@
"./node_modules/angulartics-piwik/src/angulartics-piwik.js",
"./node_modules/angular-uuid/angular-uuid.js",
"./node_modules/citation-js/build/citation.js",

"src/app/legacy/app.js",
"src/app/legacy/app.constants.js",

"src/app/legacy/start/configuration/start.js",
"src/app/legacy/start/configuration/translations-de.js",
"src/app/legacy/start/configuration/translations-en.js",
"src/app/legacy/start/views/start.controller.js",

"src/app/legacy/administration/admin.js",
"src/app/legacy/administration/configuration/translations-de.js",
"src/app/legacy/administration/configuration/translations-en.js",
Expand All @@ -133,7 +148,6 @@
"src/app/legacy/administration/usermanagement/user.resource.js",
"src/app/legacy/administration/usermanagement/user-message-dialog.controller.js",
"src/app/legacy/administration/usermanagement/edit-user.controller.js",

"src/app/legacy/usermanagement/configuration/translations-de.js",
"src/app/legacy/usermanagement/configuration/translations-en.js",
"src/app/legacy/usermanagement/account/account.js",
Expand Down Expand Up @@ -163,7 +177,6 @@
"src/app/legacy/usermanagement/auth/auth.interceptor.js",
"src/app/legacy/usermanagement/welcome/services/welcome-dialog.service.js",
"src/app/legacy/usermanagement/welcome/views/welcome-dialog.controller.js",

"src/app/legacy/common/easteregg/egg.js",
"src/app/legacy/common/easteregg/thankyou.js",
"src/app/legacy/common/easteregg/confused.js",
Expand Down Expand Up @@ -270,16 +283,16 @@
"src/app/legacy/common/datasource/data-source.component.js",
"src/app/legacy/common/datasource/data-source.controller.js",
"src/app/legacy/common/session-storage/session-storage.service.js",

"src/app/legacy/common/embargo-warning/embargo-warning.directive.js",
"src/app/legacy/common/embargo-warning/configuration/translations-de.js",
"src/app/legacy/common/embargo-warning/configuration/translations-en.js",
"src/app/legacy/filemanagement/resources/file.resource.js",
"src/app/legacy/filemanagement/services/excelReader.service.js",
"src/app/legacy/filemanagement/services/fileReader.service.js",

"src/app/legacy/disclosure/configuration/disclosure.js",
"src/app/legacy/disclosure/configuration/translations-de.js",
"src/app/legacy/disclosure/configuration/translations-en.js",
"src/app/legacy/disclosure/views/disclosure.controller.js",

"src/app/legacy/variablemanagement/configuration/variable.js",
"src/app/legacy/variablemanagement/configuration/translations-de.js",
"src/app/legacy/variablemanagement/configuration/translations-en.js",
Expand All @@ -294,7 +307,6 @@
"src/app/legacy/variablemanagement/views/variable-detail.controller.js",
"src/app/legacy/variablemanagement/directives/diagram.directive.js",
"src/app/legacy/variablemanagement/directives/create-variable-links.directive.js",

"src/app/legacy/surveymanagement/configuration/survey.js",
"src/app/legacy/surveymanagement/configuration/translations-de.js",
"src/app/legacy/surveymanagement/configuration/translations-en.js",
Expand Down Expand Up @@ -323,7 +335,6 @@
"src/app/legacy/surveymanagement/directives/geographic-coverage.controller.js",
"src/app/legacy/surveymanagement/directives/unitValuePicker.controller.js",
"src/app/legacy/surveymanagement/directives/unitValuePicker.directive.js",

"src/app/legacy/datasetmanagement/configuration/dataSet.js",
"src/app/legacy/datasetmanagement/configuration/translations-de.js",
"src/app/legacy/datasetmanagement/configuration/translations-en.js",
Expand All @@ -343,7 +354,6 @@
"src/app/legacy/datasetmanagement/views/data-set-edit-or-create.controller.js",
"src/app/legacy/datasetmanagement/views/choose-data-set-number.controller.js",
"src/app/legacy/datasetmanagement/views/create-report-dialog.controller.js",

"src/app/legacy/questionmanagement/configuration/question.js",
"src/app/legacy/questionmanagement/configuration/translations-de.js",
"src/app/legacy/questionmanagement/configuration/translations-en.js",
Expand All @@ -356,7 +366,6 @@
"src/app/legacy/questionmanagement/services/questionImageUpload.service.js",
"src/app/legacy/questionmanagement/services/questionRepositoryClient.service.js",
"src/app/legacy/questionmanagement/views/question-detail.controller.js",

"src/app/legacy/datapackagemanagement/configuration/data-package.js",
"src/app/legacy/datapackagemanagement/configuration/translations-de.js",
"src/app/legacy/datapackagemanagement/configuration/translations-en.js",
Expand Down Expand Up @@ -384,7 +393,6 @@
"src/app/legacy/common/details/related-objects.controller.js",
"src/app/legacy/common/details/search.detail.component.js",
"src/app/legacy/common/details/search.detail.controller.js",

"src/app/legacy/instrumentmanagement/configuration/instrument.js",
"src/app/legacy/instrumentmanagement/configuration/translations-de.js",
"src/app/legacy/instrumentmanagement/configuration/translations-en.js",
Expand All @@ -401,7 +409,6 @@
"src/app/legacy/instrumentmanagement/resources/instrumentVersions.resource.js",
"src/app/legacy/instrumentmanagement/resources/instrumentAttachmentVersions.resource.js",
"src/app/legacy/instrumentmanagement/resources/availableInstrumentNumbers.resource.js",

"src/app/legacy/relatedpublicationmanagement/configuration/relatedPublication.js",
"src/app/legacy/relatedpublicationmanagement/configuration/translations-de.js",
"src/app/legacy/relatedpublicationmanagement/configuration/translations-en.js",
Expand All @@ -414,7 +421,6 @@
"src/app/legacy/relatedpublicationmanagement/services/relatedPublicationRepositoryClient.service.js",
"src/app/legacy/relatedpublicationmanagement/views/relatedPublicationDetail.controller.js",
"src/app/legacy/relatedpublicationmanagement/services/relatedPublicationSearch.service.js",

"src/app/legacy/dataacquisitionprojectmanagement/configuration/translations-de.js",
"src/app/legacy/dataacquisitionprojectmanagement/configuration/translations-en.js",
"src/app/legacy/dataacquisitionprojectmanagement/directives/data-acquisition-project-navbar-module.controller.js",
Expand Down Expand Up @@ -456,7 +462,7 @@
"src/app/legacy/dataacquisitionprojectmanagement/directives/releaseStatusBadge.directive.js",
"src/app/legacy/dataacquisitionprojectmanagement/directives/metadata-status.js",
"src/app/legacy/dataacquisitionprojectmanagement/services/outdatedVersionNotifierService.js",

"src/app/legacy/dataacquisitionprojectmanagement/directives/releaseButton.directive.js",
"src/app/legacy/searchmanagement/services/elasticSearch.client.service.js",
"src/app/legacy/searchmanagement/services/search.dao.js",
"src/app/legacy/searchmanagement/services/elasticSearchAdmin.service.js",
Expand Down Expand Up @@ -524,7 +530,6 @@
"src/app/legacy/searchmanagement/components/menu-toggle.component.js",
"src/app/legacy/searchmanagement/components/menu-toggle.controller.js",
"src/app/legacy/searchmanagement/components/package-info.controller.js",

"src/app/legacy/ordermanagement/configuration/shoppingCart.js",
"src/app/legacy/ordermanagement/configuration/translations-de.js",
"src/app/legacy/ordermanagement/configuration/translations-en.js",
Expand All @@ -546,7 +551,6 @@
"src/app/legacy/ordermanagement/components/data-package-configurator.controller.js",
"src/app/legacy/ordermanagement/components/analysis-package-configurator.component.js",
"src/app/legacy/ordermanagement/components/analysis-package-configurator.controller.js",

"src/app/legacy/conceptmanagement/configuration/concept.js",
"src/app/legacy/conceptmanagement/configuration/translations-de.js",
"src/app/legacy/conceptmanagement/configuration/translations-en.js",
Expand All @@ -560,7 +564,6 @@
"src/app/legacy/conceptmanagement/views/concept-edit-or-create.controller.js",
"src/app/legacy/conceptmanagement/directives/uniqueConceptIdValidator.directive.js",
"src/app/legacy/conceptmanagement/directives/composeConceptId.directive.js",

"src/app/legacy/analysispackagemanagement/configuration/analysis-package.js",
"src/app/legacy/analysispackagemanagement/configuration/translations-de.js",
"src/app/legacy/analysispackagemanagement/configuration/translations-en.js",
Expand Down Expand Up @@ -613,9 +616,9 @@
"src/manifest.json",
"src/assets",
{
"glob": "**/*.html.tmpl",
"input": "src/app/legacy",
"output": "scripts/"
"glob": "**/*.html.tmpl",
"input": "src/app/legacy",
"output": "scripts/"
},
{
"glob": "**/*",
Expand All @@ -640,9 +643,9 @@
"src/manifest.json",
"src/assets",
{
"glob": "**/*.html.tmpl",
"input": "src/app/legacy",
"output": "scripts/"
"glob": "**/*.html.tmpl",
"input": "src/app/legacy",
"output": "scripts/"
},
{
"glob": "**/*",
Expand Down Expand Up @@ -673,9 +676,9 @@
"src/manifest.json",
"src/assets",
{
"glob": "**/*.html.tmpl",
"input": "src/app/legacy",
"output": "scripts/"
"glob": "**/*.html.tmpl",
"input": "src/app/legacy",
"output": "scripts/"
},
{
"glob": "**/*",
Expand Down Expand Up @@ -728,8 +731,23 @@
],
"scripts": []
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.js",
"src/**/*.html"
]
}
}
}
}
},
"cli": {
"schematicCollections": [
"@angular-eslint/schematics"
]
}
}
Loading

0 comments on commit 4498f6e

Please sign in to comment.