EPMRPP-75871 || Fix files loading for public plugins

reportportal · Apr 5, 2022 · 1dd49a3 · 1dd49a3
1 parent f2073a4
commit 1dd49a3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/app/src/controllers/plugins/uiExtensions/selectors.js b/app/src/controllers/plugins/uiExtensions/selectors.js
@@ -38,8 +38,8 @@ export const createExtensionSelectorByType = (type) =>
 
       const newExtensions = extensionsMetadata
         .filter(({ pluginName }) => pluginNames.includes(pluginName))
-        .map(({ pluginName, scope, extensions }) =>
-          extensions.map((ext) => ({ ...ext, pluginName, scope })),
+        .map(({ pluginName, scope, extensions, isPublic }) =>
+          extensions.map((ext) => ({ ...ext, pluginName, scope, isPublic })),
         );
 
       return uiExtensions
@@ -56,8 +56,8 @@ export const createPublicExtensionSelectorByType = (type) =>
     (pluginNames, extensionsMetadata) => {
       const newExtensions = extensionsMetadata
         .filter(({ pluginName }) => pluginNames.includes(pluginName))
-        .map(({ pluginName, scope, extensions }) =>
-          extensions.map((ext) => ({ ...ext, pluginName, scope })),
+        .map(({ pluginName, scope, extensions, isPublic }) =>
+          extensions.map((ext) => ({ ...ext, pluginName, scope, isPublic })),
         );
 
       return newExtensions

diff --git a/app/src/pages/outside/loginPage/pageBlocks/loginBlock/loginBlock.jsx b/app/src/pages/outside/loginPage/pageBlocks/loginBlock/loginBlock.jsx
@@ -16,11 +16,7 @@
 
 import { defineMessages } from 'react-intl';
 import { PageBlockContainer } from 'pages/outside/common/pageBlockContainer';
-import { useSelector } from 'react-redux';
 import React from 'react';
-import { ExtensionLoader, extensionType } from 'components/extensionLoader';
-import { uiExtensionLoginPageSelector } from 'controllers/plugins/uiExtensions';
-import PropTypes from 'prop-types';
 import { LoginForm } from './loginForm';
 
 const messages = defineMessages({
@@ -35,20 +31,9 @@ const messages = defineMessages({
 });
 
 export const LoginBlock = () => {
-  const extensions = useSelector(uiExtensionLoginPageSelector);
-
   return (
     <PageBlockContainer header={messages.welcome} hint={messages.login}>
-      {extensions.map((extension) => (
-        <ExtensionLoader extension={extension} />
-      ))}
       <LoginForm />
     </PageBlockContainer>
   );
 };
-LoginBlock.propTypes = {
-  extensions: PropTypes.arrayOf(extensionType),
-};
-LoginBlock.defaultProps = {
-  extensions: [],
-};
diff --git a/app/src/pages/outside/loginPage/pageBlocks/loginBlock/loginForm/loginForm.jsx b/app/src/pages/outside/loginPage/pageBlocks/loginBlock/loginForm/loginForm.jsx
@@ -35,6 +35,8 @@ import { FieldProvider } from 'components/fields/fieldProvider';
 import WarningIcon from 'common/img/error-inline.svg';
 import LoginIcon from 'common/img/login-field-icon-inline.svg';
 import PasswordIcon from 'common/img/password-field-icon-inline.svg';
+import { ExtensionLoader, extensionType } from 'components/extensionLoader';
+import { uiExtensionLoginPageSelector } from 'controllers/plugins/uiExtensions';
 import { ExternalLoginBlock } from './externalLoginBlock';
 import { DEFAULT_USER_CREDENTIALS } from './constants';
 import styles from './loginForm.scss';
@@ -73,6 +75,7 @@ const messages = defineMessages({
     lastFailedLoginTime: lastFailedLoginTimeSelector(state),
     badCredentials: badCredentialsSelector(state),
     isDemoInstance: isDemoInstanceSelector(state),
+    extensions: uiExtensionLoginPageSelector(state),
   }),
   {
     authorize: loginAction,
@@ -98,12 +101,14 @@ export class LoginForm extends React.Component {
     dispatch: PropTypes.func.isRequired,
     isDemoInstance: PropTypes.bool,
     initialize: PropTypes.func.isRequired,
+    extensions: PropTypes.arrayOf(extensionType),
   };
 
   static defaultProps = {
     externalAuth: {},
     lastFailedLoginTime: null,
     isDemoInstance: false,
+    extensions: [],
   };
 
   constructor(props) {
@@ -196,6 +201,7 @@ export class LoginForm extends React.Component {
       handleSubmit,
       externalAuth,
       authorize,
+      extensions,
     } = this.props;
     const { blockTime, isLoginLimitExceeded } = this.state;
 
@@ -212,6 +218,9 @@ export class LoginForm extends React.Component {
             </div>
           </div>
         ) : null}
+        {extensions.map((extension) => (
+          <ExtensionLoader extension={extension} />
+        ))}
         <div className={cx('login-field')}>
           <FieldProvider name="login">
             <FieldErrorHint>