Merge pull request #4140 from overleaf/ae-react-share-modal

Remove Angular share modal code GitOrigin-RevId: 136b10c7b9768f2d8de13e48b16fd71947506624
overleaf · Jun 8, 2021 · 3603d29 · 3603d29
1 parent 5cbca58
commit 3603d29
Show file tree

Hide file tree

Showing 16 changed files with 13 additions and 1,997 deletions.
diff --git a/app/src/Features/Project/ProjectController.js b/app/src/Features/Project/ProjectController.js
@@ -887,10 +887,6 @@ const ProjectController = {
                 'new_navigation_ui',
                 user.alphaProgram
               ),
-              showReactShareModal: shouldDisplayFeature(
-                'new_share_modal_ui',
-                true
-              ),
               showReactDropboxModal: shouldDisplayFeature(
                 'new_dropbox_modal_ui',
                 user.betaProgram

diff --git a/app/views/project/editor.pug b/app/views/project/editor.pug
@@ -81,7 +81,6 @@ block content
 				else
 					include ./editor/header
 
-				include ./editor/share
 				!= moduleIncludes("publish:body", locals)
 
 				include ./editor/history/toolbarV2.pug

diff --git a/app/views/project/editor/header-react.pug b/app/views/project/editor/header-react.pug
@@ -1,10 +1,9 @@
-div(ng-controller=showReactShareModal ? 'ReactShareProjectModalController': 'ShareController')
-	if showReactShareModal
-		share-project-modal(
-			handle-hide="handleHide"
-			show="show"
-			is-admin="isAdmin"
-		)
+div(ng-controller="ReactShareProjectModalController")
+	share-project-modal(
+		handle-hide="handleHide"
+		show="show"
+		is-admin="isAdmin"
+	)
 
 	div(ng-controller="EditorNavigationToolbarController")
 		editor-navigation-toolbar-root(

diff --git a/app/views/project/editor/header.pug b/app/views/project/editor/header.pug
@@ -119,17 +119,16 @@ header.toolbar.toolbar-header.toolbar-with-labels(
 		a.btn.btn-full-height(
 			href
 			ng-click="openShareProjectModal(permissions.admin);"
-			ng-controller=(showReactShareModal ? 'ReactShareProjectModalController': 'ShareController')
+			ng-controller="ReactShareProjectModalController"
 		)
 			i.fa.fa-fw.fa-group
 			p.toolbar-label #{translate("share")}
 
-			if showReactShareModal
-				share-project-modal(
-					handle-hide="handleHide"
-					show="show"
-					is-admin="isAdmin"
-				)
+			share-project-modal(
+				handle-hide="handleHide"
+				show="show"
+				is-admin="isAdmin"
+			)
 		!= moduleIncludes('publish:button', locals)
 
 		if !isRestrictedTokenMember

diff --git a/app/views/project/editor/share.pug b/app/views/project/editor/share.pug
diff --git a/frontend/js/base.js b/frontend/js/base.js
@@ -35,7 +35,6 @@ const App = angular
     'ErrorCatcher',
     'localStorage',
     'sessionStorage',
-    'ngTagsInput',
     'ui.select',
   ])
   .config(function ($qProvider, $httpProvider, uiSelectConfig) {

diff --git a/frontend/js/ide.js b/frontend/js/ide.js
@@ -35,7 +35,6 @@ import SafariScrollPatcher from './ide/SafariScrollPatcher'
 import { loadServiceWorker } from './ide/pdfng/directives/serviceWorkerManager'
 import './ide/cobranding/CobrandingDataService'
 import './ide/settings/index'
-import './ide/share/index'
 import './ide/binary-files/index'
 import './ide/chat/index'
 import './ide/clone/index'
@@ -64,6 +63,7 @@ import './main/system-messages'
 import '../../modules/modules-ide.js'
 import './shared/context/controllers/root-context-controller'
 import './features/editor-navigation-toolbar/controllers/editor-navigation-toolbar-controller'
+import './features/share-project-modal/controllers/react-share-project-modal-controller'
 import getMeta from './utils/meta'
 
 App.controller(