diff --git a/client/.babelrc b/client/.babelrc index 4de7bd4792..0fe25a043c 100644 --- a/client/.babelrc +++ b/client/.babelrc @@ -10,7 +10,6 @@ "@babel/preset-react" ], "plugins": [ - "angularjs-annotate", "@babel/plugin-proposal-class-properties", "@babel/plugin-transform-object-assign", ["babel-plugin-transform-builtin-extend", { diff --git a/client/app/components/FavoritesControl.jsx b/client/app/components/FavoritesControl.jsx index 59d9861ff8..2dff129a57 100644 --- a/client/app/components/FavoritesControl.jsx +++ b/client/app/components/FavoritesControl.jsx @@ -1,6 +1,5 @@ import React from "react"; import PropTypes from "prop-types"; -import { $rootScope } from "@/services/ng"; export default class FavoritesControl extends React.Component { static propTypes = { @@ -21,7 +20,6 @@ export default class FavoritesControl extends React.Component { action().then(() => { item.is_favorite = !savedIsFavorite; this.forceUpdate(); - $rootScope.$broadcast("reloadFavorites"); callback(); }); } diff --git a/client/app/components/queries/ApiKeyDialog/index.jsx b/client/app/components/queries/ApiKeyDialog/index.jsx index 96641a7051..2d52056ba8 100644 --- a/client/app/components/queries/ApiKeyDialog/index.jsx +++ b/client/app/components/queries/ApiKeyDialog/index.jsx @@ -6,7 +6,7 @@ import Input from "antd/lib/input"; import Button from "antd/lib/button"; import { wrap as wrapDialog, DialogPropType } from "@/components/DialogWrapper"; import CodeBlock from "@/components/CodeBlock"; -import { $http } from "@/services/ng"; +import { axios } from "@/services/axios"; import { clientConfig } from "@/services/auth"; import notification from "@/services/notification"; @@ -18,13 +18,13 @@ function ApiKeyDialog({ dialog, ...props }) { const regenerateQueryApiKey = useCallback(() => { setUpdatingApiKey(true); - $http + axios .post(`api/queries/${query.id}/regenerate_api_key`) - .success(data => { + .then(data => { setUpdatingApiKey(false); setQuery(extend(query.clone(), { api_key: data.api_key })); }) - .error(() => { + .catch(() => { setUpdatingApiKey(false); notification.error("Failed to update API key"); }); diff --git a/client/app/config/index.js b/client/app/config/index.js index dbc029bed8..6b8efdd4de 100644 --- a/client/app/config/index.js +++ b/client/app/config/index.js @@ -5,17 +5,13 @@ import "core-js/fn/typed/array-buffer"; import "@/assets/images/avatar.svg"; import * as Pace from "pace-progress"; -import angular from "angular"; -import ngRoute from "angular-route"; import { isFunction } from "lodash"; -import DialogWrapper from "@/components/DialogWrapper"; - import "./antd-spinner"; import moment from "moment"; Pace.options.shouldHandlePushState = (prevUrl, newUrl) => { - const link = document.createElement('a'); + const link = document.createElement("a"); // Show pace progress bar only if URL path changed; when query params // or hash changed - ignore that history event link.href = prevUrl; @@ -43,10 +39,6 @@ moment.updateLocale("en", { }, }); -const requirements = [ngRoute]; - -const ngModule = angular.module("app", requirements); - function registerAll(context) { const modules = context .keys() @@ -56,7 +48,7 @@ function registerAll(context) { return modules .filter(isFunction) .filter(f => f.init) - .map(f => f(ngModule)); + .map(f => f()); } function requireImages() { @@ -70,23 +62,11 @@ function registerExtensions() { registerAll(context); } -function registerServices() { - const context = require.context("@/services", true, /^((?![\\/.]test[\\./]).)*\.js$/); - registerAll(context); -} - function registerVisualizations() { const context = require.context("@/visualizations", true, /^((?![\\/.]test[\\./]).)*\.jsx?$/); registerAll(context); } requireImages(); -registerServices(); registerExtensions(); registerVisualizations(); - -ngModule.run($q => { - DialogWrapper.Promise = $q; -}); - -export default ngModule; diff --git a/client/app/index.html b/client/app/index.html index ccfa9c8b90..76570dc26e 100644 --- a/client/app/index.html +++ b/client/app/index.html @@ -14,7 +14,6 @@
-