Merge branch 'master' into bugfix-klappy-files-not-authenticated

Author: ancientTexts-net

.github/workflows/main.yml

@@ -2,8 +2,8 @@ name: Install, Build & Run Cypress
 
 on: [push]
 env:
-  CHILD_CONCURRENCY: 1
   NODE_ENV: test
+  ACTIONS_ALLOW_UNSECURE_COMMANDS: ${{ secrets.ACTIONS_ALLOW_UNSECURE_COMMANDS }}
   CYPRESS_DASHBOARD_KEY: ${{ secrets.CYPRESS_DASHBOARD_KEY }}
   CYPRESS_TEST_USERNAME: ${{ secrets.CYPRESS_TEST_USERNAME }}
   CYPRESS_TEST_PASSWORD: ${{ secrets.CYPRESS_TEST_PASSWORD }}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitea-react-toolkit",
-  "version": "1.3.12",
+  "version": "1.3.14-rc.1",
   "license": "MIT",
   "description": "A Gitea API React Toolkit Component Library",
   "homepage": "https://gitea-react-toolkit.netlify.com/",
@@ -16,9 +16,8 @@
     "base-64": "0.1.0",
     "jszip": "^3.5.0",
     "localforage": "1.7.3",
-    "markdown-translatable": "^1.2.1",
+    "markdown-translatable": "1.2.8",
     "prop-types": "15.7.2",
-    "react-json-view": "^1.19.1",
     "use-deep-compare-effect": "^1.3.1",
     "utf8": "3.0.0"
   },
@@ -57,7 +56,7 @@
     "@material-ui/core": "^4.7.0",
     "@material-ui/icons": "^4.9.1",
     "@types/base-64": "0.1.3",
-    "@types/cypress": "^1.1.3",
+    "@types/cypress": "1.1.3",
     "@types/jest": "^25.2.1",
     "@types/utf8": "2.1.6",
     "@typescript-eslint/eslint-plugin": "2.7.0",
@@ -68,7 +67,7 @@
     "babel-loader": "^8.0.6",
     "babel-plugin-istanbul": "6.0.0",
     "coveralls": "3.0.7",
-    "cypress": "^5.1.0",
+    "cypress": "6.2.1",
     "eslint": "6.6.0",
     "eslint-config-prettier": "6.5.0",
     "eslint-plugin-chai-friendly": "0.5.0",

src/components/application-bar/ApplicationBar.js

@@ -15,6 +15,7 @@ import {
 
 function ApplicationBar({
   title,
+  build,
   buttons,
   drawerMenu,
   drawerMenuProps,
@@ -35,6 +36,7 @@ function ApplicationBar({
           </div>
           <Typography variant="h6" color="inherit" className={classes.grow} noWrap>
             {title}
+            {build && <Typography variant="caption" color="inherit" > build {build}</Typography>}
           </Typography>
           <Typography variant="subtitle2" color="inherit" className={classes.grow} noWrap>
             {file ? file.filepath : ''}

src/components/authentication/useAuthentication.js

@@ -63,17 +63,6 @@ function useAuthentication({
     }
   }, [authentication, loadAuthentication, update]);
 
-  const onSubmit = useCallback(async ({
-    username, password, remember,
-  }) => {
-    if (authentication) {
-      logout();
-      update();
-    } else {
-      await onSubmitLogin({ username, password, remember });
-    }
-  }, [authentication, config, logout, update, onSubmitLogin]);
-
   const onSubmitLogin = useCallback(async ({
     username, password, remember,
   }) => {
@@ -110,6 +99,17 @@ function useAuthentication({
     messages.genericError, messages.networkError, messages.passwordError, messages.serverError, messages.usernameError,
   ]);
 
+  const onSubmit = useCallback(async ({
+    username, password, remember,
+  }) => {
+    if (authentication) {
+      logout();
+      update();
+    } else {
+      await onSubmitLogin({ username, password, remember });
+    }
+  }, [authentication, config, logout, update, onSubmitLogin]);
+
   const component = useMemo(() => (
     config && (
       <LoginForm

src/components/core/Core.js

@@ -1,6 +1,5 @@
 import React, { useState, useCallback } from 'react';
 import PropTypes from 'prop-types';
-import ReactJson from 'react-json-view';
 import { Paper, Button } from '@material-ui/core';
 
 import { useAuthentication } from '..';
@@ -37,17 +36,17 @@ function Core({
   }
 
   if (response) {
-    responseComponent = <ReactJson src={response} />;
+    responseComponent = <div>{JSON.stringify(response)}</div>;
   } else if (loading) {
-    responseComponent = <ReactJson src={{ pending: true }} />;
+    responseComponent = <div/>;
   } else if (!response && typeof (response) !== 'undefined' && !loading) {
     responseComponent = 'No response';
   }
   return (
     <>
       <h3>Props</h3>
       <Paper>
-        <ReactJson src={props} />
+        <div>{JSON.stringify(props)}</div>
       </Paper>
       <h3>Response</h3>
       <Paper>

src/components/repositories/SearchForm.md

@@ -3,7 +3,6 @@ The SearchForm component will make a search api call and return the resulting re
 ```js
 import { useState } from 'react';
 import { Paper } from '@material-ui/core';
-import ReactJson from 'react-json-view';
 import { SearchForm } from 'gitea-react-toolkit';
 
 const [repos, setRepos] = useState([]);
@@ -20,7 +19,7 @@ const [repos, setRepos] = useState([]);
   </Paper>
   <h3>Search Results:</h3>
   <Paper style={{maxHeight: '300px', overflow: 'scroll'}}>
-    <ReactJson src={repos} />
+    <pre>{JSON.stringify(repos)}</pre>
   </Paper>
 </div>
 ```

src/core/localStrings.js

@@ -12,9 +12,16 @@ const strings = {
 };
 
 export const localString = (id) => {
-    let lang = navigator.language.split(/-|_/)[0];
+    let lang = null;
+    
+    if (typeof window !== 'undefined' )
+    {
+        if (navigator) {
+            lang = navigator.language.split(/-|_/)[0];
+        }
+    }
     // if language is unknown (not sure this can actually happen)
-    if ( lang === undefined ) {
+    if (!lang) {
         lang = 'en';
     }
     // if there are no strings for the language