Merge pull request #14 from factly/fix/table

Fix/table
factly · Jan 19, 2023 · 5e6f5f8 · 5e6f5f8
2 parents 3942e33 + 1e0c661
commit 5e6f5f8
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 27 deletions.
diff --git a/studio/src/components/expectationcard.js b/studio/src/components/expectationcard.js
@@ -58,7 +58,7 @@ function ExpectationCard(Expectation) {
         title: key === '1' ? 'Row' : key,
         dataIndex: key,
         key: key,
-        width: 20 + (key === '1' ? 3 : key.length === 100 ? 80 : key.length),
+        width: 200,
       };
     });
     return unexpectedColumns;

diff --git a/studio/src/components/googleSheets.js b/studio/src/components/googleSheets.js
@@ -64,7 +64,7 @@ function GoogleSheetsForm({ style, ...props }) {
             <Input />
           </Form.Item>
 
-          <Form.Item label="Path/Prefix" name="worksheet">
+          <Form.Item label="Work Sheet Name" name="worksheet">
             <Input />
           </Form.Item>
           <Form.Item

diff --git a/studio/src/pages/validly/index.js b/studio/src/pages/validly/index.js
@@ -50,7 +50,7 @@ function Validly({ mode = 'datasets' }) {
     if (expectation.success) {
       return;
     }
-    if ((mode = 'metafacts')) {
+    if (mode === 'metafacts') {
       dispatch(
         addMetaFactsExpectationCard(updateExpectationsArray(expectations, expectation, index)),
       );
@@ -97,30 +97,38 @@ function Validly({ mode = 'datasets' }) {
               <Row gutter={16}>
                 <Col span={8}>
                   <Card bodyStyle={{ padding: '6px' }}>
-                    {file.expectations_Validated_List.map((expectation) => (
-                      <Card
-                        hoverable
-                        style={
-                          expectation.success
-                            ? { backgroundColor: '#effaf5', margin: '4px' }
-                            : { backgroundColor: '#feecf0', margin: '4px' }
-                        }
-                        onClick={() => displayExpectation(expectation, index)}
-                      >
-                        {expectation.success ? (
-                          <CheckSquareTwoTone
-                            style={{ fontSize: '125%', fontWeight: 'bold', paddingRight: '4px' }}
-                            twoToneColor="#48C78E"
-                          />
-                        ) : (
-                          <StopTwoTone
-                            style={{ fontSize: '125%', fontWeight: 'bolder', paddingRight: '4px' }}
-                            twoToneColor="#F14668"
-                          />
-                        )}
-                        <b> {expectation.Expectation_name.replaceAll('_', ' ')} </b>
-                      </Card>
-                    ))}
+                    {file.expectations_Validated_List
+                      .sort((a, b) => {
+                        return a.success === b.success ? 0 : a.success ? 1 : -1;
+                      })
+                      .map((expectation) => (
+                        <Card
+                          hoverable
+                          style={
+                            expectation.success
+                              ? { backgroundColor: '#effaf5', margin: '4px' }
+                              : { backgroundColor: '#feecf0', margin: '4px' }
+                          }
+                          onClick={() => displayExpectation(expectation, index)}
+                        >
+                          {expectation.success ? (
+                            <CheckSquareTwoTone
+                              style={{ fontSize: '125%', fontWeight: 'bold', paddingRight: '4px' }}
+                              twoToneColor="#48C78E"
+                            />
+                          ) : (
+                            <StopTwoTone
+                              style={{
+                                fontSize: '125%',
+                                fontWeight: 'bolder',
+                                paddingRight: '4px',
+                              }}
+                              twoToneColor="#F14668"
+                            />
+                          )}
+                          <b> {expectation.Expectation_name.replaceAll('_', ' ')} </b>
+                        </Card>
+                      ))}
                   </Card>
                 </Col>
                 <Col span={16}>