diff --git a/client/src/app/editor/components/edit-record/edit-record.component.html b/client/src/app/editor/components/edit-record/edit-record.component.html index 9770463..c678fcf 100644 --- a/client/src/app/editor/components/edit-record/edit-record.component.html +++ b/client/src/app/editor/components/edit-record/edit-record.component.html @@ -24,8 +24,8 @@ generatedRecordUrl ? 'copy to clipboard' : generateEditRecordUrlLoading - ? 'Generating url...' - : 'Link to this record' + ? 'Generating url...' + : 'Link to this record' }} diff --git a/client/src/formatToParts.polyfill.js b/client/src/formatToParts.polyfill.js index 06dbec1..54be878 100644 --- a/client/src/formatToParts.polyfill.js +++ b/client/src/formatToParts.polyfill.js @@ -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 diff --git a/package-lock.json b/package-lock.json index 7164118..463e6d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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", diff --git a/package.json b/package.json index 88e8a89..f57a53b 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/sas/package-lock.json b/sas/package-lock.json index 710ceb9..8ed54b0 100644 --- a/sas/package-lock.json +++ b/sas/package-lock.json @@ -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", @@ -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",