Remove travis workarounds; Temporarily revert code blocks

Zomato · Jul 7, 2020 · 8dc699a · 8dc699a
1 parent 89bbf5b
commit 8dc699a
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 140 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,6 @@ matrix:
     - '3.6'
     env:
     - IS_DEPLOYABLE=true
-    before_install:
-    - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"
     install:
     - pip3 install -r requirements.txt
     - pip3 install codecov
@@ -30,8 +28,6 @@ matrix:
     - npm run test
     after_success:
     - codecov
-before_deploy:
-- python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"  
 deploy:
 - provider: pypi
   user: amundsen-dev

diff --git a/amundsen_application/static/js/components/DashboardPage/QueryListItem/CodeBlock.tsx b/amundsen_application/static/js/components/DashboardPage/QueryListItem/CodeBlock.tsx
diff --git a/amundsen_application/static/js/components/DashboardPage/QueryListItem/index.spec.tsx b/amundsen_application/static/js/components/DashboardPage/QueryListItem/index.spec.tsx
diff --git a/amundsen_application/static/js/components/DashboardPage/QueryListItem/index.tsx b/amundsen_application/static/js/components/DashboardPage/QueryListItem/index.tsx
@@ -17,7 +17,7 @@ const QUERY_LABEL = 'Query';
 const MODE_LINK_TOOLTIP_TEXT = 'View in Mode';
 const LOADING_QUERY_MESSAGE = 'Loading Query Component, please wait...';
 
-const LazyComponent = React.lazy(() => import('./CodeBlock'));
+// const LazyComponent = React.lazy(() => import('./CodeBlock'));
 
 const GoToDashboardLink = ({ url }: GoToDashboardLinkProps) => {
   const popoverHoverFocus = (
@@ -69,6 +69,11 @@ const QueryListItem = ({ name, text, url }: QueryListItemProps) => {
   const key = `key:${name}`;
 
   return (
+    <li className="list-group-item query-list-item" role="tab" id={key}>
+      <div className="title-2 truncated">{name}</div>
+    </li>
+  );
+  /* return (
     <li className="list-group-item query-list-item" role="tab" id={key}>
       <button
         className="query-list-header"
@@ -93,7 +98,7 @@ const QueryListItem = ({ name, text, url }: QueryListItemProps) => {
         </div>
       )}
     </li>
-  );
+  );*/
 };
 
 export default QueryListItem;
diff --git a/amundsen_application/static/js/components/DashboardPage/QueryListItem/styles.scss b/amundsen_application/static/js/components/DashboardPage/QueryListItem/styles.scss
@@ -49,6 +49,10 @@ $shimmer-loader-lines: 1, 2, 3, 4, 5, 6;
   }
 }
 
+.query-list-item.list-group-item {
+  padding: 16px 24px;
+}
+
 .query-list-item-name {
   margin: 0;
   line-height: $min-item-height;

diff --git a/amundsen_application/static/package.json b/amundsen_application/static/package.json
@@ -119,7 +119,6 @@
     "react": "^16.13.1",
     "react-avatar": "^2.5.1",
     "react-bootstrap": "^0.32.4",
-    "react-code-blocks": "0.0.7",
     "react-document-title": "^2.0.3",
     "react-dom": "^16.13.1",
     "react-js-pagination": "^3.0.3",

diff --git a/setup.py b/setup.py
@@ -34,7 +34,7 @@ def build_js() -> None:
 with open(requirements_path) as requirements_file:
     requirements = requirements_file.readlines()
 
-__version__ = '2.2.0'
+__version__ = '2.2.0rc3'
 
 
 setup(