Compare commits

...

7 Commits

Author SHA1 Message Date
semantic-release-bot a347603fe0 chore(release): 6.2.8 [skip ci]
## [6.2.8](https://git.datacontroller.io/dc/dc/compare/v6.2.7...v6.2.8) (2023-12-04)

### Bug Fixes

* bumping sasjs/core to fix mp_loadformat issue ([a1d308e](a1d308ea07))
* new logic for -fc suffix.  Closes [#63](#63) ([5579db0](5579db0eaf))
2023-12-04 11:51:52 +00:00
Mihajlo Medjedovic 09022c995f chore: prettier fix
Release / Build-production-and-ng-test (push) Successful in 3m5s Details
Release / Build-and-test-development (push) Successful in 6m15s Details
Release / release (push) Failing after 4m56s Details
2023-12-04 12:41:04 +01:00
allan 3609943f30 Merge pull request 'fix: new logic for -fc suffix, plus fixes for format record additions / deletions' (#64) from dcfixes into main
Release / Build-production-and-ng-test (push) Successful in 3m5s Details
Release / Build-and-test-development (push) Failing after 7m12s Details
Release / release (push) Has been skipped Details
Reviewed-on: #64
2023-12-03 13:56:26 +00:00
Allan a1d308ea07 fix: bumping sasjs/core to fix mp_loadformat issue
Build / Build-and-ng-test (pull_request) Failing after 12s Details
2023-12-03 13:53:53 +00:00
Allan 5579db0eaf fix: new logic for -fc suffix. Closes #63
Build / Build-and-ng-test (pull_request) Failing after 52s Details
2023-12-03 11:19:40 +00:00
Allan 3a3e488b23 chore: updating yaml to use self-hosted doc site
Release / Build-production-and-ng-test (push) Successful in 7m20s Details
Release / Build-and-test-development (push) Successful in 13m43s Details
Release / release (push) Failing after 2m36s Details
2023-11-14 22:23:05 +00:00
Allan 0a82ec0a70 chore: updating link in README to releases page
Release / Build-production-and-ng-test (push) Successful in 7m50s Details
Release / Build-and-test-development (push) Successful in 14m11s Details
Release / release (push) Failing after 2m42s Details
2023-11-14 21:43:55 +00:00
10 changed files with 34 additions and 56 deletions

View File

@ -240,6 +240,12 @@ jobs:
npm run compodoc:build
surfer put --token ${{ secrets.TSDOC_TOKEN }} --server webdoc.datacontroller.io documentation/* /
- name: Release code.datacontroller.io
run: |
cd sas
sasjs doc
surfer put --token ${{ secrets.CODE_DATACONTROLLER_IO }} --server code.datacontroller.io sasjsbuild/sasdocs/* /
- name: Upload assets to release
run: |
RELEASE_ID=`curl -k 'https://git.datacontroller.io/api/v1/repos/dc/dc/releases/latest?access_token=${{ secrets.RELEASE_TOKEN }}' | jq -r '.id'`

View File

@ -1,3 +1,11 @@
## [6.2.8](https://git.datacontroller.io/dc/dc/compare/v6.2.7...v6.2.8) (2023-12-04)
### Bug Fixes
* bumping sasjs/core to fix mp_loadformat issue ([a1d308e](https://git.datacontroller.io/dc/dc/commit/a1d308ea078786b27bf7ec940d018fc657d4c398))
* new logic for -fc suffix. Closes [#63](https://git.datacontroller.io/dc/dc/issues/63) ([5579db0](https://git.datacontroller.io/dc/dc/commit/5579db0eafc668b1bc310099b7cc3062e0598fc4))
## [6.2.7](https://git.datacontroller.io/dc/dc/compare/v6.2.6...v6.2.7) (2023-11-09)

View File

@ -24,8 +24,8 @@
generatedRecordUrl
? 'copy to clipboard'
: generateEditRecordUrlLoading
? 'Generating url...'
: 'Link to this record'
? 'Generating url...'
: 'Link to this record'
}}
</button>
</ng-container>

View File

@ -288,8 +288,8 @@ function resolveDateString(data, ca, component, width, key) {
resolved = hop.call(obj, width)
? obj[width]
: hop.call(obj, alts[width][0])
? obj[alts[width][0]]
: obj[alts[width][1]]
? obj[alts[width][0]]
: obj[alts[width][1]]
// `key` wouldn't be specified for components 'dayPeriods'
return key != null ? resolved[key] : resolved

28
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "dcfrontend",
"version": "6.2.2",
"version": "6.2.7",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "dcfrontend",
"version": "6.2.2",
"version": "6.2.7",
"hasInstallScript": true,
"devDependencies": {
"@saithodev/semantic-release-gitea": "^2.1.0",
@ -15,8 +15,7 @@
"@semantic-release/git": "^10.0.1",
"@semantic-release/npm": "11.0.0",
"@semantic-release/release-notes-generator": "^11.0.4",
"commit-and-tag-version": "^11.2.2",
"prettier": "3.0.0"
"commit-and-tag-version": "^11.2.2"
}
},
"node_modules/@babel/code-frame": {
@ -6878,21 +6877,6 @@
"node": ">=0.10.0"
}
},
"node_modules/prettier": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.0.tgz",
"integrity": "sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==",
"dev": true,
"bin": {
"prettier": "bin/prettier.cjs"
},
"engines": {
"node": ">=14"
},
"funding": {
"url": "https://github.com/prettier/prettier?sponsor=1"
}
},
"node_modules/process-nextick-args": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@ -12615,12 +12599,6 @@
"integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
"dev": true
},
"prettier": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.0.tgz",
"integrity": "sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==",
"dev": true
},
"process-nextick-args": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",

View File

@ -1,6 +1,6 @@
{
"name": "dcfrontend",
"version": "6.2.7",
"version": "6.2.8",
"description": "Data Controller",
"devDependencies": {
"@saithodev/semantic-release-gitea": "^2.1.0",
@ -9,8 +9,7 @@
"@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",
"prettier": "3.0.0"
"commit-and-tag-version": "^11.2.2"
},
"scripts": {
"install": "cd client && npm i && cd ../sas && npm i",

29
sas/package-lock.json generated
View File

@ -7,7 +7,7 @@
"name": "dc-sas",
"dependencies": {
"@sasjs/cli": "^4.11.1",
"@sasjs/core": "^4.48.3"
"@sasjs/core": "^4.48.4"
}
},
"node_modules/@coolaj86/urequest": {
@ -116,9 +116,9 @@
"integrity": "sha512-Grwydm5GxBsYk238PZw41XPjXVVQ9vWcvfZ06L2P0bQbvK0sGn7l69JA7H5MGr3QcaLpiD4Kg70cAh7PgE+JOw=="
},
"node_modules/@sasjs/core": {
"version": "4.48.3",
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.48.3.tgz",
"integrity": "sha512-wd1bjPJof3qZ/jX/T3Y22yRo9nlWtVwIdDo3Nsj1KY3abA/oivCR9r3A6tn6clPHcKKvfNqsvTjpPPtpt4K3Lg=="
"version": "4.48.4",
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.48.4.tgz",
"integrity": "sha512-KTLHRR47I627NKZG0qMW+wGJP4gFGyeEEyBDsVaSnevdvCz01oP/lpLxx4fIESPQ/YzLNEv+RcP8kcxkdSPQow=="
},
"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.48.3",
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.48.3.tgz",
"integrity": "sha512-wd1bjPJof3qZ/jX/T3Y22yRo9nlWtVwIdDo3Nsj1KY3abA/oivCR9r3A6tn6clPHcKKvfNqsvTjpPPtpt4K3Lg=="
"version": "4.48.4",
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.48.4.tgz",
"integrity": "sha512-KTLHRR47I627NKZG0qMW+wGJP4gFGyeEEyBDsVaSnevdvCz01oP/lpLxx4fIESPQ/YzLNEv+RcP8kcxkdSPQow=="
},
"@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.48.3"
"@sasjs/core": "^4.48.4"
}
}

View File

@ -2,7 +2,7 @@
This site contains the SAS code used in Data Controller for SAS. The pages were generated using [`sasjs doc`](https://cli.sasjs.io/doc).
You can download Data Controller from [here](https://4gl.uk/dcdeploy).
You can download Data Controller from [here](https://git.datacontroller.io/dc/dc/releases).
The main website is [https://datacontroller.io](https://datacontroller.io) and the user guide is [here](https://docs.datacontroller.io).

View File

@ -45,7 +45,7 @@ data work.staging_ds;
/* force correct BUSKEY and DSN when loading format catalogs */
if LOADTYPE='FORMAT_CAT' then do;
BUSKEY='TYPE FMTNAME FMTROW';
if subpad(dsn,length(dsn)-3,3) ne '-FC' then dsn=cats(dsn,'-FC');
DSN=scan(dsn,1,'-')!!'-FC';
end;
run;