display images from url

CovOpen · Sep 11, 2021 · 88c95e2 · 88c95e2
1 parent ec20a29
commit 88c95e2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/covquestions-editor-app/src/components/QuestionnaireExecution.tsx b/covquestions-editor-app/src/components/QuestionnaireExecution.tsx
@@ -137,7 +137,9 @@ export const QuestionnaireExecution: React.FC<QuestionnaireExecutionProps> = ({
  <Typography
  className={classes.questionDetails}
  dangerouslySetInnerHTML={{
- __html: sanitizeHtml(currentQuestion.details),
+ __html: sanitizeHtml(currentQuestion.details, {
+ allowedTags: sanitizeHtml.defaults.allowedTags.concat([ 'img' ]) 
+ }),
  }}
  />
  </Grid>

diff --git a/covquestions-editor-app/src/components/ResultComponent.tsx b/covquestions-editor-app/src/components/ResultComponent.tsx
@@ -36,7 +36,9 @@ export const ResultComponent: React.FC<{ results: Result[] }> = ({ results }) =>
  <Typography
  className={classes.resultText}
  dangerouslySetInnerHTML={{
- __html: sanitizeHtml(result.result.text),
+ __html: sanitizeHtml(result.result.text, {
+ allowedTags: sanitizeHtml.defaults.allowedTags.concat([ 'img' ]) 
+ }),
  }}
  />
  </Grid>

diff --git a/...pp/src/components/questionnaireEditor/formEditor/elementEditors/QuestionElementEditor.tsx b/...pp/src/components/questionnaireEditor/formEditor/elementEditors/QuestionElementEditor.tsx
@@ -53,8 +53,8 @@ export function ElementEditorQuestion(props: QuestionElementEditorProps) {
  const validate = (formData: QuestionInStringRepresentation, errors: any) => {
  try {
  convertStringToLogicExpression(formData.enableWhenExpressionString);
- } catch (error) {
- errors.enableWhenExpressionString.addError(error.message);
+ } catch (error: any) {
+  errors.enableWhenExpressionString.addError(error.message);
  }
  if (duplicatedIds.indexOf(formData.id) > -1) {
  errors.id.addError("Value of ID is duplicated");

diff --git a/.../components/questionnaireEditor/formEditor/elementEditors/ResultCategoryElementEditor.tsx b/.../components/questionnaireEditor/formEditor/elementEditors/ResultCategoryElementEditor.tsx
@@ -73,7 +73,7 @@ export function ResultCategoryElementEditor(props: ResultElementEditorProps) {
  const result = formData.results[i];
  try {
  convertStringToLogicExpression(result.expressionString);
-  } catch (error) {
+ } catch (error: any) {
  errors.results[i].expressionString.addError(error.message);
  }
 

diff --git a/...pp/src/components/questionnaireEditor/formEditor/elementEditors/VariableElementEditor.tsx b/...pp/src/components/questionnaireEditor/formEditor/elementEditors/VariableElementEditor.tsx
@@ -46,7 +46,7 @@ export function VariableElementEditor(props: VariableElementEditorProps) {
  const onValidate = (formData: VariableInStringRepresentation, errors: any) => {
  try {
  convertStringToLogicExpression(formData?.expressionString);
- } catch (error) {
+ } catch (error: any) {
  errors.expressionString.addError(error.message);
  }