Fix ci (#1610)

chili-epfl · Jan 10, 2019 · 70f26c4 · 70f26c4
1 parent fc0ade7
commit 70f26c4
Show file tree

Hide file tree

Showing 10 changed files with 97 additions and 100 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -7,3 +7,5 @@ templates/*
 frogapi-test/**
 frog/packages/*
 **/clientFiles/*
+ac/ac-autocode/src/lib/**
+
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -15,6 +15,9 @@ module.exports = {
     Meteor: true
   },
   rules: {
+    'react/no-unused-prop-types': 'off',
+    'react/no-access-state-in-setstate': 'off',
+    'react/button-has-type': 'off',
     'react/destructuring-assignment': 'off',
     'import/imports-first': ['warn', 'DISABLE-absolute-first'],
     'import/order': ['error', { groups: ['builtin', 'external'] }],
@@ -62,7 +65,6 @@ module.exports = {
     'no-use-before-define': 'off',
     'prefer-destructuring': 'off',
     'prefer-template': 'off',
-    'react/destructuring-assignment': 'off',
     'react/jsx-closing-bracket-location': 'off',
     'react/jsx-filename-extension': 'off',
     'react/jsx-indent': 'off',

diff --git a/ac/ac-brainstorm/src/ActivityRunner.js b/ac/ac-brainstorm/src/ActivityRunner.js
@@ -128,29 +128,27 @@ const Idea = ({
               />
             </A>
           )}
-          {editable &&
-            config.allowEdit && (
-              <A onClick={() => editFn(meta.id)}>
-                <PencilIcon
-                  style={{
-                    float: 'right',
-                    marginRight: '10px'
-                  }}
-                />
-              </A>
-            )}
-          {zoomable &&
-            !config.expandItems && (
-              <A onClick={() => zoomFn(meta.id)}>
-                <ZoomInIcon
-                  glyph="zoom-in"
-                  style={{
-                    float: 'right',
-                    marginRight: '10px'
-                  }}
-                />
-              </A>
-            )}
+          {editable && config.allowEdit && (
+            <A onClick={() => editFn(meta.id)}>
+              <PencilIcon
+                style={{
+                  float: 'right',
+                  marginRight: '10px'
+                }}
+              />
+            </A>
+          )}
+          {zoomable && !config.expandItems && (
+            <A onClick={() => zoomFn(meta.id)}>
+              <ZoomInIcon
+                glyph="zoom-in"
+                style={{
+                  float: 'right',
+                  marginRight: '10px'
+                }}
+              />
+            </A>
+          )}
         </font>
       </div>
     </div>
@@ -194,12 +192,12 @@ const IdeaListRaw = ({
                   edit === x.id
                     ? 'edit'
                     : zoom === x.id
-                      ? history
-                        ? 'history'
-                        : 'view'
-                      : config.expandItems
-                        ? 'view'
-                        : 'thumbView'
+                    ? history
+                      ? 'history'
+                      : 'view'
+                    : config.expandItems
+                    ? 'view'
+                    : 'thumbView'
                 }
                 render={({ zoomable, editable, children }) => (
                   <Idea

diff --git a/ac/ac-gallery/src/ActivityRunner.js b/ac/ac-gallery/src/ActivityRunner.js
@@ -154,24 +154,23 @@ class ActivityRunner extends React.Component<
             />
           </div>
         )}
-        {category !== 'categories' &&
-          zoomOn && (
-            <ZoomView
-              key={index}
-              index={index}
-              commentBox={config.canComment}
-              commentGuidelines={config.commentGuidelines}
-              close={() => setZoom(false)}
-              bigZoom={config.bigZoom}
-              {...{
-                learningItems,
-                LearningItem: dataFn.LearningItem,
-                setIndex,
-                dataFn,
-                logger
-              }}
-            />
-          )}
+        {category !== 'categories' && zoomOn && (
+          <ZoomView
+            key={index}
+            index={index}
+            commentBox={config.canComment}
+            commentGuidelines={config.commentGuidelines}
+            close={() => setZoom(false)}
+            bigZoom={config.bigZoom}
+            {...{
+              learningItems,
+              LearningItem: dataFn.LearningItem,
+              setIndex,
+              dataFn,
+              logger
+            }}
+          />
+        )}
       </>
     );
   }

diff --git a/ac/ac-select/src/dashboards.js b/ac/ac-select/src/dashboards.js
@@ -31,7 +31,7 @@ const styles = () => ({
   }
 });
 
-const lookupCapitalization = (word, text, activityId) => {
+const lookupCapitalization = (word, text) => {
   if (text.includes(word)) {
     return word;
   } else return text.match(new RegExp(word, 'gi'))[0];

diff --git a/ac/ac-single-li/src/ActivityRunner.js b/ac/ac-single-li/src/ActivityRunner.js
@@ -62,32 +62,29 @@ class ActivityRunner extends React.Component<
             render={({ editable, children }) => (
               <div>
                 {children}
-                {!editing &&
-                  !conf.noSubmit &&
-                  conf.allowEditing && (
-                    <Fab
-                      onClick={() =>
-                        editable
-                          ? this.setState({ editing: true })
-                          : dataFn.objDel(null, 'li')
-                      }
-                      color="secondary"
-                      aria-label={editable ? 'edit' : 'delete'}
-                    >
-                      {editable ? <EditIcon /> : <CloseIcon />}
-                    </Fab>
-                  )}
-                {editing &&
-                  !conf.noSubmit && (
-                    <Button
-                      onClick={() => this.setState({ editing: false })}
-                      color="primary"
-                      variant="contained"
-                      aria-label="save"
-                    >
-                      Save
-                    </Button>
-                  )}
+                {!editing && !conf.noSubmit && conf.allowEditing && (
+                  <Fab
+                    onClick={() =>
+                      editable
+                        ? this.setState({ editing: true })
+                        : dataFn.objDel(null, 'li')
+                    }
+                    color="secondary"
+                    aria-label={editable ? 'edit' : 'delete'}
+                  >
+                    {editable ? <EditIcon /> : <CloseIcon />}
+                  </Fab>
+                )}
+                {editing && !conf.noSubmit && (
+                  <Button
+                    onClick={() => this.setState({ editing: false })}
+                    color="primary"
+                    variant="contained"
+                    aria-label="save"
+                  >
+                    Save
+                  </Button>
+                )}
               </div>
             )}
           />

diff --git a/frog-utils/src/types.js b/frog-utils/src/types.js
@@ -339,7 +339,8 @@ export type LIComponentPropsT =
       render?: React.ComponentType<{
         ...{| dataFn: Object |},
         ...LIRenderPropsT
-      }>
+      }>,
+      notEmpty?: boolean
     |};
 
 export type LearningItemComponentT = React.ComponentType<LIComponentPropsT>;

diff --git a/frog/imports/api/versionUpgrades.js b/frog/imports/api/versionUpgrades.js
@@ -26,9 +26,8 @@ export const GraphObjUpgrades: Object = {
       ...graphObj.graph,
       graphVersion: graphObj.graph.graphVersion + 1
     },
-    activities: graphObj.activities.map(
-      x =>
-        x.activityType === 'ac-image' ? { ...x, activityType: 'ac-gallery' } : x
+    activities: graphObj.activities.map(x =>
+      x.activityType === 'ac-image' ? { ...x, activityType: 'ac-gallery' } : x
     )
   })
 };
diff --git a/frog/imports/client/LearningItem/RenderLearningItem.js b/frog/imports/client/LearningItem/RenderLearningItem.js
@@ -46,24 +46,23 @@ const withNullCheck = ({
           >
             {result}
           </MaybeClickable>
-          {this.props.open &&
-            liType.Viewer && (
-              <Dialog
-                maxWidth={false}
-                open
-                onClose={() => {
-                  setOpen(false);
-                }}
-              >
-                <liType.Viewer
-                  type="view"
-                  isPlayback={isPlayback}
-                  data={data.payload}
-                  dataFn={dataFn}
-                  LearningItem={dataFn && dataFn.LearningItem}
-                />
-              </Dialog>
-            )}
+          {this.props.open && liType.Viewer && (
+            <Dialog
+              maxWidth={false}
+              open
+              onClose={() => {
+                setOpen(false);
+              }}
+            >
+              <liType.Viewer
+                type="view"
+                isPlayback={isPlayback}
+                data={data.payload}
+                dataFn={dataFn}
+                LearningItem={dataFn && dataFn.LearningItem}
+              />
+            </Dialog>
+          )}
         </>
       );
       if (render) {

diff --git a/package-scripts.js b/package-scripts.js
@@ -1,5 +1,5 @@
-const { sync } = require('find-up');
 const { dirname } = require('path');
+const { sync } = require('find-up');
 
 const help = `echo '
        FROG scripts:
@@ -61,11 +61,11 @@ module.exports = {
     ),
     test: {
       default: fromRoot(
-        `nps -s flow.quiet eslint.normal jest`,
+        `nps -s flow.quiet eslint jest`,
         'Running Flow, ESLint and Jest'
       ),
       ci: fromRoot(
-        `nps -s lockfiles flow.quiet eslint.normal jest`,
+        `nps -s lockfiles flow.quiet eslint jest`,
         'Running LockFiles, Flow, ESLint and Jest'
       )
     },