Skip to content

Commit

Permalink
Lint fixes + fix for unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
knsv committed Sep 29, 2021
1 parent e4e8a00 commit d45765d
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
4 changes: 3 additions & 1 deletion src/diagrams/common/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ const sanitizeMore = (text, config) => {
};

export const sanitizeText = (text, config) => {
if(!text) return text;
const level = config.securityLevel;
console.log('security level', level);
if (!text) return text;
const txt = DOMPurify.sanitize(sanitizeMore(text, config));
return txt;
};
Expand Down
8 changes: 4 additions & 4 deletions src/diagrams/flowchart/parser/flow-singlenode.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ describe('[Singlenodes] when parsing', () => {
expect(vert['a'].type).toBe('diamond');
});

it('should handle a single diamond node with html in it', function() {
it('should handle a single diamond node with html in it (SN3)', function() {
// Silly but syntactically correct
const res = flow.parser.parse('graph TD;a{A <br> end};');

Expand All @@ -121,7 +121,7 @@ describe('[Singlenodes] when parsing', () => {

expect(edges.length).toBe(0);
expect(vert['a'].type).toBe('diamond');
expect(vert['a'].text).toBe('A <br/> end');
expect(vert['a'].text).toBe('A <br> end');
});

it('should handle a single hexagon node', function() {
Expand All @@ -144,7 +144,7 @@ describe('[Singlenodes] when parsing', () => {

expect(edges.length).toBe(0);
expect(vert['a'].type).toBe('hexagon');
expect(vert['a'].text).toBe('A <br/> end');
expect(vert['a'].text).toBe('A <br> end');
});

it('should handle a single round node with html in it', function() {
Expand All @@ -156,7 +156,7 @@ describe('[Singlenodes] when parsing', () => {

expect(edges.length).toBe(0);
expect(vert['a'].type).toBe('round');
expect(vert['a'].text).toBe('A <br/> end');
expect(vert['a'].text).toBe('A <br> end');
});

it('should handle a single node with alphanumerics starting on a char', function() {
Expand Down
2 changes: 1 addition & 1 deletion src/diagrams/flowchart/parser/flow-text.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ describe('[Text] when parsing', () => {
const edges = flow.parser.yy.getEdges();

expect(vert['C'].type).toBe('round');
expect(vert['C'].text).toBe('Chimpansen hoppar åäö <br/> - ÅÄÖ');
expect(vert['C'].text).toBe('Chimpansen hoppar åäö <br> - ÅÄÖ');
});
// xit('it should handle åäö, minus and space and br',function(){
// const res = flow.parser.parse('graph TD; A[Object&#40;foo,bar&#41;]-->B(Thing);');
Expand Down
8 changes: 6 additions & 2 deletions src/diagrams/state/stateDb.js
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,11 @@ export const addRelation = function (_id1, _id2, title) {
}
addState(id1, type1);
addState(id2, type2);
currentDocument.relations.push({ id1, id2, title: common.sanitizeText(title, configApi.getConfig()) });
currentDocument.relations.push({
id1,
id2,
title: common.sanitizeText(title, configApi.getConfig()),
});
};

const addDescription = function (id, _descr) {
Expand All @@ -204,7 +208,7 @@ const addDescription = function (id, _descr) {
if (descr[0] === ':') {
descr = descr.substr(1).trim();
}
theState.descriptions.push(common.sanitizeText(descr, config));
theState.descriptions.push(common.sanitizeText(descr, configApi.getConfig()));
};

export const cleanupLabel = function (label) {
Expand Down
1 change: 0 additions & 1 deletion src/diagrams/state/stateRenderer-v2.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ export const setConf = function (cnf) {
conf[keys[i]] = cnf[keys[i]];
}
};
let mainConfig = getConfig();

let nodeDb = {};

Expand Down

0 comments on commit d45765d

Please sign in to comment.