Merge branch 'dev' into long-callback-errors

Author: T4rk1n

Diff for: @plotly/dash-generator-test-component-typescript/generator.test.ts

@@ -61,7 +61,8 @@ describe('Test Typescript component metadata generation', () => {
     describe.each([
         'TypeScriptComponent',
         'TypeScriptClassComponent',
-        'MemoTypeScriptComponent'
+        'MemoTypeScriptComponent',
+        'FCComponent',
     ])('Test prop type names', componentName => {
         const getPropTypeName = (name, data) =>
             R.path(propPath(componentName, name).concat('type', 'name'), data);
@@ -256,10 +257,16 @@ describe('Test Typescript component metadata generation', () => {
         test('Standard js component is parsed', () => {
             expect(R.path(['StandardComponent'], metadata)).toBeDefined();
         });
+        test('Mixed component prop-type & typescript', () => {
+            expect(R.path(['MixedComponent', 'props', 'prop', 'type', 'name'], metadata)).toBe('arrayOf')
+        })
     });
-    describe('Test namespace props', () => {
+    describe('Test special cases', () => {
         test('Component with picked boolean prop', () => {
             expect(R.path(['WrappedHTML', "props", "autoFocus", "type", "name"], metadata)).toBe("bool");
-        })
-    })
+        });
+        test('Empty Component', () => {
+            expect(R.path(['EmptyComponent', 'props'], metadata)).toBeDefined();
+        });
+    });
 });

Diff for: @plotly/dash-generator-test-component-typescript/src/components/EmptyComponent.tsx

@@ -0,0 +1,5 @@
+import React from 'react';
+
+const EmptyComponent = () => <div>Empty</div>;
+
+export default EmptyComponent;

Diff for: @plotly/dash-generator-test-component-typescript/src/components/FCComponent.tsx

@@ -0,0 +1,8 @@
+import React from 'react';
+import { TypescriptComponentProps } from '../props';
+
+const FCComponent: React.FC<TypescriptComponentProps> = (props) => (
+    <div>{props.children}</div>
+);
+
+export default FCComponent;

Diff for: @plotly/dash-generator-test-component-typescript/src/components/MixedComponent.tsx

@@ -0,0 +1,19 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+
+type Props = {
+    id?: string;
+    prop: string[];
+}
+
+const MixedComponent: React.FC<Props> = (props) => {
+    return (
+        <div id={props.id}>{props.children}</div>
+    )
+}
+
+MixedComponent.propTypes = {
+    prop: PropTypes.arrayOf(PropTypes.string).isRequired
+}
+
+export default MixedComponent;

Diff for: @plotly/dash-generator-test-component-typescript/src/index.ts

@@ -3,11 +3,17 @@ import TypeScriptClassComponent from './components/TypeScriptClassComponent';
 import MemoTypeScriptComponent from './components/MemoTypeScriptComponent';
 import StandardComponent from './components/StandardComponent.react';
 import WrappedHTML from './components/WrappedHTML';
+import FCComponent from './components/FCComponent';
+import EmptyComponent from './components/EmptyComponent';
+import MixedComponent from './components/MixedComponent';
 
 export {
-    TypeScriptComponent,
-    TypeScriptClassComponent,
-    MemoTypeScriptComponent,
-    StandardComponent,
-    WrappedHTML,
+  TypeScriptComponent,
+  TypeScriptClassComponent,
+  MemoTypeScriptComponent,
+  StandardComponent,
+  WrappedHTML,
+  FCComponent,
+  EmptyComponent,
+  MixedComponent,
 };

Diff for: CHANGELOG.md

@@ -2,6 +2,13 @@
 All notable changes to `dash` will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+## [UNRELEASED]
+
+### Fixed
+
+- [#2098](https://github.com/plotly/dash/pull/2098) Accept HTTP code 400 as well as 401 for JWT expiry
+- [#2097](https://github.com/plotly/dash/pull/2097) Fix bug [#2095](https://github.com/plotly/dash/issues/2095) with TypeScript compiler and `React.FC` empty valueDeclaration error & support empty props components.
+
 ## [2.5.1] - 2022-06-13
 
 ### Fixed
@@ -29,8 +36,8 @@ This feature can be disabled by providing an empty viewport meta tag.  e.g. `app
 
 ### Fixed
 
-- [#2043](https://github.com/plotly/dash/pull/2043) Fix bug 
-[#2003](https://github.com/plotly/dash/issues/2003) in which 
+- [#2043](https://github.com/plotly/dash/pull/2043) Fix bug
+[#2003](https://github.com/plotly/dash/issues/2003) in which
 `dangerously_allow_html=True` + `mathjax=True` works in some cases, and in some cases not.
 - [#2065](https://github.com/plotly/dash/pull/2065) Fix bug [#2064](https://github.com/plotly/dash/issues/2064) rendering of `dcc.Dropdown` with a value but no options.
 - [#2047](https://github.com/plotly/dash/pull/2047) Fix bug [#1979](https://github.com/plotly/dash/issues/1979) in which `DASH_DEBUG` as environment variable gets ignored.

Diff for: dash/dash-renderer/src/actions/api.js

@@ -65,7 +65,10 @@ export default function apiThunk(endpoint, method, store, id, body) {
                     return;
                 }
 
-                if (res.status === STATUS.UNAUTHORIZED) {
+                if (
+                    res.status === STATUS.UNAUTHORIZED ||
+                    res.status === STATUS.BAD_REQUEST
+                ) {
                     if (hooks.request_refresh_jwt) {
                         const body = await res.text();
                         if (body.includes(JWT_EXPIRED_MESSAGE)) {

Diff for: dash/dash-renderer/src/actions/callbacks.ts

@@ -679,7 +679,8 @@ export function executeCallback(
                         lastError = res;
                         if (
                             retry <= MAX_AUTH_RETRIES &&
-                            res.status === STATUS.UNAUTHORIZED
+                            (res.status === STATUS.UNAUTHORIZED ||
+                                res.status === STATUS.BAD_REQUEST)
                         ) {
                             const body = await res.text();
 

Diff for: dash/dash-renderer/src/constants/constants.js

@@ -5,6 +5,10 @@ export const JWT_EXPIRED_MESSAGE = 'JWT Expired';
 export const STATUS = {
     OK: 200,
     PREVENT_UPDATE: 204,
+    // We accept both 400 and 401 for JWT token expiry responses.
+    // Some servers use code 400 for expired tokens, because
+    // they reserve 401 for cases that require user action
+    BAD_REQUEST: 400,
     UNAUTHORIZED: 401,
     CLIENTSIDE_ERROR: 'CLIENTSIDE_ERROR',
     NO_RESPONSE: 'NO_RESPONSE'

Diff for: dash/development/base_component.py

@@ -196,7 +196,7 @@ def _set_random_id(self):
                 """
             )
 
-        v = str(uuid.UUID(int=rd.randint(0, 2 ** 128)))
+        v = str(uuid.UUID(int=rd.randint(0, 2**128)))
         setattr(self, "id", v)
         return v
 

Diff for: dash/extract-meta.js

@@ -113,7 +113,7 @@ function checkDocstring(name, value) {
 function docstringWarning(doc) {
     checkDocstring(doc.displayName, doc.description);
 
-    Object.entries(doc.props).forEach(([name, p]) =>
+    Object.entries(doc.props || {}).forEach(([name, p]) =>
         checkDocstring(`${doc.displayName}.${name}`, p.description)
     );
 }
@@ -672,14 +672,14 @@ function gatherComponents(sources, components = {}) {
                 } else {
                     // Function components.
                     rootExp = typeSymbol;
-                    commentSource = rootExp.valueDeclaration;
+                    commentSource = rootExp.valueDeclaration || rootExp.declarations[0];
                     if (
-                        rootExp.valueDeclaration &&
-                        rootExp.valueDeclaration.parent
+                        commentSource &&
+                        commentSource.parent
                     ) {
                         // Function with export later like `const MyComponent = (props) => <></>;`
                         commentSource = getParent(
-                            rootExp.valueDeclaration.parent
+                            commentSource.parent
                         );
                     }
                 }
@@ -719,8 +719,13 @@ function gatherComponents(sources, components = {}) {
                 );
             }
 
+            if (!props) {
+                // Ensure empty components has props.
+                props = {};
+            }
+
             const fullText = source.getFullText();
-            let description;
+            let description = '';
             const commentRanges = ts.getLeadingCommentRanges(
                 fullText,
                 commentSource.getFullStart()

Diff for: tests/integration/renderer/test_request_hooks.py

@@ -1,6 +1,7 @@
 import json
 import functools
 import flask
+import pytest
 
 from dash import Dash, Output, Input, html, dcc
 from werkzeug.exceptions import HTTPException
@@ -195,7 +196,8 @@ def update_output(value):
     assert dash_duo.get_logs() == []
 
 
-def test_rdrh003_refresh_jwt(dash_duo):
+@pytest.mark.parametrize("expiry_code", [401, 400])
+def test_rdrh003_refresh_jwt(expiry_code, dash_duo):
 
     app = Dash(__name__)
 
@@ -260,7 +262,7 @@ def wrap(*args, **kwargs):
                 ):
                     # Read the data to prevent bug with base http server.
                     flask.request.get_json(silent=True)
-                    flask.abort(401, description="JWT Expired " + str(token))
+                    flask.abort(expiry_code, description="JWT Expired " + str(token))
             except HTTPException as e:
                 return e
             return func(*args, **kwargs)