Added PropTypes and sorted component definitions

ManageIQ · Oct 3, 2019 · aec3d54 · aec3d54
1 parent f5111d1
commit aec3d54
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 6 deletions.
diff --git a/app/javascript/components/top-navbar/configuration.jsx b/app/javascript/components/top-navbar/configuration.jsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 
 const Configuration = ({
   opsExplorerAllowed,
@@ -16,4 +17,8 @@ const Configuration = ({
   )
 );
 
+Configuration.propTypes = {
+  opsExplorerAllowed: PropTypes.bool.isRequired,
+};
+
 export default Configuration;
diff --git a/app/javascript/components/top-navbar/help.jsx b/app/javascript/components/top-navbar/help.jsx
@@ -2,6 +2,8 @@
 
 import React from 'react';
 import { Dropdown, Icon, MenuItem } from 'patternfly-react';
+import PropTypes from 'prop-types';
+import { helpMenuProps, recursiveHelpMenuProps } from './recursive-props';
 
 const Help = ({
   helpMenu,
@@ -57,4 +59,11 @@ const Help = ({
     )))
 );
 
+Help.propTypes = {
+  helpMenu: PropTypes.arrayOf(PropTypes.shape({
+    ...helpMenuProps,
+    items: PropTypes.arrayOf(PropTypes.shape(recursiveHelpMenuProps)),
+  })).isRequired,
+};
+
 export default Help;
diff --git a/app/javascript/components/top-navbar/recursive-props.js b/app/javascript/components/top-navbar/recursive-props.js
@@ -1,5 +1,10 @@
 import PropTypes from 'prop-types';
 
+export const groupProps = {
+  description: PropTypes.string.isRequired,
+  id: PropTypes.number.isRequired,
+};
+
 export const helpMenuProps = {
   id: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,

diff --git a/app/javascript/components/top-navbar/right-section.jsx b/app/javascript/components/top-navbar/right-section.jsx
@@ -6,7 +6,7 @@ import Help from './help';
 import Configuration from './configuration';
 import UserOptions from './user-options';
 import {
-  helpMenuProps, recursiveHelpMenuProps, userMenuProps, recursiveUserMenuProps,
+  groupProps, helpMenuProps, recursiveHelpMenuProps, userMenuProps, recursiveUserMenuProps,
 } from './recursive-props';
 
 const RightSection = ({
@@ -25,11 +25,6 @@ const RightSection = ({
   </React.Fragment>
 );
 
-const groupProps = {
-  description: PropTypes.string.isRequired,
-  id: PropTypes.number.isRequired,
-};
-
 RightSection.defaultProps = {
   currentUser: null,
 };

diff --git a/app/javascript/components/top-navbar/user-options.jsx b/app/javascript/components/top-navbar/user-options.jsx
@@ -2,6 +2,11 @@
 
 import React from 'react';
 import { Dropdown, Icon, MenuItem } from 'patternfly-react';
+import PropTypes from 'prop-types';
+import {
+  groupProps, recursiveUserMenuProps, userMenuProps,
+} from './recursive-props';
+
 
 const UserOptions = ({
   currentUser, applianceName, miqGroups, currentGroup, userMenu,
@@ -107,4 +112,28 @@ const UserOptions = ({
   </Dropdown>
 );
 
+UserOptions.defaultProps = {
+  currentUser: null,
+};
+
+UserOptions.propTypes = {
+  currentUser: PropTypes.shape({
+    name: PropTypes.string.isRequired,
+    userid: PropTypes.string.isRequired,
+  }),
+  applianceName: PropTypes.string.isRequired,
+  miqGroups: PropTypes.arrayOf(
+    PropTypes.shape({
+      ...groupProps,
+    }).isRequired,
+  ).isRequired,
+  currentGroup: PropTypes.shape({
+    ...groupProps,
+  }).isRequired,
+  userMenu: PropTypes.arrayOf(PropTypes.shape({
+    ...userMenuProps,
+    items: PropTypes.arrayOf(PropTypes.shape(recursiveUserMenuProps)),
+  })).isRequired,
+};
+
 export default UserOptions;