Merge branch 'develop' into component/search_configuration

Source/Plugins/Core/com.equella.core/js/.storybook/main.js

@@ -0,0 +1,11 @@
+module.exports = {
+ stories: ["../__stories__/**/*.stories.tsx"],
+ addons: [
+ "@storybook/preset-typescript",
+ "@storybook/addon-a11y",
+ "@storybook/addon-actions",
+ "@storybook/addon-docs",
+ "@storybook/addon-knobs",
+ "@storybook/addon-links"
+ ]
+};

Source/Plugins/Core/com.equella.core/js/.storybook/preview.ts

@@ -0,0 +1,6 @@
+import { addDecorator } from "@storybook/react";
+import { withA11y } from "@storybook/addon-a11y";
+import StoryRouter from "storybook-react-router";
+
+addDecorator(withA11y);
+addDecorator(StoryRouter());

Source/Plugins/Core/com.equella.core/js/__stories__/components/AppBarQuery.stories.tsx

@@ -0,0 +1,12 @@
+import * as React from "react";
+import { action } from "@storybook/addon-actions";
+import AppBarQuery from "../../tsrc/components/AppBarQuery";
+
+export default {
+ title: "AppBarQuery",
+ component: AppBarQuery
+};
+
+export const QueryText = () => (
+ <AppBarQuery query="" onChange={action("change")} />
+);

Source/Plugins/Core/com.equella.core/js/__stories__/components/ConfirmDialog.stories.tsx

@@ -0,0 +1,21 @@
+import * as React from "react";
+import { action } from "@storybook/addon-actions";
+import { boolean, text } from "@storybook/addon-knobs";
+import ConfirmDialog from "../../tsrc/components/ConfirmDialog";
+
+export default {
+ title: "ConfirmDialog",
+ component: ConfirmDialog
+};
+
+export const ShowDialog = () => (
+ <ConfirmDialog
+ open={boolean("open", true)}
+ title={text(
+ "title",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
+ )}
+ onCancel={action("cancel")}
+ onConfirm={action("confirm")}
+ />
+);

Source/Plugins/Core/com.equella.core/js/__stories__/components/Error.stories.tsx

@@ -0,0 +1,14 @@
+import * as React from "react";
+import Error from "../../tsrc/components/Error";
+
+export default {
+ title: "Error",
+ component: Error
+};
+
+export const WithWarningMessage = () => (
+ <Error>
+ <h1>Warning</h1>
+ <p>Something has gone wrong.</p>
+ </Error>
+);

Source/Plugins/Core/com.equella.core/js/__stories__/components/Loader.stories.tsx

@@ -0,0 +1,9 @@
+import * as React from "react";
+import Loader from "../../tsrc/components/Loader";
+
+export default {
+ title: "Loader",
+ component: Loader
+};
+
+export const Loading = () => <Loader />;

Source/Plugins/Core/com.equella.core/js/__stories__/components/MessageInfo.stories.tsx

@@ -0,0 +1,73 @@
+import * as React from "react";
+import { action } from "@storybook/addon-actions";
+import { boolean, select, text } from "@storybook/addon-knobs";
+import MessageInfo from "../../tsrc/components/MessageInfo";
+
+export default {
+ title: "MessageInfo",
+ component: MessageInfo
+};
+
+export const DynamicVariant = () => (
+ <MessageInfo
+ open={boolean("open", true)}
+ onClose={action("close")}
+ title={text(
+ "title",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
+ )}
+ variant={select(
+ "variant",
+ { success: "success", error: "error", info: "info", warning: "warning" },
+ "success"
+ )}
+ />
+);
+
+export const VariantSuccess = () => (
+ <MessageInfo
+ open={boolean("open", true)}
+ onClose={action("close")}
+ title={text(
+ "title",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
+ )}
+ variant="success"
+ />
+);
+
+export const VariantError = () => (
+ <MessageInfo
+ open={boolean("open", true)}
+ onClose={action("close")}
+ title={text(
+ "title",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
+ )}
+ variant="error"
+ />
+);
+
+export const VariantInfo = () => (
+ <MessageInfo
+ open={boolean("open", true)}
+ onClose={action("close")}
+ title={text(
+ "title",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
+ )}
+ variant="info"
+ />
+);
+
+export const VariantWarning = () => (
+ <MessageInfo
+ open={boolean("open", true)}
+ onClose={action("close")}
+ title={text(
+ "title",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
+ )}
+ variant="warning"
+ />
+);

Source/Plugins/Core/com.equella.core/js/__stories__/components/RichEditor.stories.tsx

@@ -0,0 +1,28 @@
+import * as React from "react";
+import { action } from "@storybook/addon-actions";
+import { text } from "@storybook/addon-knobs";
+import RichTextEditor from "../../tsrc/components/RichTextEditor";
+
+/**
+ * FIXME: to get the tinyMCE skin styles with the current setup
+ * the entire node modules folder needed to be included as a static source
+ * in the future only the skin styles should be served as a static folder
+ *
+ * When an alternative is ready update the `storybook` and `build-storybook` scripts
+ * in package.json with the new `-s` option
+ */
+export default {
+ title: "RichTextEditor",
+ component: RichTextEditor
+};
+
+export const WithHTMLInput = () => (
+ <RichTextEditor
+ htmlInput={text("htmlInput", "<p>example</p>")}
+ onStateChange={action("stateChange")}
+ />
+);
+
+export const WithoutHTMLInput = () => (
+ <RichTextEditor onStateChange={action("stateChange")} />
+);

Source/Plugins/Core/com.equella.core/js/__stories__/components/SearchResults.stories.tsx

@@ -0,0 +1,37 @@
+import * as React from "react";
+import { action } from "@storybook/addon-actions";
+import { text } from "@storybook/addon-knobs";
+import SearchResult from "../../tsrc/components/SearchResult";
+
+export default {
+ title: "SearchResult",
+ component: SearchResult
+};
+
+export const PrimaryTextOnly = () => (
+ <SearchResult
+ onClick={action("click")}
+ onDelete={action("delete")}
+ to={text("to", "#example")}
+ primaryText={text(
+ "primaryText",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
+ )}
+ />
+);
+
+export const PrimaryAndSecondaryText = () => (
+ <SearchResult
+ onClick={action("click")}
+ onDelete={action("delete")}
+ to={text("to", "#example")}
+ primaryText={text(
+ "primaryText",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
+ )}
+ secondaryText={text(
+ "secondaryText",
+ "sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum"
+ )}
+ />
+);

Source/Plugins/Core/com.equella.core/js/tsrc/__tests__/mainui/ErrorPage.test.tsx → Source/Plugins/Core/com.equella.core/js/__tests__/tsrc/mainui/ErrorPage.test.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { createMount } from "@material-ui/core/test-utils";
-import ErrorPage from "../../mainui/ErrorPage";
+import ErrorPage from "../../../tsrc/mainui/ErrorPage";
 
 jest.mock("@material-ui/core/styles", () => ({
  makeStyles: () => () => ({ errorPage: "mock-classname" })

Source/Plugins/Core/com.equella.core/js/tsrc/__tests__/util/actionutil.test.ts → Source/Plugins/Core/com.equella.core/js/__tests__/tsrc/util/actionutil.test.ts

@@ -1,4 +1,4 @@
-import { actionCreator, wrapAsyncWorker } from "../../util/actionutil";
+import { actionCreator, wrapAsyncWorker } from "../../../tsrc/util/actionutil";
 
 describe("actionutil", () => {
  describe("actionCreator", () => {

Source/Plugins/Core/com.equella.core/js/tsrc/__tests__/util/commonstrings.test.ts → Source/Plugins/Core/com.equella.core/js/__tests__/tsrc/util/commonstrings.test.ts

@@ -1,4 +1,4 @@
-import { commonString } from "../../util/commonstrings";
+import { commonString } from "../../../tsrc/util/commonstrings";
 
 describe("commonstrings", () => {
  describe("commonString", () => {

Source/Plugins/Core/com.equella.core/js/tsrc/__tests__/util/dictionary.test.ts → Source/Plugins/Core/com.equella.core/js/__tests__/tsrc/util/dictionary.test.ts

@@ -1,4 +1,4 @@
-import { properties } from "../../util/dictionary";
+import { properties } from "../../../tsrc/util/dictionary";
 
 describe("dictionary", () => {
  describe("properties", () => {

Source/Plugins/Core/com.equella.core/js/tsrc/__tests__/util/encodequery.test.ts → Source/Plugins/Core/com.equella.core/js/__tests__/tsrc/util/encodequery.test.ts

@@ -1,4 +1,4 @@
-import { encodeQuery } from "../../util/encodequery";
+import { encodeQuery } from "../../../tsrc/util/encodequery";
 
 describe("encodequery", () => {
  describe("encodeQuery", () => {

Source/Plugins/Core/com.equella.core/js/tsrc/__tests__/util/langstrings.test.ts → Source/Plugins/Core/com.equella.core/js/__tests__/tsrc/util/langstrings.test.ts

@@ -3,7 +3,7 @@ import {
  Sizes,
  prepLangStrings,
  initStrings
-} from "../../util/langstrings";
+} from "../../../tsrc/util/langstrings";
 
 describe("langstrings", () => {
  describe("formatSize", () => {
@@ -54,7 +54,9 @@ describe("langstrings", () => {
  });
 
  describe("initStrings", () => {
- expect(() => initStrings()).not.toThrowError();
+ it("should not throw an exception", () => {
+ expect(() => initStrings()).not.toThrow();
+ });
  });
  });
 });

Source/Plugins/Core/com.equella.core/js/tsrc/__tests__/util/validation.test.ts → Source/Plugins/Core/com.equella.core/js/__tests__/tsrc/util/validation.test.ts

@@ -1,4 +1,4 @@
-import { isInteger } from "../../util/validation";
+import { isInteger } from "../../../tsrc/util/validation";
 
 describe("validation", () => {
  describe("isInteger", () => {

Source/Plugins/Core/com.equella.core/js/__tests__/versioncheck.test.ts

@@ -35,9 +35,9 @@ describe("versioncheck", () => {
  const checkResult = createCheckResult("2020.1.0", mockData.mockReleases);
  expect(checkResult.newer).toBe(false);
 
- expect(checkResult.newerReleases.majorUpdate).toBe(null);
- expect(checkResult.newerReleases.minorUpdate).toBe(null);
- expect(checkResult.newerReleases.patchUpdate).toBe(null);
+ expect(checkResult.newerReleases.majorUpdate).toBeNull();
+ expect(checkResult.newerReleases.minorUpdate).toBeNull();
+ expect(checkResult.newerReleases.patchUpdate).toBeNull();
  });
  });
 });