Merge pull request #345 from bcgsc/release/v6.21.0

Release/v6.21.0
bcgsc · Aug 8, 2023 · 79322ab · 79322ab
2 parents b4681ce + b802597
commit 79322ab
Show file tree

Hide file tree

Showing 29 changed files with 1,164 additions and 336 deletions.
diff --git a/app/components/AppendixEditor/AppendixEditor.stories.tsx b/app/components/AppendixEditor/AppendixEditor.stories.tsx
diff --git a/app/components/AppendixEditor/index.scss b/app/components/AppendixEditor/index.scss
diff --git a/app/components/AuthenticatedRoute/index.jsx b/app/components/AuthenticatedRoute/index.jsx
@@ -32,7 +32,9 @@ const AuthenticatedRoute = ({
           />
         );
       };
-    } if (!adminAccess && adminRequired) {
+    }
+
+    if (!adminAccess && adminRequired) {
       return () => (
         <Redirect to="/" />
       );

diff --git a/app/components/IPRWYSIWYGEditor/IPRWYSIWYGEditor.stories.tsx b/app/components/IPRWYSIWYGEditor/IPRWYSIWYGEditor.stories.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import { Story } from '@storybook/react/types-6-0';
+import IPRWYSIWYGEditor, { IPRWYSIWYGEditorProps } from '.';
+
+export default {
+  title: 'components/IPRWYSIWYGEditor',
+  component: IPRWYSIWYGEditor,
+};
+
+const Template = (args) => <IPRWYSIWYGEditor {...args} />;
+
+export const Empty: Story<IPRWYSIWYGEditorProps> = Template.bind({});
+Empty.args = {
+  isOpen: true,
+  text: null,
+};
+
+export const WithDefaultText: Story<IPRWYSIWYGEditorProps> = Template.bind({});
+WithDefaultText.args = {
+  isOpen: true,
+  text: 'Default loaded text',
+};
diff --git a/.../TextEditor/__tests__/TextEditor.test.tsx → ...Editor/__test__/IPRWYSIWYGEditor.test.tsx b/.../TextEditor/__tests__/TextEditor.test.tsx → ...Editor/__test__/IPRWYSIWYGEditor.test.tsx
@@ -3,7 +3,7 @@ import {
   render, screen, fireEvent, cleanup,
 } from '@testing-library/react';
 
-import TextEditor from '..';
+import IPRWYSIWYGEditor from '../index';
 
 const mockText = 'test value <h1>header</h1>';
 
@@ -12,8 +12,8 @@ describe('TextEditor', () => {
 
   test('Provided text is visible', async () => {
     render(
-      <TextEditor
-        analystComments={mockText}
+      <IPRWYSIWYGEditor
+        text={mockText}
         isOpen
         onClose={() => {}}
       />,
@@ -25,8 +25,8 @@ describe('TextEditor', () => {
   test('Close function is called', () => {
     const handleClose = jest.fn();
     render(
-      <TextEditor
-        analystComments={mockText}
+      <IPRWYSIWYGEditor
+        text={mockText}
         isOpen
         onClose={handleClose}
       />,