Compare commits

...

14 Commits

Author SHA1 Message Date
Mihajlo Medjedovic b4e5dd74d9 chore: licence checker sync
Test / Build-production-and-ng-test (push) Successful in 6m27s Details
Test / Build-and-test-development (push) Successful in 12m0s Details
Test / Build-and-test-development-latest-adapter (push) Successful in 11m55s Details
2023-10-12 14:55:22 +02:00
allan 64746b0aae Merge pull request 'sheetjs' (#53) from sheetjs into development
Test / Build-production-and-ng-test (push) Failing after 3m15s Details
Test / Build-and-test-development-latest-adapter (push) Has been cancelled Details
Test / Build-and-test-development (push) Has been cancelled Details
Reviewed-on: #53
2023-10-12 12:52:31 +00:00
Mihajlo Medjedovic 16ae77c804 style: lint
Build / Build-and-ng-test (pull_request) Failing after 1m23s Details
2023-10-12 14:50:55 +02:00
Mihajlo Medjedovic 481c14f066 fix: reverting SheetJS upgrade, it was breaking the excel upload 2023-10-12 14:50:34 +02:00
allan 357b9849e7 Merge branch 'issue50' into development
Build / Build-and-ng-test (pull_request) Has been cancelled Details
Test / Build-and-test-development (push) Has been cancelled Details
Test / Build-and-test-development-latest-adapter (push) Has been cancelled Details
Test / Build-production-and-ng-test (push) Has been cancelled Details
2023-10-12 09:38:19 +00:00
Mihajlo Medjedovic 0c8a9eef32 chore(ci): build and ng test fix
Test / Build-production-and-ng-test (push) Successful in 7m30s Details
Test / Build-and-test-development (push) Failing after 14m29s Details
Test / Build-and-test-development-latest-adapter (push) Failing after 14m45s Details
Build / Build-and-ng-test (pull_request) Successful in 1m25s Details
2023-10-12 08:33:31 +02:00
Mihajlo Medjedovic 112b1d0da4 chore(ci): audit check fix
Test / Build-production-and-ng-test (push) Failing after 2m22s Details
Test / Build-and-test-development-latest-adapter (push) Has been cancelled Details
Test / Build-and-test-development (push) Has been cancelled Details
2023-10-12 08:26:35 +02:00
Mihajlo Medjedovic a05007416a chore(ci): audit check fix
Test / Build-production-and-ng-test (push) Failing after 2m25s Details
Test / Build-and-test-development-latest-adapter (push) Has been cancelled Details
Test / Build-and-test-development (push) Has been cancelled Details
2023-10-12 08:21:58 +02:00
allan 9f7dd55583 Merge pull request 'Release fix' (#49) from release-fix into development
Test / Build-production-and-ng-test (push) Failing after 2m36s Details
Test / Build-and-test-development (push) Failing after 14m29s Details
Test / Build-and-test-development-latest-adapter (push) Failing after 14m30s Details
Reviewed-on: #49
2023-10-11 22:02:20 +00:00
Allan 11b06f6416 fix: bumping core library to avoid non-ascii char in mp_validatecols.sas. #50
Build / Build-and-ng-test (pull_request) Successful in 1m30s Details
2023-10-11 22:57:07 +01:00
Allan adb7eb7755 fix: removing copyright symbol from mpe_alerts macro. #50 2023-10-11 22:56:14 +01:00
Mihajlo Medjedovic b776b80728 chore: making semantic-release fail if no release available
Build / Build-and-ng-test (pull_request) Successful in 1m17s Details
2023-10-11 16:34:06 +02:00
Mihajlo Medjedovic 73a149ea7b chore: updated contributing.md with release instructions
Build / Build-and-ng-test (pull_request) Successful in 1m18s Details
2023-10-09 13:02:13 +02:00
Mihajlo Medjedovic ef8784093b chore: release is draft fix, release will update package.json version
Build / Build-and-ng-test (pull_request) Successful in 1m18s Details
2023-10-09 12:46:17 +02:00
12 changed files with 8840 additions and 15890 deletions

View File

@ -39,18 +39,20 @@ jobs:
- name: Check audit
# Audit should fail and stop the CI if critical vulnerability found
run: |
npm audit --audit-level=critical
npm audit --audit-level=critical --omit=dev
cd ./sas
npm audit --audit-level=critical
cd ./client
npm audit --audit-level=critical
npm audit --audit-level=critical --omit=dev
cd ../client
npm audit --audit-level=critical --omit=dev
- name: Angular Tests
run: |
cd client
npm test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
- name: Angular Production Build
run: |
cd client
npm run postinstall
npm run build

View File

@ -35,6 +35,8 @@ jobs:
run: |
npm i
npm i -g semantic-release
# We do a semantic-release DRY RUN to make the job fail if there are no changes to release
GITEA_TOKEN=${{ secrets.RELEASE_TOKEN }} GITEA_URL=https://git.datacontroller.io semantic-release --dry-run | grep -q "There are no relevant changes, so no new version is released." && exit 1
GITEA_TOKEN=${{ secrets.RELEASE_TOKEN }} GITEA_URL=https://git.datacontroller.io semantic-release
- name: Frontend Build
@ -105,7 +107,7 @@ jobs:
RELEASE_ID=`curl -k 'https://git.datacontroller.io/api/v1/repos/dc/dc/releases/latest?access_token=${{ secrets.RELEASE_TOKEN }}' | jq -r '.id'`
RELEASE_BODY=`curl -k 'https://git.datacontroller.io/api/v1/repos/dc/dc/releases/latest?access_token=${{ secrets.RELEASE_TOKEN }}' | jq -r '.body'`
# Update body
curl --data '{"draft": true,"body":"'"$RELEASE_BODY\n\nFor installation instructions, please visit https://docs.datacontroller.io/"'"}' -X PATCH --header 'Content-Type: application/json' -k https://git.datacontroller.io/api/v1/repos/dc/dc/releases/$RELEASE_ID?access_token=${{ secrets.RELEASE_TOKEN }}
curl --data '{"draft": false,"body":"'"$RELEASE_BODY\n\nFor installation instructions, please visit https://docs.datacontroller.io/"'"}' -X PATCH --header 'Content-Type: application/json' -k https://git.datacontroller.io/api/v1/repos/dc/dc/releases/$RELEASE_ID?access_token=${{ secrets.RELEASE_TOKEN }}
# Upload assets
URL="https://git.datacontroller.io/api/v1/repos/dc/dc/releases/$RELEASE_ID/assets?access_token=${{ secrets.RELEASE_TOKEN }}"
curl -k $URL -F attachment=@frontend.zip

View File

@ -6,11 +6,13 @@
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
"@semantic-release/changelog",
"@semantic-release/npm",
[
"@semantic-release/git",
{
"assets": [
"CHANGELOG.md"
"CHANGELOG.md",
"package.json"
]
}
],

View File

@ -53,6 +53,17 @@ npm run lint:fix
Typedoc is used for generating typescript documentation based on the code.
That part is automated and beign done as a part of CI job.
# Release
Release is automated as a part of CI job. Workflow file: `.gitea/workflows/release.yaml`.
It will run automatically when branch merged to the `main` branch.
IMPORTANT!
If release job fails, after it has been created empty release and a tag, we must not re-run the relase job until we removed the newly create GIT TAG and RELEASE.
To remove the git tag run:
```
git push -d origin vX.X.X
```
To remove the release, you need to do it with repo administration over at [https://git.datacontroller.io/dc/dc](https://git.datacontroller.io/dc/dc)
# Troubleshooting
## Makedata service "could not create directory" error

View File

@ -10,7 +10,7 @@ const check = (cwd) => {
onlyAllow:
'AFLv2.1;Apache 2.0;Apache-2.0;Apache*;Artistic-2.0;0BSD;BSD*;BSD-2-Clause;BSD-3-Clause;CC0-1.0;CC-BY-3.0;CC-BY-4.0;ISC;MIT;MPL-2.0;ODC-By-1.0;Python-2.0;Unlicense;',
excludePackages:
'@cds/city@1.1.0;@handsontable/angular@13.1.0;handsontable@13.1.0;hyperformula@2.5.0;jackspeak@2.2.0;path-scurry@1.7.0'
'@cds/city@1.1.0;@handsontable/angular@13.1.0;handsontable@13.1.0;hyperformula@2.6.0;jackspeak@2.2.0;path-scurry@1.7.0'
},
(error, json) => {
if (error) {

18194
client/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -51,7 +51,7 @@
"@handsontable/angular": "^13.1.0",
"@sasjs/adapter": "4.10.1",
"@sasjs/utils": "^3.4.0",
"@sheet/crypto": "1.20230414.1",
"@sheet/crypto": "1.20211122.1",
"@types/d3-graphviz": "^2.6.7",
"@types/text-encoding": "0.0.35",
"base64-arraybuffer": "^0.2.0",

6456
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +1,12 @@
{
"name": "dcfrontend",
"version": "6.2.0",
"version": "6.2.2",
"description": "Data Controller",
"devDependencies": {
"@saithodev/semantic-release-gitea": "^2.1.0",
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/commit-analyzer": "^10.0.1",
"@semantic-release/npm": "11.0.0",
"@semantic-release/git": "^10.0.1",
"@semantic-release/release-notes-generator": "^11.0.4",
"commit-and-tag-version": "^11.2.2",
@ -23,5 +24,10 @@
"repository": {
"type": "git",
"url": "https://git.datacontroller.io/dc/dc.git"
}
},
"private": true,
"//": [
"Readme",
"We must set private: true so that semantic-release/npm plugin will update the package.json version but not try to release it as NPM package"
]
}

29
sas/package-lock.json generated
View File

@ -7,7 +7,7 @@
"name": "dc-sas",
"dependencies": {
"@sasjs/cli": "^4.11.1",
"@sasjs/core": "^4.47.0"
"@sasjs/core": "^4.48.0"
}
},
"node_modules/@coolaj86/urequest": {
@ -116,9 +116,9 @@
"integrity": "sha512-Grwydm5GxBsYk238PZw41XPjXVVQ9vWcvfZ06L2P0bQbvK0sGn7l69JA7H5MGr3QcaLpiD4Kg70cAh7PgE+JOw=="
},
"node_modules/@sasjs/core": {
"version": "4.47.0",
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.47.0.tgz",
"integrity": "sha512-ysSii9kTZuUsCfjaCu3coKtdnBmFF03EoUnddmAUKLbrD7y5/m3fsiDrpTYoAJ75+xuzAx+ssj0xGG3gVqCm7w=="
"version": "4.48.0",
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.48.0.tgz",
"integrity": "sha512-KaAvfTPv1UrP0I1fREDYjkfa7FRM9+yCseGXGLYylD30oH7BBOwLc7o/BkhRjjDvrBFoiJMjAOVKULhmkHz9zQ=="
},
"node_modules/@sasjs/lint": {
"version": "2.3.1",
@ -229,12 +229,6 @@
"@types/node": "*"
}
},
"node_modules/@types/tough-cookie": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.3.tgz",
"integrity": "sha512-THo502dA5PzG/sfQH+42Lw3fvmYkceefOspdCwpHRul8ik2Jv1K8I5OZz1AT3/rs46kwgMCe9bSBmDLYkkOMGg==",
"peer": true
},
"node_modules/abab": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
@ -1834,9 +1828,9 @@
}
},
"@sasjs/core": {
"version": "4.47.0",
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.47.0.tgz",
"integrity": "sha512-ysSii9kTZuUsCfjaCu3coKtdnBmFF03EoUnddmAUKLbrD7y5/m3fsiDrpTYoAJ75+xuzAx+ssj0xGG3gVqCm7w=="
"version": "4.48.0",
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.48.0.tgz",
"integrity": "sha512-KaAvfTPv1UrP0I1fREDYjkfa7FRM9+yCseGXGLYylD30oH7BBOwLc7o/BkhRjjDvrBFoiJMjAOVKULhmkHz9zQ=="
},
"@sasjs/lint": {
"version": "2.3.1",
@ -1933,12 +1927,6 @@
"@types/node": "*"
}
},
"@types/tough-cookie": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.3.tgz",
"integrity": "sha512-THo502dA5PzG/sfQH+42Lw3fvmYkceefOspdCwpHRul8ik2Jv1K8I5OZz1AT3/rs46kwgMCe9bSBmDLYkkOMGg==",
"peer": true
},
"abab": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
@ -2965,8 +2953,7 @@
"ws": {
"version": "8.13.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
"integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
"requires": {}
"integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA=="
},
"xml": {
"version": "1.0.1",

View File

@ -28,6 +28,6 @@
"private": true,
"dependencies": {
"@sasjs/cli": "^4.11.1",
"@sasjs/core": "^4.47.0"
"@sasjs/core": "^4.48.0"
}
}

View File

@ -131,7 +131,7 @@ filename __out email ("&emails")
txt=symget('SUBMITTED_TXT');
put "Reason provided: " txt;
put " ";
put "This is an automated email by Data Controller for SAS®. For "
put "This is an automated email by Data Controller for SAS. For "
"documentation, please visit https://docs.datacontroller.io";
run;
%end;
@ -144,7 +144,7 @@ filename __out email ("&emails")
put "Please be advised that a change to table &alert_lib..&alert_ds has "
"been approved by &from_user on the '&syshostname' SAS server.";
put " ";
put "This is an automated email by Data Controller for SAS®. For "
put "This is an automated email by Data Controller for SAS. For "
"documentation, please visit https://docs.datacontroller.io";
run;
%end;
@ -165,7 +165,7 @@ filename __out email ("&emails")
txt=symget('REVIEW_REASON_TXT');
put "Reason provided: " txt;
put " ";
put "This is an automated email by Data Controller for SAS®. For "
put "This is an automated email by Data Controller for SAS. For "
"documentation, please visit https://docs.datacontroller.io";
run;
%end;