@defra/forms-model 3.0.636 → 3.0.638
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/module/index.js +1 -0
- package/dist/module/index.js.map +1 -1
- package/dist/module/manage/dead-letter-queues.js +9 -0
- package/dist/module/manage/dead-letter-queues.js.map +1 -0
- package/dist/module/manage/roles.js +1 -0
- package/dist/module/manage/roles.js.map +1 -1
- package/dist/module/utils/markdown.js +37 -9
- package/dist/module/utils/markdown.js.map +1 -1
- package/dist/types/index.d.ts +1 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/manage/dead-letter-queues.d.ts +8 -0
- package/dist/types/manage/dead-letter-queues.d.ts.map +1 -0
- package/dist/types/manage/roles.d.ts +2 -1
- package/dist/types/manage/roles.d.ts.map +1 -1
- package/dist/types/utils/markdown.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +1 -0
- package/src/manage/dead-letter-queues.ts +7 -0
- package/src/manage/roles.ts +2 -1
- package/src/utils/markdown.ts +51 -7
package/dist/module/index.js
CHANGED
|
@@ -17,6 +17,7 @@ export * from "./form/form-editor/index.js";
|
|
|
17
17
|
export * from "./form/form-editor/preview/index.js";
|
|
18
18
|
export * from "./form/form-manager/types.js";
|
|
19
19
|
export * from "./form/form-manager/errors.js";
|
|
20
|
+
export * from "./manage/dead-letter-queues.js";
|
|
20
21
|
export * from "./manage/roles.js";
|
|
21
22
|
export * from "./manage/users.js";
|
|
22
23
|
export * from "./pages/index.js";
|
package/dist/module/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":[],"sources":["../../src/index.ts"],"sourcesContent":["export * from '~/src/common/enums.js'\nexport * from '~/src/common/random-id.js'\nexport * from '~/src/common/schema.js'\nexport * from '~/src/common/pagination/index.js'\nexport * from '~/src/common/search/index.js'\nexport * from '~/src/common/sorting/index.js'\nexport * from '~/src/components/index.js'\nexport * from '~/src/conditions/index.js'\nexport * from '~/src/form/form-definition/index.js'\nexport * from '~/src/form/form-definition/types.js'\nexport * from '~/src/form/form-definition/helpers.js'\nexport * from '~/src/form/form-metadata/index.js'\nexport * from '~/src/form/form-submission/index.js'\nexport * from '~/src/form/form-submission/enums.js'\nexport * from '~/src/form/utils/index.js'\nexport * from '~/src/form/form-editor/index.js'\nexport * from '~/src/form/form-editor/preview/index.js'\nexport * from '~/src/form/form-manager/types.js'\nexport * from '~/src/form/form-manager/errors.js'\nexport * from '~/src/manage/roles.js'\nexport * from '~/src/manage/users.js'\nexport * from '~/src/pages/index.js'\nexport * from '~/src/utils/helpers.js'\nexport * from '~/src/utils/markdown.js'\nexport * from '~/src/form/form-audit/index.js'\nexport * from '~/src/form/form-audit/enums.js'\nexport * from '~/src/form/form-audit/consolidation.js'\n\nexport type * from '~/src/common/types.js'\nexport type * from '~/src/common/pagination/types.js'\nexport type * from '~/src/common/search/types.js'\nexport type * from '~/src/common/sorting/types.js'\nexport type * from '~/src/components/types.js'\nexport type * from '~/src/conditions/types.js'\nexport type * from '~/src/form/form-definition/types.js'\nexport type * from '~/src/form/form-metadata/types.js'\nexport type * from '~/src/form/form-submission/types.js'\nexport type * from '~/src/form/form-editor/preview/types.js'\nexport type * from '~/src/form/form-editor/types.js'\nexport type * from '~/src/form/form-editor/macros/types.js'\nexport type * from '~/src/form/form-audit/types.js'\nexport type * from '~/src/manage/types.js'\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","ignoreList":[]}
|
|
1
|
+
{"version":3,"file":"index.js","names":[],"sources":["../../src/index.ts"],"sourcesContent":["export * from '~/src/common/enums.js'\nexport * from '~/src/common/random-id.js'\nexport * from '~/src/common/schema.js'\nexport * from '~/src/common/pagination/index.js'\nexport * from '~/src/common/search/index.js'\nexport * from '~/src/common/sorting/index.js'\nexport * from '~/src/components/index.js'\nexport * from '~/src/conditions/index.js'\nexport * from '~/src/form/form-definition/index.js'\nexport * from '~/src/form/form-definition/types.js'\nexport * from '~/src/form/form-definition/helpers.js'\nexport * from '~/src/form/form-metadata/index.js'\nexport * from '~/src/form/form-submission/index.js'\nexport * from '~/src/form/form-submission/enums.js'\nexport * from '~/src/form/utils/index.js'\nexport * from '~/src/form/form-editor/index.js'\nexport * from '~/src/form/form-editor/preview/index.js'\nexport * from '~/src/form/form-manager/types.js'\nexport * from '~/src/form/form-manager/errors.js'\nexport * from '~/src/manage/dead-letter-queues.js'\nexport * from '~/src/manage/roles.js'\nexport * from '~/src/manage/users.js'\nexport * from '~/src/pages/index.js'\nexport * from '~/src/utils/helpers.js'\nexport * from '~/src/utils/markdown.js'\nexport * from '~/src/form/form-audit/index.js'\nexport * from '~/src/form/form-audit/enums.js'\nexport * from '~/src/form/form-audit/consolidation.js'\n\nexport type * from '~/src/common/types.js'\nexport type * from '~/src/common/pagination/types.js'\nexport type * from '~/src/common/search/types.js'\nexport type * from '~/src/common/sorting/types.js'\nexport type * from '~/src/components/types.js'\nexport type * from '~/src/conditions/types.js'\nexport type * from '~/src/form/form-definition/types.js'\nexport type * from '~/src/form/form-metadata/types.js'\nexport type * from '~/src/form/form-submission/types.js'\nexport type * from '~/src/form/form-editor/preview/types.js'\nexport type * from '~/src/form/form-editor/types.js'\nexport type * from '~/src/form/form-editor/macros/types.js'\nexport type * from '~/src/form/form-audit/types.js'\nexport type * from '~/src/manage/types.js'\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","ignoreList":[]}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export let DeadLetterQueues = /*#__PURE__*/function (DeadLetterQueues) {
|
|
2
|
+
DeadLetterQueues["AuditApi"] = "audit-api";
|
|
3
|
+
DeadLetterQueues["NotifyListener"] = "notify-listener";
|
|
4
|
+
DeadLetterQueues["SharepointListener"] = "sharepoint-listener";
|
|
5
|
+
DeadLetterQueues["SubmissionsApiFormSubmissions"] = "submissions-api (form submissions)";
|
|
6
|
+
DeadLetterQueues["SubmissionsApiSaveAndExit"] = "submissions-api (save-and-exit)";
|
|
7
|
+
return DeadLetterQueues;
|
|
8
|
+
}({});
|
|
9
|
+
//# sourceMappingURL=dead-letter-queues.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dead-letter-queues.js","names":["DeadLetterQueues"],"sources":["../../../src/manage/dead-letter-queues.ts"],"sourcesContent":["export enum DeadLetterQueues {\n AuditApi = 'audit-api',\n NotifyListener = 'notify-listener',\n SharepointListener = 'sharepoint-listener',\n SubmissionsApiFormSubmissions = 'submissions-api (form submissions)',\n SubmissionsApiSaveAndExit = 'submissions-api (save-and-exit)'\n}\n"],"mappings":"AAAA,WAAYA,gBAAgB,0BAAhBA,gBAAgB;EAAhBA,gBAAgB;EAAhBA,gBAAgB;EAAhBA,gBAAgB;EAAhBA,gBAAgB;EAAhBA,gBAAgB;EAAA,OAAhBA,gBAAgB;AAAA","ignoreList":[]}
|
|
@@ -16,6 +16,7 @@ export let Scopes = /*#__PURE__*/function (Scopes) {
|
|
|
16
16
|
Scopes["FormsFeedback"] = "forms-feedback";
|
|
17
17
|
Scopes["FormsBackup"] = "forms-backup";
|
|
18
18
|
Scopes["ResetSaveAndExit"] = "reset-save-and-exit";
|
|
19
|
+
Scopes["DeadLetterQueues"] = "dead-letter-queues";
|
|
19
20
|
return Scopes;
|
|
20
21
|
}({});
|
|
21
22
|
export const RoleScopes = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roles.js","names":["Roles","Scopes","RoleScopes","Superadmin","Object","values","Admin","FormDelete","FormEdit","FormRead","FormPublish","UserCreate","UserDelete","UserEdit","FormsFeedback","FormPublisher","FormCreator","RoleNames","mapScopesToRoles","roles","scopeSet","Set","forEach","role","scopes","scope","add","Array","from"],"sources":["../../../src/manage/roles.ts"],"sourcesContent":["export enum Roles {\n Superadmin = 'superadmin',\n Admin = 'admin',\n FormPublisher = 'form-publisher',\n FormCreator = 'form-creator'\n}\n\nexport enum Scopes {\n FormDelete = 'form-delete',\n FormEdit = 'form-edit',\n FormRead = 'form-read',\n FormPublish = 'form-publish',\n UserCreate = 'user-create',\n UserDelete = 'user-delete',\n UserEdit = 'user-edit',\n FormsFeedback = 'forms-feedback',\n FormsBackup = 'forms-backup',\n ResetSaveAndExit = 'reset-save-and-exit'\n}\n\nexport const RoleScopes = {\n [Roles.Superadmin]: Object.values(Scopes),\n [Roles.Admin]: [\n Scopes.FormDelete,\n Scopes.FormEdit,\n Scopes.FormRead,\n Scopes.FormPublish,\n Scopes.UserCreate,\n Scopes.UserDelete,\n Scopes.UserEdit,\n Scopes.FormsFeedback\n ],\n [Roles.FormPublisher]: [\n Scopes.FormDelete,\n Scopes.FormEdit,\n Scopes.FormRead,\n Scopes.FormPublish\n ],\n [Roles.FormCreator]: [Scopes.FormRead, Scopes.FormEdit, Scopes.FormDelete]\n}\n\nexport const RoleNames = {\n [Roles.Superadmin]: 'Superadmin',\n [Roles.Admin]: 'Admin',\n [Roles.FormPublisher]: 'Form publisher',\n [Roles.FormCreator]: 'Form creator'\n}\n\n/**\n * Return a unique list of scopes based on the array of roles passed in\n */\nexport function mapScopesToRoles(roles: Roles[]) {\n const scopeSet = new Set<Scopes>()\n roles.forEach((role) => {\n const scopes = RoleScopes[role]\n scopes.forEach((scope) => {\n scopeSet.add(scope)\n })\n })\n return Array.from(scopeSet)\n}\n"],"mappings":"AAAA,WAAYA,KAAK,0BAALA,KAAK;EAALA,KAAK;EAALA,KAAK;EAALA,KAAK;EAALA,KAAK;EAAA,OAALA,KAAK;AAAA;AAOjB,WAAYC,MAAM,0BAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAAA,OAANA,MAAM;AAAA;
|
|
1
|
+
{"version":3,"file":"roles.js","names":["Roles","Scopes","RoleScopes","Superadmin","Object","values","Admin","FormDelete","FormEdit","FormRead","FormPublish","UserCreate","UserDelete","UserEdit","FormsFeedback","FormPublisher","FormCreator","RoleNames","mapScopesToRoles","roles","scopeSet","Set","forEach","role","scopes","scope","add","Array","from"],"sources":["../../../src/manage/roles.ts"],"sourcesContent":["export enum Roles {\n Superadmin = 'superadmin',\n Admin = 'admin',\n FormPublisher = 'form-publisher',\n FormCreator = 'form-creator'\n}\n\nexport enum Scopes {\n FormDelete = 'form-delete',\n FormEdit = 'form-edit',\n FormRead = 'form-read',\n FormPublish = 'form-publish',\n UserCreate = 'user-create',\n UserDelete = 'user-delete',\n UserEdit = 'user-edit',\n FormsFeedback = 'forms-feedback',\n FormsBackup = 'forms-backup',\n ResetSaveAndExit = 'reset-save-and-exit',\n DeadLetterQueues = 'dead-letter-queues'\n}\n\nexport const RoleScopes = {\n [Roles.Superadmin]: Object.values(Scopes),\n [Roles.Admin]: [\n Scopes.FormDelete,\n Scopes.FormEdit,\n Scopes.FormRead,\n Scopes.FormPublish,\n Scopes.UserCreate,\n Scopes.UserDelete,\n Scopes.UserEdit,\n Scopes.FormsFeedback\n ],\n [Roles.FormPublisher]: [\n Scopes.FormDelete,\n Scopes.FormEdit,\n Scopes.FormRead,\n Scopes.FormPublish\n ],\n [Roles.FormCreator]: [Scopes.FormRead, Scopes.FormEdit, Scopes.FormDelete]\n}\n\nexport const RoleNames = {\n [Roles.Superadmin]: 'Superadmin',\n [Roles.Admin]: 'Admin',\n [Roles.FormPublisher]: 'Form publisher',\n [Roles.FormCreator]: 'Form creator'\n}\n\n/**\n * Return a unique list of scopes based on the array of roles passed in\n */\nexport function mapScopesToRoles(roles: Roles[]) {\n const scopeSet = new Set<Scopes>()\n roles.forEach((role) => {\n const scopes = RoleScopes[role]\n scopes.forEach((scope) => {\n scopeSet.add(scope)\n })\n })\n return Array.from(scopeSet)\n}\n"],"mappings":"AAAA,WAAYA,KAAK,0BAALA,KAAK;EAALA,KAAK;EAALA,KAAK;EAALA,KAAK;EAALA,KAAK;EAAA,OAALA,KAAK;AAAA;AAOjB,WAAYC,MAAM,0BAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAANA,MAAM;EAAA,OAANA,MAAM;AAAA;AAclB,OAAO,MAAMC,UAAU,GAAG;EACxB,CAACF,KAAK,CAACG,UAAU,GAAGC,MAAM,CAACC,MAAM,CAACJ,MAAM,CAAC;EACzC,CAACD,KAAK,CAACM,KAAK,GAAG,CACbL,MAAM,CAACM,UAAU,EACjBN,MAAM,CAACO,QAAQ,EACfP,MAAM,CAACQ,QAAQ,EACfR,MAAM,CAACS,WAAW,EAClBT,MAAM,CAACU,UAAU,EACjBV,MAAM,CAACW,UAAU,EACjBX,MAAM,CAACY,QAAQ,EACfZ,MAAM,CAACa,aAAa,CACrB;EACD,CAACd,KAAK,CAACe,aAAa,GAAG,CACrBd,MAAM,CAACM,UAAU,EACjBN,MAAM,CAACO,QAAQ,EACfP,MAAM,CAACQ,QAAQ,EACfR,MAAM,CAACS,WAAW,CACnB;EACD,CAACV,KAAK,CAACgB,WAAW,GAAG,CAACf,MAAM,CAACQ,QAAQ,EAAER,MAAM,CAACO,QAAQ,EAAEP,MAAM,CAACM,UAAU;AAC3E,CAAC;AAED,OAAO,MAAMU,SAAS,GAAG;EACvB,CAACjB,KAAK,CAACG,UAAU,GAAG,YAAY;EAChC,CAACH,KAAK,CAACM,KAAK,GAAG,OAAO;EACtB,CAACN,KAAK,CAACe,aAAa,GAAG,gBAAgB;EACvC,CAACf,KAAK,CAACgB,WAAW,GAAG;AACvB,CAAC;;AAED;AACA;AACA;AACA,OAAO,SAASE,gBAAgBA,CAACC,KAAc,EAAE;EAC/C,MAAMC,QAAQ,GAAG,IAAIC,GAAG,CAAS,CAAC;EAClCF,KAAK,CAACG,OAAO,CAAEC,IAAI,IAAK;IACtB,MAAMC,MAAM,GAAGtB,UAAU,CAACqB,IAAI,CAAC;IAC/BC,MAAM,CAACF,OAAO,CAAEG,KAAK,IAAK;MACxBL,QAAQ,CAACM,GAAG,CAACD,KAAK,CAAC;IACrB,CAAC,CAAC;EACJ,CAAC,CAAC;EACF,OAAOE,KAAK,CAACC,IAAI,CAACR,QAAQ,CAAC;AAC7B","ignoreList":[]}
|
|
@@ -5,18 +5,49 @@ import { Marked, Renderer } from 'marked';
|
|
|
5
5
|
*/
|
|
6
6
|
export const marked = new Marked({
|
|
7
7
|
breaks: true,
|
|
8
|
-
gfm: true
|
|
8
|
+
gfm: true,
|
|
9
|
+
/**
|
|
10
|
+
* Inline extension to support {:target="_blank"} attribute syntax on links.
|
|
11
|
+
* Allows form designers to force any link to open in a new tab, e.g.
|
|
12
|
+
* [Open the service](https://example.gov.uk){:target="_blank"}
|
|
13
|
+
*/
|
|
14
|
+
extensions: [{
|
|
15
|
+
name: 'linkAttributes',
|
|
16
|
+
level: 'inline',
|
|
17
|
+
start(src) {
|
|
18
|
+
return src.indexOf('{:');
|
|
19
|
+
},
|
|
20
|
+
tokenizer(src, tokens) {
|
|
21
|
+
// Quotes are HTML-escaped before parsing, so " becomes "
|
|
22
|
+
const match = /^\{:target="_blank"\}/.exec(src);
|
|
23
|
+
if (match && tokens.length > 0) {
|
|
24
|
+
const last = tokens[tokens.length - 1];
|
|
25
|
+
if (last.type === 'link') {
|
|
26
|
+
;
|
|
27
|
+
last.forceNewTab = true;
|
|
28
|
+
return {
|
|
29
|
+
type: 'linkAttributes',
|
|
30
|
+
raw: match[0]
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
},
|
|
35
|
+
renderer() {
|
|
36
|
+
return '';
|
|
37
|
+
}
|
|
38
|
+
}]
|
|
9
39
|
});
|
|
10
|
-
function renderLink(href, text, baseUrl) {
|
|
40
|
+
function renderLink(href, text, baseUrl, forceNewTab = false) {
|
|
11
41
|
let isLocalLink = true;
|
|
12
42
|
if (baseUrl) {
|
|
13
43
|
isLocalLink = href.startsWith(baseUrl) || href.startsWith('mailto:');
|
|
14
44
|
}
|
|
45
|
+
const openInNewTab = !isLocalLink || forceNewTab;
|
|
15
46
|
const attrs = [`class="govuk-link"`, `href="${href}"`];
|
|
16
|
-
if (
|
|
47
|
+
if (openInNewTab) {
|
|
17
48
|
attrs.push(`target="_blank" rel="noreferrer noopener"`);
|
|
18
49
|
}
|
|
19
|
-
const label =
|
|
50
|
+
const label = openInNewTab ? `${text} (opens in new tab)` : text;
|
|
20
51
|
return `<a ${attrs.join(' ')}>${label}</a>`;
|
|
21
52
|
}
|
|
22
53
|
function demoteHeading(text, depth, startingHeaderLevel) {
|
|
@@ -35,11 +66,8 @@ export function markdownToHtml(markdown, options) {
|
|
|
35
66
|
}
|
|
36
67
|
const escaped = markdown.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>').replace(/"/g, '"').replace(/'/g, ''');
|
|
37
68
|
const renderer = new Renderer();
|
|
38
|
-
renderer.link =
|
|
39
|
-
href,
|
|
40
|
-
text
|
|
41
|
-
}) => {
|
|
42
|
-
return renderLink(href, text, options?.baseUrl);
|
|
69
|
+
renderer.link = token => {
|
|
70
|
+
return renderLink(token.href, token.text, options?.baseUrl, token.forceNewTab);
|
|
43
71
|
};
|
|
44
72
|
if (options?.startingHeaderLevel) {
|
|
45
73
|
renderer.heading = ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markdown.js","names":["Marked","Renderer","marked","breaks","gfm","renderLink","href","text","baseUrl","isLocalLink","startsWith","attrs","push","label","join","demoteHeading","depth","startingHeaderLevel","Math","min","markdownToHtml","markdown","options","undefined","escaped","replace","
|
|
1
|
+
{"version":3,"file":"markdown.js","names":["Marked","Renderer","marked","breaks","gfm","extensions","name","level","start","src","indexOf","tokenizer","tokens","match","exec","length","last","type","forceNewTab","raw","renderer","renderLink","href","text","baseUrl","isLocalLink","startsWith","openInNewTab","attrs","push","label","join","demoteHeading","depth","startingHeaderLevel","Math","min","markdownToHtml","markdown","options","undefined","escaped","replace","link","token","heading","parse","async"],"sources":["../../../src/utils/markdown.ts"],"sourcesContent":["import { Marked, Renderer, type Token, type Tokens } from 'marked'\n\n/**\n * Marked instance (avoids global option/extension scope)\n */\nexport const marked = new Marked({\n breaks: true,\n gfm: true,\n\n /**\n * Inline extension to support {:target=\"_blank\"} attribute syntax on links.\n * Allows form designers to force any link to open in a new tab, e.g.\n * [Open the service](https://example.gov.uk){:target=\"_blank\"}\n */\n extensions: [\n {\n name: 'linkAttributes',\n level: 'inline',\n start(src: string) {\n return src.indexOf('{:')\n },\n tokenizer(src: string, tokens: Token[]) {\n // Quotes are HTML-escaped before parsing, so \" becomes "\n const match = /^\\{:target="_blank"\\}/.exec(src)\n if (match && tokens.length > 0) {\n const last = tokens[tokens.length - 1]\n if (last.type === 'link') {\n ;(last as Tokens.Link & { forceNewTab: boolean }).forceNewTab = true\n return {\n type: 'linkAttributes',\n raw: match[0]\n }\n }\n }\n },\n renderer() {\n return ''\n }\n }\n ]\n})\n\nfunction renderLink(\n href: string,\n text: string,\n baseUrl?: string,\n forceNewTab = false\n) {\n let isLocalLink = true\n\n if (baseUrl) {\n isLocalLink = href.startsWith(baseUrl) || href.startsWith('mailto:')\n }\n\n const openInNewTab = !isLocalLink || forceNewTab\n\n const attrs = [`class=\"govuk-link\"`, `href=\"${href}\"`]\n\n if (openInNewTab) {\n attrs.push(`target=\"_blank\" rel=\"noreferrer noopener\"`)\n }\n\n const label = openInNewTab ? `${text} (opens in new tab)` : text\n\n return `<a ${attrs.join(' ')}>${label}</a>`\n}\n\nfunction demoteHeading(\n text: string,\n depth: number,\n startingHeaderLevel: number\n) {\n // Max heading is h6 so don't demote further than that\n depth = Math.min(depth + startingHeaderLevel - 1, 6)\n return `<h${depth}>${text}</h${depth}>\n`\n}\n\n/**\n * Convert markdown to HTML, escaping any HTML tags first\n */\nexport function markdownToHtml(\n markdown: string | null | undefined,\n options?: {\n baseUrl?: string // optional in some contexts, e.g. from the designer where it might not make sense,\n startingHeaderLevel?: number\n }\n) {\n if (markdown === undefined || markdown === null) {\n return ''\n }\n\n const escaped = markdown\n .replace(/&/g, '&')\n .replace(/</g, '<')\n .replace(/>/g, '>')\n .replace(/\"/g, '"')\n .replace(/'/g, ''')\n\n const renderer = new Renderer()\n renderer.link = (token: Tokens.Link): string => {\n return renderLink(\n token.href,\n token.text,\n options?.baseUrl,\n (token as Tokens.Link & { forceNewTab?: boolean }).forceNewTab\n )\n }\n if (options?.startingHeaderLevel) {\n renderer.heading = ({ text, depth }: Tokens.Heading): string => {\n return demoteHeading(text, depth, options.startingHeaderLevel ?? 1)\n }\n }\n return marked.parse(escaped, { async: false, renderer })\n}\n"],"mappings":"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","ignoreList":[]}
|
package/dist/types/index.d.ts
CHANGED
|
@@ -17,6 +17,7 @@ export * from './form/form-editor/index.js';
|
|
|
17
17
|
export * from './form/form-editor/preview/index.js';
|
|
18
18
|
export * from './form/form-manager/types.js';
|
|
19
19
|
export * from './form/form-manager/errors.js';
|
|
20
|
+
export * from './manage/dead-letter-queues.js';
|
|
20
21
|
export * from './manage/roles.js';
|
|
21
22
|
export * from './manage/users.js';
|
|
22
23
|
export * from './pages/index.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,2BAA2B,CAAA;AACzC,cAAc,wBAAwB,CAAA;AACtC,cAAc,kCAAkC,CAAA;AAChD,cAAc,8BAA8B,CAAA;AAC5C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,2BAA2B,CAAA;AACzC,cAAc,2BAA2B,CAAA;AACzC,cAAc,qCAAqC,CAAA;AACnD,cAAc,qCAAqC,CAAA;AACnD,cAAc,uCAAuC,CAAA;AACrD,cAAc,mCAAmC,CAAA;AACjD,cAAc,qCAAqC,CAAA;AACnD,cAAc,qCAAqC,CAAA;AACnD,cAAc,2BAA2B,CAAA;AACzC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,yCAAyC,CAAA;AACvD,cAAc,kCAAkC,CAAA;AAChD,cAAc,mCAAmC,CAAA;AACjD,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA;AACtC,cAAc,yBAAyB,CAAA;AACvC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,wCAAwC,CAAA;AAEtD,mBAAmB,uBAAuB,CAAA;AAC1C,mBAAmB,kCAAkC,CAAA;AACrD,mBAAmB,8BAA8B,CAAA;AACjD,mBAAmB,+BAA+B,CAAA;AAClD,mBAAmB,2BAA2B,CAAA;AAC9C,mBAAmB,2BAA2B,CAAA;AAC9C,mBAAmB,qCAAqC,CAAA;AACxD,mBAAmB,mCAAmC,CAAA;AACtD,mBAAmB,qCAAqC,CAAA;AACxD,mBAAmB,yCAAyC,CAAA;AAC5D,mBAAmB,iCAAiC,CAAA;AACpD,mBAAmB,wCAAwC,CAAA;AAC3D,mBAAmB,gCAAgC,CAAA;AACnD,mBAAmB,uBAAuB,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,2BAA2B,CAAA;AACzC,cAAc,wBAAwB,CAAA;AACtC,cAAc,kCAAkC,CAAA;AAChD,cAAc,8BAA8B,CAAA;AAC5C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,2BAA2B,CAAA;AACzC,cAAc,2BAA2B,CAAA;AACzC,cAAc,qCAAqC,CAAA;AACnD,cAAc,qCAAqC,CAAA;AACnD,cAAc,uCAAuC,CAAA;AACrD,cAAc,mCAAmC,CAAA;AACjD,cAAc,qCAAqC,CAAA;AACnD,cAAc,qCAAqC,CAAA;AACnD,cAAc,2BAA2B,CAAA;AACzC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,yCAAyC,CAAA;AACvD,cAAc,kCAAkC,CAAA;AAChD,cAAc,mCAAmC,CAAA;AACjD,cAAc,oCAAoC,CAAA;AAClD,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA;AACtC,cAAc,yBAAyB,CAAA;AACvC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,wCAAwC,CAAA;AAEtD,mBAAmB,uBAAuB,CAAA;AAC1C,mBAAmB,kCAAkC,CAAA;AACrD,mBAAmB,8BAA8B,CAAA;AACjD,mBAAmB,+BAA+B,CAAA;AAClD,mBAAmB,2BAA2B,CAAA;AAC9C,mBAAmB,2BAA2B,CAAA;AAC9C,mBAAmB,qCAAqC,CAAA;AACxD,mBAAmB,mCAAmC,CAAA;AACtD,mBAAmB,qCAAqC,CAAA;AACxD,mBAAmB,yCAAyC,CAAA;AAC5D,mBAAmB,iCAAiC,CAAA;AACpD,mBAAmB,wCAAwC,CAAA;AAC3D,mBAAmB,gCAAgC,CAAA;AACnD,mBAAmB,uBAAuB,CAAA"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export declare enum DeadLetterQueues {
|
|
2
|
+
AuditApi = "audit-api",
|
|
3
|
+
NotifyListener = "notify-listener",
|
|
4
|
+
SharepointListener = "sharepoint-listener",
|
|
5
|
+
SubmissionsApiFormSubmissions = "submissions-api (form submissions)",
|
|
6
|
+
SubmissionsApiSaveAndExit = "submissions-api (save-and-exit)"
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=dead-letter-queues.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dead-letter-queues.d.ts","sourceRoot":"","sources":["../../../src/manage/dead-letter-queues.ts"],"names":[],"mappings":"AAAA,oBAAY,gBAAgB;IAC1B,QAAQ,cAAc;IACtB,cAAc,oBAAoB;IAClC,kBAAkB,wBAAwB;IAC1C,6BAA6B,uCAAuC;IACpE,yBAAyB,oCAAoC;CAC9D"}
|
|
@@ -14,7 +14,8 @@ export declare enum Scopes {
|
|
|
14
14
|
UserEdit = "user-edit",
|
|
15
15
|
FormsFeedback = "forms-feedback",
|
|
16
16
|
FormsBackup = "forms-backup",
|
|
17
|
-
ResetSaveAndExit = "reset-save-and-exit"
|
|
17
|
+
ResetSaveAndExit = "reset-save-and-exit",
|
|
18
|
+
DeadLetterQueues = "dead-letter-queues"
|
|
18
19
|
}
|
|
19
20
|
export declare const RoleScopes: {
|
|
20
21
|
superadmin: Scopes[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roles.d.ts","sourceRoot":"","sources":["../../../src/manage/roles.ts"],"names":[],"mappings":"AAAA,oBAAY,KAAK;IACf,UAAU,eAAe;IACzB,KAAK,UAAU;IACf,aAAa,mBAAmB;IAChC,WAAW,iBAAiB;CAC7B;AAED,oBAAY,MAAM;IAChB,UAAU,gBAAgB;IAC1B,QAAQ,cAAc;IACtB,QAAQ,cAAc;IACtB,WAAW,iBAAiB;IAC5B,UAAU,gBAAgB;IAC1B,UAAU,gBAAgB;IAC1B,QAAQ,cAAc;IACtB,aAAa,mBAAmB;IAChC,WAAW,iBAAiB;IAC5B,gBAAgB,wBAAwB;
|
|
1
|
+
{"version":3,"file":"roles.d.ts","sourceRoot":"","sources":["../../../src/manage/roles.ts"],"names":[],"mappings":"AAAA,oBAAY,KAAK;IACf,UAAU,eAAe;IACzB,KAAK,UAAU;IACf,aAAa,mBAAmB;IAChC,WAAW,iBAAiB;CAC7B;AAED,oBAAY,MAAM;IAChB,UAAU,gBAAgB;IAC1B,QAAQ,cAAc;IACtB,QAAQ,cAAc;IACtB,WAAW,iBAAiB;IAC5B,UAAU,gBAAgB;IAC1B,UAAU,gBAAgB;IAC1B,QAAQ,cAAc;IACtB,aAAa,mBAAmB;IAChC,WAAW,iBAAiB;IAC5B,gBAAgB,wBAAwB;IACxC,gBAAgB,uBAAuB;CACxC;AAED,eAAO,MAAM,UAAU;;;;;CAmBtB,CAAA;AAED,eAAO,MAAM,SAAS;;;;;CAKrB,CAAA;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,YAS9C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../../src/utils/markdown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../../src/utils/markdown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAqC,MAAM,QAAQ,CAAA;AAElE;;GAEG;AACH,eAAO,MAAM,MAAM,QAmCjB,CAAA;AAsCF;;GAEG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACnC,OAAO,CAAC,EAAE;IACR,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,mBAAmB,CAAC,EAAE,MAAM,CAAA;CAC7B,UA4BF"}
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -17,6 +17,7 @@ export * from '~/src/form/form-editor/index.js'
|
|
|
17
17
|
export * from '~/src/form/form-editor/preview/index.js'
|
|
18
18
|
export * from '~/src/form/form-manager/types.js'
|
|
19
19
|
export * from '~/src/form/form-manager/errors.js'
|
|
20
|
+
export * from '~/src/manage/dead-letter-queues.js'
|
|
20
21
|
export * from '~/src/manage/roles.js'
|
|
21
22
|
export * from '~/src/manage/users.js'
|
|
22
23
|
export * from '~/src/pages/index.js'
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export enum DeadLetterQueues {
|
|
2
|
+
AuditApi = 'audit-api',
|
|
3
|
+
NotifyListener = 'notify-listener',
|
|
4
|
+
SharepointListener = 'sharepoint-listener',
|
|
5
|
+
SubmissionsApiFormSubmissions = 'submissions-api (form submissions)',
|
|
6
|
+
SubmissionsApiSaveAndExit = 'submissions-api (save-and-exit)'
|
|
7
|
+
}
|
package/src/manage/roles.ts
CHANGED
|
@@ -15,7 +15,8 @@ export enum Scopes {
|
|
|
15
15
|
UserEdit = 'user-edit',
|
|
16
16
|
FormsFeedback = 'forms-feedback',
|
|
17
17
|
FormsBackup = 'forms-backup',
|
|
18
|
-
ResetSaveAndExit = 'reset-save-and-exit'
|
|
18
|
+
ResetSaveAndExit = 'reset-save-and-exit',
|
|
19
|
+
DeadLetterQueues = 'dead-letter-queues'
|
|
19
20
|
}
|
|
20
21
|
|
|
21
22
|
export const RoleScopes = {
|
package/src/utils/markdown.ts
CHANGED
|
@@ -1,27 +1,66 @@
|
|
|
1
|
-
import { Marked, Renderer, type Tokens } from 'marked'
|
|
1
|
+
import { Marked, Renderer, type Token, type Tokens } from 'marked'
|
|
2
2
|
|
|
3
3
|
/**
|
|
4
4
|
* Marked instance (avoids global option/extension scope)
|
|
5
5
|
*/
|
|
6
6
|
export const marked = new Marked({
|
|
7
7
|
breaks: true,
|
|
8
|
-
gfm: true
|
|
8
|
+
gfm: true,
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* Inline extension to support {:target="_blank"} attribute syntax on links.
|
|
12
|
+
* Allows form designers to force any link to open in a new tab, e.g.
|
|
13
|
+
* [Open the service](https://example.gov.uk){:target="_blank"}
|
|
14
|
+
*/
|
|
15
|
+
extensions: [
|
|
16
|
+
{
|
|
17
|
+
name: 'linkAttributes',
|
|
18
|
+
level: 'inline',
|
|
19
|
+
start(src: string) {
|
|
20
|
+
return src.indexOf('{:')
|
|
21
|
+
},
|
|
22
|
+
tokenizer(src: string, tokens: Token[]) {
|
|
23
|
+
// Quotes are HTML-escaped before parsing, so " becomes "
|
|
24
|
+
const match = /^\{:target="_blank"\}/.exec(src)
|
|
25
|
+
if (match && tokens.length > 0) {
|
|
26
|
+
const last = tokens[tokens.length - 1]
|
|
27
|
+
if (last.type === 'link') {
|
|
28
|
+
;(last as Tokens.Link & { forceNewTab: boolean }).forceNewTab = true
|
|
29
|
+
return {
|
|
30
|
+
type: 'linkAttributes',
|
|
31
|
+
raw: match[0]
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
},
|
|
36
|
+
renderer() {
|
|
37
|
+
return ''
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
]
|
|
9
41
|
})
|
|
10
42
|
|
|
11
|
-
function renderLink(
|
|
43
|
+
function renderLink(
|
|
44
|
+
href: string,
|
|
45
|
+
text: string,
|
|
46
|
+
baseUrl?: string,
|
|
47
|
+
forceNewTab = false
|
|
48
|
+
) {
|
|
12
49
|
let isLocalLink = true
|
|
13
50
|
|
|
14
51
|
if (baseUrl) {
|
|
15
52
|
isLocalLink = href.startsWith(baseUrl) || href.startsWith('mailto:')
|
|
16
53
|
}
|
|
17
54
|
|
|
55
|
+
const openInNewTab = !isLocalLink || forceNewTab
|
|
56
|
+
|
|
18
57
|
const attrs = [`class="govuk-link"`, `href="${href}"`]
|
|
19
58
|
|
|
20
|
-
if (
|
|
59
|
+
if (openInNewTab) {
|
|
21
60
|
attrs.push(`target="_blank" rel="noreferrer noopener"`)
|
|
22
61
|
}
|
|
23
62
|
|
|
24
|
-
const label =
|
|
63
|
+
const label = openInNewTab ? `${text} (opens in new tab)` : text
|
|
25
64
|
|
|
26
65
|
return `<a ${attrs.join(' ')}>${label}</a>`
|
|
27
66
|
}
|
|
@@ -59,8 +98,13 @@ export function markdownToHtml(
|
|
|
59
98
|
.replace(/'/g, ''')
|
|
60
99
|
|
|
61
100
|
const renderer = new Renderer()
|
|
62
|
-
renderer.link = (
|
|
63
|
-
return renderLink(
|
|
101
|
+
renderer.link = (token: Tokens.Link): string => {
|
|
102
|
+
return renderLink(
|
|
103
|
+
token.href,
|
|
104
|
+
token.text,
|
|
105
|
+
options?.baseUrl,
|
|
106
|
+
(token as Tokens.Link & { forceNewTab?: boolean }).forceNewTab
|
|
107
|
+
)
|
|
64
108
|
}
|
|
65
109
|
if (options?.startingHeaderLevel) {
|
|
66
110
|
renderer.heading = ({ text, depth }: Tokens.Heading): string => {
|