Remove angular-toastr and flash service

Remove old toast notifications UI and dependencies as these are no
longer used.

gulpfile.js

@@ -158,7 +158,6 @@ const cssBundles = [
   './src/styles/vendor/angular-csp.css',
   './src/styles/vendor/icomoon.css',
   './node_modules/katex/dist/katex.min.css',
-  './node_modules/angular-toastr/dist/angular-toastr.css',
 ];
 
 gulp.task('build-css', function () {

package.json

@@ -14,7 +14,6 @@
     "@sentry/browser": "^5.6.2",
     "angular": "^1.7.5",
     "angular-mocks": "^1.7.5",
-    "angular-toastr": "^2.1.1",
     "autoprefixer": "^9.4.7",
     "aws-sdk": "^2.345.0",
     "axe-core": "^3.4.1",

scripts/gulp/vendor-bundles.js

@@ -9,7 +9,7 @@
 module.exports = {
   bundles: {
     jquery: ['jquery'],
-    angular: ['angular', 'angular-toastr'],
+    angular: ['angular'],
     katex: ['katex'],
     sentry: ['@sentry/browser'],
     showdown: ['showdown'],

src/boot/boot.js

@@ -120,7 +120,6 @@ function bootSidebarApp(doc, config) {
     'scripts/sidebar.bundle.js',
 
     'styles/angular-csp.css',
-    'styles/angular-toastr.css',
     'styles/katex.min.css',
     'styles/sidebar.css',
   ]);

src/boot/test/boot-test.js

@@ -47,7 +47,6 @@ describe('bootstrap', function () {
       'scripts/sidebar.bundle.js',
 
       'styles/angular-csp.css',
-      'styles/angular-toastr.css',
       'styles/katex.min.css',
       'styles/sidebar.css',
     ];
@@ -153,7 +152,6 @@ describe('bootstrap', function () {
         'scripts/showdown.bundle.1234.js',
         'scripts/sidebar.bundle.1234.js',
         'styles/angular-csp.1234.css',
-        'styles/angular-toastr.1234.css',
         'styles/katex.min.1234.css',
         'styles/sidebar.1234.css',
       ].map(assetUrl);

src/sidebar/index.js

@@ -34,10 +34,6 @@ disableOpenerForExternalLinks(document.body);
 
 import angular from 'angular';
 
-// Angular addons which export the Angular module name via `module.exports`.
-
-import angularToastr from 'angular-toastr';
-
 // Load polyfill for :focus-visible pseudo-class.
 import 'focus-visible';
 
@@ -60,13 +56,6 @@ const isSidebar = !(
 // Install Preact renderer options to work around IE11 quirks
 rendererOptions.setupIE11Fixes();
 
-// @ngInject
-function configureToastr(toastrConfig) {
-  angular.extend(toastrConfig, {
-    preventOpenDuplicates: true,
-  });
-}
-
 // @ngInject
 function setupApi(api, streamer) {
   api.setClientId(streamer.clientId);
@@ -152,7 +141,6 @@ import apiRoutesService from './services/api-routes';
 import authService from './services/oauth-auth';
 import autosaveService from './services/autosave';
 import featuresService from './services/features';
-import flashService from './services/flash';
 import frameSyncService from './services/frame-sync';
 import groupsService from './services/groups';
 import loadAnnotationsService from './services/load-annotations';
@@ -196,7 +184,6 @@ function startAngularApp(config) {
     .register('autosaveService', autosaveService)
     .register('bridge', bridgeService)
     .register('features', featuresService)
-    .register('flash', flashService)
     .register('frameSync', frameSyncService)
     .register('groups', groupsService)
     .register('loadAnnotationsService', loadAnnotationsService)
@@ -229,10 +216,8 @@ function startAngularApp(config) {
   // constructed them.
   //
   // @ngInject
-  function registerAngularServices($rootScope, toastr) {
-    container
-      .register('toastr', { value: toastr })
-      .register('$rootScope', { value: $rootScope });
+  function registerAngularServices($rootScope) {
+    container.register('$rootScope', { value: $rootScope });
   }
 
   // Run initialization logic that uses constructed services.
@@ -250,7 +235,7 @@ function startAngularApp(config) {
   const wrapComponent = component => wrapReactComponent(component, container);
 
   angular
-    .module('h', [angularToastr])
+    .module('h', [])
 
     // The root component for the application
     .component('hypothesisApp', hypothesisApp)
@@ -285,7 +270,6 @@ function startAngularApp(config) {
     .service('auth', () => container.get('auth'))
     .service('bridge', () => container.get('bridge'))
     .service('features', () => container.get('features'))
-    .service('flash', () => container.get('flash'))
     .service('frameSync', () => container.get('frameSync'))
     .service('groups', () => container.get('groups'))
     .service('loadAnnotationsService', () =>
@@ -306,8 +290,6 @@ function startAngularApp(config) {
     .value('isSidebar', container.get('isSidebar'))
     .value('settings', container.get('settings'))
 
-    .config(configureToastr)
-
     // Make Angular built-ins available to services constructed by `container`.
     .run(registerAngularServices)
     .run(initServices);

src/sidebar/services/flash.js

-/**
- * A service for displaying "flash" notification messages.
- */
-
-// @ngInject
-export default function flash(toastr) {
-  return {
-    info: toastr.info.bind(toastr),
-    success: toastr.success.bind(toastr),
-    warning: toastr.warning.bind(toastr),
-    error: toastr.error.bind(toastr),
-  };
-}

src/sidebar/services/test/flash-test.js

-import flash from '../flash';
-
-describe('sidebar.flash', () => {
-  ['info', 'success', 'warning', 'error'].forEach(method => {
-    describe(`#${method}`, () => {
-      it(`calls toastr's "${method}" method`, () => {
-        const fakeToastr = {
-          info: sinon.stub(),
-          success: sinon.stub(),
-          warning: sinon.stub(),
-          error: sinon.stub(),
-        };
-
-        const svc = flash(fakeToastr);
-        svc[method]('message', 'title');
-
-        assert.calledWith(fakeToastr[method], 'message', 'title');
-      });
-    });
-  });
-});

yarn.lock

@@ -1154,11 +1154,6 @@ angular-mocks@^1.7.5:
   resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.7.9.tgz#0a3b7e28b9a493b4e3010ed2b0f69a68e9b4f79b"
   integrity sha512-LQRqqiV3sZ7NTHBnNmLT0bXtE5e81t97+hkJ56oU0k3dqKv1s6F+nBWRlOVzqHWPGFOiPS8ZJVdrS8DFzHyNIA==
 
-angular-toastr@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/angular-toastr/-/angular-toastr-2.1.1.tgz#9f8350ca482145a44d011a755b8fb3623d60544c"
-  integrity sha1-n4NQykghRaRNARp1W4+zYj1gVEw=
-
 angular@^1.7.5:
   version "1.7.9"
   resolved "https://registry.yarnpkg.com/angular/-/angular-1.7.9.tgz#e52616e8701c17724c3c238cfe4f9446fd570bc4"