Remove the share modal (#3846)

packages/insomnia-app/app/ui/components/dropdowns/sync-dropdown.tsx

@@ -25,7 +25,6 @@ import LoginModal from '../modals/login-modal';
 import SyncBranchesModal from '../modals/sync-branches-modal';
 import SyncDeleteModal from '../modals/sync-delete-modal';
 import SyncHistoryModal from '../modals/sync-history-modal';
-import SyncShareModal from '../modals/sync-share-modal';
 import SyncStagingModal from '../modals/sync-staging-modal';
 import Tooltip from '../tooltip';
 
@@ -196,10 +195,6 @@ class SyncDropdown extends PureComponent<Props, State> {
     });
   }
 
-  static _handleShowSharingModal() {
-    showModal(SyncShareModal);
-  }
-
   static _handleShowLoginModal() {
     showModal(LoginModal);
   }
@@ -523,11 +518,6 @@ class SyncDropdown extends PureComponent<Props, State> {
             </DropdownItem>
           )}
 
-          <DropdownItem onClick={SyncDropdown._handleShowSharingModal}>
-            <i className="fa fa-users" />
-            Share Settings
-          </DropdownItem>
-
           <DropdownItem onClick={this._handleShowBranchesModal}>
             <i className="fa fa-code-fork" />
             Branches

packages/insomnia-app/app/ui/components/modals/sync-share-modal.tsx

@@ -1,186 +0,0 @@
-import { autoBindMethodsForReact } from 'class-autobind-decorator';
-import React, { PureComponent } from 'react';
-
-import { AUTOBIND_CFG } from '../../../common/constants';
-import { strings } from '../../../common/strings';
-import type { Workspace } from '../../../models/workspace';
-import { VCS } from '../../../sync/vcs/vcs';
-import { Dropdown, DropdownButton, DropdownDivider, DropdownItem } from '../base/dropdown';
-import Link from '../base/link';
-import Modal from '../base/modal';
-import ModalBody from '../base/modal-body';
-import ModalHeader from '../base/modal-header';
-import PromptButton from '../base/prompt-button';
-import { showModal } from './index';
-
-interface Props {
-  workspace: Workspace;
-  vcs: VCS;
-}
-
-interface Team {
-  id: string;
-  name: string;
-}
-
-interface State {
-  loading: boolean;
-  selectedTeam: null | Team;
-  teams: Team[];
-  error: string;
-}
-
-@autoBindMethodsForReact(AUTOBIND_CFG)
-class SyncShareModal extends PureComponent<Props, State> {
-  modal: Modal | null = null;
-
-  state: State = {
-    selectedTeam: null,
-    teams: [],
-    error: '',
-    loading: false,
-  }
-
-  _setModalRef(n: Modal) {
-    this.modal = n;
-  }
-
-  async _handleChangeTeam(team: Team) {
-    const { vcs } = this.props;
-    this.setState({
-      loading: true,
-    });
-
-    try {
-      if (team) {
-        await vcs.shareWithTeam(team.id);
-      } else {
-        await vcs.unShareWithTeam();
-      }
-    } catch (err) {
-      this.setState({
-        error: err.message,
-        loading: false,
-      });
-    }
-
-    this.setState({
-      selectedTeam: team,
-      error: '',
-      loading: false,
-    });
-  }
-
-  async show() {
-    const { vcs } = this.props;
-    this.setState({
-      loading: true,
-    });
-    this.modal && this.modal.show();
-
-    if (!vcs.hasProject()) {
-      this.setState({
-        error: `Please set up sync to be able to share the ${strings.collection.singular.toLowerCase()}`,
-        loading: false,
-      });
-      return;
-    }
-
-    let results;
-
-    try {
-      results = await Promise.all([vcs.teams(), vcs.projectTeams()]);
-    } catch (err) {
-      this.setState({
-        error: err.message,
-        loading: false,
-      });
-      return;
-    }
-
-    const [teams, projectTeams] = results;
-    this.setState({
-      teams,
-      selectedTeam: projectTeams[0] || null,
-      error: '',
-      loading: false,
-    });
-  }
-
-  hide() {
-    this.modal && this.modal.hide();
-  }
-
-  render() {
-    const { teams, error, selectedTeam, loading } = this.state;
-    const { workspace } = this.props;
-    return (
-      <Modal ref={this._setModalRef}>
-        <ModalHeader key="header">Share {strings.collection.singular}</ModalHeader>
-        <ModalBody key="body" className="pad text-center" noScroll>
-          {error && <p className="notice error margin-bottom-sm no-margin-top">{error}</p>}
-          <p>
-            Collaborate on <strong>{workspace.name}</strong> with your team.
-          </p>
-          <div className="form-control pad">
-            <Dropdown outline>
-              <DropdownDivider>Teams</DropdownDivider>
-              {selectedTeam ? (
-                <DropdownButton className="btn btn--clicky" disabled={loading}>
-                  {loading ? (
-                    <i className="fa fa-refresh fa-spin" />
-                  ) : (
-                    <i className="fa fa-users" />
-                  )}{' '}
-                  Shared with <strong>{selectedTeam.name}</strong>{' '}
-                  <i className="fa fa-caret-down" />
-                </DropdownButton>
-              ) : (
-
-                <DropdownButton className="btn btn--clicky" disabled={loading}>
-                  {loading ? (
-                    <i className="fa fa-refresh fa-spin" />
-                  ) : (
-                    <i className="fa fa-users" />
-                  )}{' '}
-                  Private <i className="fa fa-caret-down" />
-                </DropdownButton>
-              )}
-              {teams.map(team => (
-                <DropdownItem key={team.id} value={team} onClick={this._handleChangeTeam}>
-                  <i className="fa fa-users" /> Share with <strong>{team.name}</strong>
-                </DropdownItem>
-              ))}
-              {teams.length === 0 && (
-              // @ts-expect-error -- TSCONVERSION
-                <DropdownItem disabled>
-                  <i className="fa fa-warning" /> You have no teams
-                </DropdownItem>
-              )}
-              <DropdownDivider>Other</DropdownDivider>
-              <DropdownItem
-                addIcon
-                buttonClass={PromptButton}
-                // @ts-expect-error -- TSCONVERSION
-                confirmMessage="Really make private?"
-                value={null}
-                onClick={this._handleChangeTeam}>
-                <i className="fa fa-lock" /> Private
-              </DropdownItem>
-            </Dropdown>
-            &nbsp;&nbsp;
-            <Link
-              button
-              className="btn btn--super-compact inline-block"
-              href="https://app.insomnia.rest/app/teams/">
-              Manage Teams
-            </Link>
-          </div>
-        </ModalBody>
-      </Modal>
-    );
-  }
-}
-
-export const showSyncShareModal = () => showModal(SyncShareModal);
-export default SyncShareModal;

packages/insomnia-app/app/ui/components/wrapper-debug.tsx

@@ -1,5 +1,4 @@
 import { autoBindMethodsForReact } from 'class-autobind-decorator';
-import { Button } from 'insomnia-components';
 import React, { Fragment, PureComponent, ReactNode } from 'react';
 
 import { AUTOBIND_CFG, GlobalActivity, SortOrder } from '../../common/constants';
@@ -10,7 +9,6 @@ import { isCollection, isDesign } from '../../models/workspace';
 import EnvironmentsDropdown from './dropdowns/environments-dropdown';
 import SyncDropdown from './dropdowns/sync-dropdown';
 import ErrorBoundary from './error-boundary';
-import { showSyncShareModal } from './modals/sync-share-modal';
 import PageLayout from './page-layout';
 import GrpcRequestPane from './panes/grpc-request-pane';
 import GrpcResponsePane from './panes/grpc-response-pane';
@@ -66,14 +64,9 @@ class WrapperDebug extends PureComponent<Props> {
     const collection = isCollection(activeWorkspace);
     const design = isDesign(activeWorkspace);
 
-    let share: ReactNode = null;
     let insomniaSync: ReactNode = null;
 
     if (isLoggedIn && collection && activeSpace?.remoteId && vcs) {
-      share = <Button variant="contained" onClick={showSyncShareModal}>
-        <i className="fa fa-globe pad-right-sm" /> Share
-      </Button>;
-
       insomniaSync = <SyncDropdown
         workspace={activeWorkspace}
         workspaceMeta={activeWorkspaceMeta}
@@ -89,12 +82,7 @@ class WrapperDebug extends PureComponent<Props> {
       <WorkspacePageHeader
         wrapperProps={wrapperProps}
         handleActivityChange={handleActivityChange}
-        gridRight={
-          <>
-            {share}
-            {sync && <span className="margin-left">{sync}</span>}
-          </>
-        }
+        gridRight={sync}
       />
     );
   }

packages/insomnia-app/app/ui/components/wrapper.tsx

@@ -74,7 +74,6 @@ import SyncBranchesModal from './modals/sync-branches-modal';
 import SyncDeleteModal from './modals/sync-delete-modal';
 import SyncHistoryModal from './modals/sync-history-modal';
 import SyncMergeModal from './modals/sync-merge-modal';
-import SyncShareModal from './modals/sync-share-modal';
 import SyncStagingModal from './modals/sync-staging-modal';
 import WorkspaceEnvironmentsEditModal from './modals/workspace-environments-edit-modal';
 import WorkspaceSettingsModal from './modals/workspace-settings-modal';
@@ -708,7 +707,6 @@ class Wrapper extends PureComponent<WrapperProps, State> {
                 />
                 <SyncDeleteModal ref={registerModal} workspace={activeWorkspace} vcs={vcs} />
                 <SyncHistoryModal ref={registerModal} workspace={activeWorkspace} vcs={vcs} />
-                <SyncShareModal ref={registerModal} workspace={activeWorkspace} vcs={vcs} />
               </Fragment>
             ) : null}