type on function props

GlobalDigitalLibraryio · Jul 31, 2019 · 00f1b16 · 00f1b16
1 parent f8dfd40
commit 00f1b16
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 51 deletions.
diff --git a/packages/admin-frontend/pages/_app.js b/packages/admin-frontend/pages/_app.js
@@ -50,10 +50,8 @@ class App extends NextApp {
       pageProps = await Component.getInitialProps(ctx);
     }
 
-    const userHasAuthToken = hasAuthToken(ctx.req); //true
-
-    const userHasAdminPrivileges = hasClaim(claims.readAdmin, ctx.req); //true
-    console.log(hasAuthToken(ctx.req), hasClaim(claims.readAdmin, ctx.req));
+    const userHasAuthToken = hasAuthToken(ctx.req);
+    const userHasAdminPrivileges = hasClaim(claims.readAdmin, ctx.req);
 
     // If we have response object, set a proper HTTP status code
     if (!userHasAdminPrivileges && ctx.res) {

diff --git a/packages/admin-frontend/pages/admin/featured.js b/packages/admin-frontend/pages/admin/featured.js
@@ -71,25 +71,15 @@ export default class EditFeaturedContent extends React.Component<Props, State> {
 
   getFeaturedContent = async (languageCode: string) => {
     const featuredContentRes = await fetchFeaturedContent(languageCode);
-    const featContList = [];
-    let i = 0;
-    while (featuredContentRes.isOk) {
-      if (featuredContentRes.data[i]) {
-        featContList.push(featuredContentRes.data[i]);
-      } else {
-        break;
-      }
-      i++;
-    }
 
-    if (featuredContentRes.isOk) {
-      if (featContList[0].language.code !== languageCode) {
+    if (featuredContentRes.isOk && featuredContentRes.data[0]) {
+      if (featuredContentRes.data[0].language.code !== languageCode) {
         this.setState({
           featuredContentList: []
         });
       } else {
         this.setState({
-          featuredContentList: featContList
+          featuredContentList: featuredContentRes.data
         });
       }
     }

diff --git a/packages/admin-frontend/pages/admin/featuredAdd.js b/packages/admin-frontend/pages/admin/featuredAdd.js
@@ -4,15 +4,16 @@ import { Add } from '@material-ui/icons';
 import FeaturedEdit from './featuredEdit';
 /** @jsx jsx */
 import { css, jsx } from '@emotion/core';
+import type { FeaturedContent } from '../../types';
 
 export default function FeatureAdd(
   defaultReturned: boolean,
-  handleSaveButtonClick: any,
-  handleFileChosen: any,
-  handleOnCancel: any,
-  file: any,
-  handleOnUpload: any,
-  featuredContentList: Array<any>,
+  handleSaveButtonClick: (boolean, FeaturedContent) => void,
+  handleFileChosen: (SyntheticInputEvent<EventTarget>) => void,
+  handleOnCancel: () => void,
+  file: ?File,
+  handleOnUpload: (string, (string, any) => void) => void,
+  featuredContentList: Array<FeaturedContent>,
   selectedLanguage: string
 ) {
   return (

diff --git a/packages/admin-frontend/pages/admin/featuredEdit.js b/packages/admin-frontend/pages/admin/featuredEdit.js
@@ -11,14 +11,14 @@ import type { FeaturedContent } from '../../types';
 type Props = {
   i: number,
   button: any,
-  featuredContentList: Array<any>,
+  featuredContentList: Array<FeaturedContent>,
   selectedLanguage: string,
   defaultReturned: boolean,
-  handleSaveButtonClick: any,
-  handleFileChosen: any,
-  handleOnCancel: any,
-  file: any,
-  handleOnUpload: any
+  handleSaveButtonClick: (boolean, FeaturedContent) => void,
+  handleFileChosen: (SyntheticInputEvent<EventTarget>) => void,
+  handleOnCancel: () => void,
+  file: ?File,
+  handleOnUpload: (string, (string, any) => void) => void
 };
 type State = {
   open: boolean
@@ -55,11 +55,11 @@ export default class FeaturedEdit extends React.Component<Props, State> {
     };
   }
 
-  handleClickOpen() {
+  handleClickOpen = () => {
     this.setState({
       open: true
     });
-  }
+  };
   handleClose() {
     this.setState({
       open: false
@@ -73,9 +73,17 @@ export default class FeaturedEdit extends React.Component<Props, State> {
     this.setState({ open: false });
   };
   render() {
+    const {
+      button,
+      featuredContentList,
+      selectedLanguage,
+      i,
+      defaultReturned,
+      file
+    } = this.props;
     return (
       <>
-        <div onClick={this.handleClickOpen.bind(this)}>{this.props.button}</div>
+        <div onClick={this.handleClickOpen}>{button}</div>
 
         <Dialog
           open={this.state.open}
@@ -85,12 +93,8 @@ export default class FeaturedEdit extends React.Component<Props, State> {
           <div style={{ padding: 25 }}>
             <>
               <Form
-                initialValues={
-                  this.props.featuredContentList[this.props.i] || {}
-                }
-                onSubmit={this.handleSaveButtonClick(
-                  this.props.defaultReturned
-                )}
+                initialValues={featuredContentList[i] || {}}
+                onSubmit={this.handleSaveButtonClick(defaultReturned)}
                 validate={handleValidate}
                 render={({ handleSubmit, pristine, invalid, form }) => (
                   <form>
@@ -101,7 +105,7 @@ export default class FeaturedEdit extends React.Component<Props, State> {
                           fullWidth
                           error={meta.error && meta.touched}
                           margin="normal"
-                          disabled={this.props.selectedLanguage === ''}
+                          disabled={selectedLanguage === ''}
                           label="Title"
                           {...input}
                         />
@@ -114,7 +118,7 @@ export default class FeaturedEdit extends React.Component<Props, State> {
                           fullWidth
                           margin="normal"
                           error={meta.error && meta.touched}
-                          disabled={this.props.selectedLanguage === ''}
+                          disabled={selectedLanguage === ''}
                           label="Description"
                           {...input}
                           multiline
@@ -130,7 +134,7 @@ export default class FeaturedEdit extends React.Component<Props, State> {
                             type="url"
                             error={meta.error && meta.touched}
                             margin="normal"
-                            disabled={this.props.selectedLanguage === ''}
+                            disabled={selectedLanguage === ''}
                             label="Link"
                             {...input}
                           />
@@ -155,7 +159,7 @@ export default class FeaturedEdit extends React.Component<Props, State> {
                                 margin="normal"
                                 error={meta.error && meta.touched}
                                 type="url"
-                                disabled={this.props.selectedLanguage === ''}
+                                disabled={selectedLanguage === ''}
                                 label="Image Url"
                                 {...input}
                               />
@@ -172,18 +176,18 @@ export default class FeaturedEdit extends React.Component<Props, State> {
                       <span>or</span>
 
                       <input
-                        disabled={this.props.selectedLanguage === ''}
+                        disabled={selectedLanguage === ''}
                         type="file"
                         accept="image/*"
                         value=""
                         onChange={event => this.props.handleFileChosen(event)}
                       />
 
-                      {this.props.file && (
+                      {file && (
                         <UploadFileDialog
-                          language={this.props.selectedLanguage}
-                          selectedFile={this.props.file}
-                          objectURL={URL.createObjectURL(this.props.file)}
+                          language={selectedLanguage}
+                          selectedFile={file}
+                          objectURL={URL.createObjectURL(file)}
                           onCancel={this.props.handleOnCancel}
                           onUpload={url =>
                             this.props.handleOnUpload(url, form.change)
@@ -208,16 +212,14 @@ export default class FeaturedEdit extends React.Component<Props, State> {
                       type="submit"
                       onClick={handleSubmit}
                     >
-                      {this.props.featuredContentList.length > this.props.i
-                        ? 'Save changes'
-                        : 'Save'}
+                      {featuredContentList.length > i ? 'Save changes' : 'Save'}
                     </Button>
                     <Button
                       color="secondary"
                       disabled={pristine}
                       onClick={form.reset}
                     >
-                      {this.props.featuredContentList.length > this.props.i
+                      {featuredContentList.length > i
                         ? 'Discard changes'
                         : 'Discard'}
                     </Button>