adding dropdown disable

Kong · Aug 29, 2022 · 1a27523 · 1a27523
1 parent e22cb13
commit 1a27523
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/packages/insomnia/src/ui/components/dropdowns/auth-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/auth-dropdown.tsx
@@ -133,8 +133,9 @@ AuthItem.displayName = DropdownItem.name;
 
 interface Props {
   authTypes?: AuthType[];
+  disabled?: boolean;
 }
-export const AuthDropdown: FC<Props> = ({ authTypes = defaultTypes }) => {
+export const AuthDropdown: FC<Props> = ({ authTypes = defaultTypes, disabled = false }) => {
   const activeRequest = useSelector(selectActiveRequest);
 
   const onClick = useCallback(async (type: AuthType) => {
@@ -189,7 +190,7 @@ export const AuthDropdown: FC<Props> = ({ authTypes = defaultTypes }) => {
   return (
     <Dropdown beside>
       <DropdownDivider>Auth Types</DropdownDivider>
-      <DropdownButton className="tall">
+      <DropdownButton className="tall" disabled={disabled}>
         {'authentication' in activeRequest ? getAuthTypeName(activeRequest.authentication.type) || 'Auth' : 'Auth'}
         <i className="fa fa-caret-down space-left" />
       </DropdownButton>

diff --git a/packages/insomnia/src/ui/components/websockets/websocket-request-pane.tsx b/packages/insomnia/src/ui/components/websockets/websocket-request-pane.tsx
@@ -78,6 +78,7 @@ interface Props {
 // TODO: @gatzjames discuss above assertion in light of request and settings drills
 export const WebSocketRequestPane: FC<Props> = ({ request, workspaceId }) => {
   const readyState = useWSReadyState(request._id);
+  const disabled = readyState === ReadyState.OPEN || readyState === ReadyState.CLOSING;
   const handleOnChange = (event: ChangeEvent<HTMLInputElement>) => {
     const url = event.currentTarget.value || '';
     if (url !== request.url) {
@@ -106,7 +107,10 @@ export const WebSocketRequestPane: FC<Props> = ({ request, workspaceId }) => {
             <button>Headers</button>
           </Tab>
           <Tab tabIndex="-1" >
-            <AuthDropdown authTypes={supportedAuthTypes} />
+            <AuthDropdown
+              authTypes={supportedAuthTypes}
+              disabled={disabled}
+            />
           </Tab>
         </TabList>
         <TabPanel className="react-tabs__tab-panel">
@@ -131,7 +135,7 @@ export const WebSocketRequestPane: FC<Props> = ({ request, workspaceId }) => {
         </TabPanel>
         <TabPanel className="react-tabs__tab-panel">
           <AuthWrapper
-            key={`${request._id}-${readyState}-auth-header`}
+            key={`${request._id}-${request.authentication.type}-auth-header`}
             disabled={readyState === ReadyState.OPEN || readyState === ReadyState.CLOSING}
           />
         </TabPanel>