Merge pull request #23 from CatalysmsServerManager/development

Author: niekcandaele

.github/workflows/ci.yml

@@ -1,5 +1,5 @@
 name: Build and Deploy
-on: [push]
+on: [push, pull_request]
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
@@ -47,4 +47,4 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           files: build.zip
-          tag_name: ${{ steps.prep.outputs.version }}-${{ steps.prep.outputs.created }}
+          tag_name: ${{ steps.prep.outputs.version }}-${{ steps.prep.outputs.created }}

package-lock.json

@@ -5,33 +5,38 @@
   "homepage": "/playground/",
   "scripts": {
     "start": "craco start",
+    "prebuild": "node scripts/versionSetter.js",
     "build": "craco build"
   },
   "dependencies": {
-    "@craco/craco": "^6.1.1",
-    "@material-ui/core": "^4.11.3",
-    "@sentry/react": "^6.16.1",
-    "@sentry/tracing": "^6.16.1",
-    "antd": "^4.18.2",
-    "axios": "^0.21.1",
-    "faker": "^5.5.3",
-    "framer-motion": "^3.10.3",
-    "history": "^5.0.0",
-    "immutable": "^4.0.0-rc.12",
-    "monaco-editor": "^0.23.0",
-    "monaco-editor-webpack-plugin": "^3.0.1",
-    "monaco-vim": "^0.1.12",
-    "notistack": "^1.0.5",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "react-helmet": "^6.1.0",
-    "react-redux": "^7.2.2",
-    "react-router-dom": "^6.2.1",
+    "@craco/craco": "6.1.1",
+    "@material-ui/core": "4.11.3",
+    "@sentry/react": "6.16.1",
+    "@sentry/tracing": "6.16.1",
+    "antd": "4.18.2",
+    "axios": "0.21.1",
+    "faker": "5.5.3",
+    "framer-motion": "3.10.3",
+    "history": "5.0.0",
+    "immutable": "4.0.0-rc.12",
+    "match-sorter": "6.3.1",
+    "monaco-editor": "0.23.0",
+    "monaco-editor-webpack-plugin": "3.0.1",
+    "notistack": "1.0.5",
+    "react": "17.0.1",
+    "react-dom": "17.0.1",
+    "react-helmet": "6.1.0",
+    "react-redux": "7.2.2",
+    "react-router-dom": "6.2.1",
     "react-scripts": "4.0.3",
-    "react-sortable-hoc": "^1.11.0",
-    "styled-components": "^5.2.1",
-    "typescript": "^4.1.2",
-    "web-vitals": "^1.0.1"
+    "react-table": "latest",
+    "styled-components": "5.3.5",
+    "typescript": "4.6.3",
+    "web-vitals": "1.0.1"
+  },
+  "resolutions": {
+    "//": "See https://github.com/facebook/create-react-app/issues/11773",
+    "react-error-overlay": "6.0.9"
   },
   "devDependencies": {
     "@types/axios": "^0.14.0",
@@ -41,6 +46,7 @@
     "@types/react-dom": "^17.0.0",
     "@types/react-helmet": "^6.1.0",
     "@types/react-redux": "^7.1.16",
+    "@types/react-table": "^7.7.10",
     "@types/redux": "^3.6.0",
     "@types/redux-actions": "^2.6.1",
     "@types/styled-components": "^5.1.8",
@@ -185,4 +191,4 @@
       "last 1 safari version"
     ]
   }
-}
+}

package.json

@@ -0,0 +1,10 @@
+const date = new Date();
+const version = { version: date.toISOString() };
+
+const fs = require('fs');
+
+fs.writeFile('public/version.json', JSON.stringify(version), 'utf8', (error) => {
+  if (error) {
+    throw new Error(error);
+  }
+});

scripts/versionSetter.js

@@ -1,15 +1,20 @@
-import { FC } from 'react';
+import React, { FC } from 'react';
 import styled from 'styled-components';
 
-const Container = styled.div`
+const Container = styled.div<{scrollOverflow?: boolean;}>`
   width: 100%;
   height: 100vh;
   padding: 2.5%;
+  overflow-y: ${(props) => props.scrollOverflow ? 'scroll' : 'unset' };
 `;
 
-export const ContentContainer: FC = (props) => {
+interface ContainerProps {
+  scrollOverflow?: boolean;
+}
+
+export const ContentContainer: FC<ContainerProps> = (props) => {
   return (
-    <Container>
+    <Container scrollOverflow={props.scrollOverflow}>
       {props.children}
     </Container>
   );

src/components/ContentContainer.tsx

@@ -0,0 +1,47 @@
+import { Checkbox } from 'antd';
+import React, { useEffect, forwardRef } from 'react';
+
+interface Props {
+  indeterminate?: boolean;
+  id?: string
+  disabled?: boolean
+}
+
+const useCombinedRefs = (...refs: any[]): React.MutableRefObject<any> => {
+  const targetRef = React.useRef();
+
+  React.useEffect(() => {
+    refs.forEach(ref => {
+      if (!ref) return;
+
+      if (typeof ref === 'function') {
+        ref(targetRef.current);
+      } else {
+        ref.current = targetRef.current;
+      }
+    });
+  }, [refs]);
+
+  return targetRef;
+};
+
+const IndeterminateCheckbox = forwardRef<HTMLInputElement, Props>(
+  ({ indeterminate, ...rest }, ref: React.Ref<HTMLInputElement>) => {
+    const defaultRef = React.useRef(null);
+    const combinedRef = useCombinedRefs(ref, defaultRef);
+
+    useEffect(() => {
+      if (combinedRef?.current) {
+        combinedRef.current.indeterminate = indeterminate ?? false;
+      }
+    }, [combinedRef, indeterminate]);
+
+    return (
+      <React.Fragment>
+        <Checkbox disabled={rest.disabled} id={rest.id} ref={combinedRef} type="checkbox" {...rest} />
+      </React.Fragment>
+    );
+  }
+);
+
+export default IndeterminateCheckbox;