fix: appying templates in a git repo (#952)

Author: vasilev-alex

packages/cubejs-playground/src/SchemaPage.js

@@ -1,9 +1,8 @@
 import React, { Component } from 'react';
 import * as PropTypes from 'prop-types';
 import cubejs from '@cubejs-client/core';
-import { PlusOutlined } from '@ant-design/icons';
 import {
-  Layout, Menu, Button, Tree, Tabs, Dropdown, Spin, Alert, Modal, Empty
+  Layout, Menu, Button, Tree, Tabs, Spin, Alert, Modal, Empty
 } from 'antd';
 import PrismCode from './PrismCode';
 import { playgroundAction } from './events';
@@ -173,14 +172,6 @@ class SchemaPage extends Component {
       return <TreeNode {...item} />;
     });
 
-    const menu = (
-      <Menu>
-        <Menu.Item onClick={() => this.generateSchema()}>
-          Generate Schema
-        </Menu.Item>
-      </Menu>
-    );
-
     const renderTree = () => (Object.keys(tablesSchema || {}).length > 0 ? (
       <Tree
         checkable
@@ -214,24 +205,20 @@ class SchemaPage extends Component {
       <Layout style={{ height: '100%' }}>
         <Sider
           width={300}
-          style={{
-            background: '#fff',
-            borderRight: '1px solid #eee',
-          }}
           className="schema-sidebar"
         >
           <Tabs
             activeKey={activeTab}
             onChange={(tab) => this.setState({ activeTab: tab })}
             tabBarExtraContent={(
-              <Dropdown overlay={menu} placement="bottomRight" disabled={!checkedKeys.length}>
-                <Button
-                  shape="circle"
-                  icon={<PlusOutlined />}
-                  type="primary"
-                />
-              </Dropdown>
-)}
+              <Button
+                disabled={!checkedKeys.length}
+                type="primary"
+                onClick={() => this.generateSchema()}
+              >
+                Generate Schema
+              </Button>
+            )}
           >
             <TabPane tab="Tables" key="schema">
               {schemaLoading ? <Spin style={{ width: '100%' }}/> : renderTreeOrError()}

packages/cubejs-playground/src/index.css

@@ -3,22 +3,29 @@ body {
   padding: 0;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  background: #F8F8FB;
+  background: #f8f8fb;
 }
 
 code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
-    monospace;
+  font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
 }
 
 #root {
   height: 100%;
 }
 
-.schema-sidebar, .schema-sidebar .ant-tabs, .schema-sidebar .ant-tabs-content {
+.schema-sidebar,
+.schema-sidebar .ant-tabs,
+.schema-sidebar .ant-tabs-content {
   height: 100%;
 }
 
+.schema-sidebar {
+  background: #fff;
+  border-right: 1px solid #eee;
+  padding: 0 12px;
+}
+
 .schema-sidebar .ant-tabs-tabpane {
   /* TODO: replace with flexbox */
   height: 85%;
@@ -27,4 +34,4 @@ code {
 
 .ant-popover-disabled-compatible-wrapper {
   pointer-events: none;
-}
+}

packages/cubejs-server-core/dev/PackageFetcher.js

@@ -1,5 +1,5 @@
 const fs = require('fs-extra');
-const axios = require('axios').default;
+const fetch = require('node-fetch').default;
 const decompress = require('decompress');
 const decompressTargz = require('decompress-targz');
 const path = require('path');
@@ -26,22 +26,18 @@ class PackageFetcher {
   }
 
   async manifestJSON() {
-    const response = await axios.get(
+    const response = await fetch(
       `https://api.github.com/repos/${this.repo.owner}/${this.repo.name}/contents/manifest.json`
     );
 
-    return JSON.parse(Buffer.from(response.data.content, 'base64').toString());
+    return JSON.parse(Buffer.from((await response.json()).content, 'base64').toString());
   }
 
   async downloadRepo() {
     const url = `https://github.com/${this.repo.owner}/${this.repo.name}/archive/master.tar.gz`;
     const writer = fs.createWriteStream(this.repoArchivePath);
 
-    const response = await axios.get(url, {
-      responseType: 'stream',
-    });
-
-    response.data.pipe(writer);
+    (await fetch(url)).body.pipe(writer);
 
     return new Promise((resolve, reject) => {
       writer.on('finish', resolve);

packages/cubejs-server-core/dev/utils.js

@@ -9,7 +9,7 @@ async function fileContentsRecursive(dir, rootPath, includeNodeModules) {
   if (!(await fs.pathExists(dir))) {
     return [];
   }
-  if (dir.indexOf('node_modules') !== -1 && !includeNodeModules) {
+  if ((dir.includes('node_modules') && !includeNodeModules) || dir.includes('.git')) {
     return [];
   }
 

packages/cubejs-server-core/package.json

@@ -25,7 +25,6 @@
     "@cubejs-backend/api-gateway": "^0.19.54",
     "@cubejs-backend/query-orchestrator": "^0.19.56",
     "@cubejs-backend/schema-compiler": "^0.19.57",
-    "axios": "^0.19.2",
     "codesandbox-import-utils": "^2.1.12",
     "cross-spawn": "^7.0.1",
     "decompress": "^4.2.1",

packages/cubejs-server-core/yarn.lock

@@ -1406,13 +1406,6 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
   integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
-axios@^0.19.2:
-  version "0.19.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
-  integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
-  dependencies:
-    follow-redirects "1.5.10"
-
 babel-jest@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.9.0.tgz#3fc327cb8467b89d14d7bc70e315104a783ccd54"
@@ -1938,13 +1931,6 @@ debug@3.2.6, debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
-debug@=3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
 debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
@@ -2732,13 +2718,6 @@ flatted@^2.0.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
   integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
 
-follow-redirects@1.5.10:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
-  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
-  dependencies:
-    debug "=3.1.0"
-
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"