Merge branch 'main' into dev

Roopan-Microsoft · Roopan-Microsoft · commit e9370c69128f · 2025-04-14T12:07:47.000+05:30
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -123,6 +123,27 @@ jobs:
                 embeddingDeploymentCapacity="30" \
                 imageTag="latest"
       
+      - name: Extract AI Services and Key Vault Names
+        if: always()
+        run: |
+          echo "Fetching AI Services and Key Vault names before deletion..."
+          
+          # Get Key Vault name
+          KEYVAULT_NAME=$(az resource list --resource-group "${{ env.RESOURCE_GROUP_NAME }}" --resource-type "Microsoft.KeyVault/vaults" --query "[].name" -o tsv)
+          echo "Detected Key Vault: $KEYVAULT_NAME"
+          echo "KEYVAULT_NAME=$KEYVAULT_NAME" >> $GITHUB_ENV
+      
+
+           # Extract AI Services names
+          echo "Fetching AI Services..."
+          AI_SERVICES=$(az resource list --resource-group '${{ env.RESOURCE_GROUP_NAME }}' --resource-type "Microsoft.CognitiveServices/accounts" --query "[].name" -o tsv)
+
+          # Flatten newline-separated values to space-separated
+          AI_SERVICES=$(echo "$AI_SERVICES" | paste -sd ' ' -)
+
+          echo "Detected AI Services: $AI_SERVICES"
+          echo "AI_SERVICES=$AI_SERVICES" >> $GITHUB_ENV
+      
       - name: Delete Bicep Deployment
         if: success()
         run: |
@@ -142,82 +163,124 @@ jobs:
 
       - name: Wait for Resource Deletion to Complete
         run: |
-          # List of resources to check based on SOLUTION_PREFIX
-          resources_to_check=(
-            "aoai-${{ env.SOLUTION_PREFIX }}"
-            "appins-${{ env.SOLUTION_PREFIX }}"
-            "db-cosmos-${{ env.SOLUTION_PREFIX }}"
-            "${{ env.SOLUTION_PREFIX }}-plan"
-            "search-${{ env.SOLUTION_PREFIX }}"
-            "webapp-${{ env.SOLUTION_PREFIX }}"
-            "worksp-${{ env.SOLUTION_PREFIX }}"
-          )
-
-          # Get the list of resources in YAML format
-          resource_list=$(az resource list --subscription ${{ secrets.AZURE_SUBSCRIPTION_ID }} --output yaml)
-          
-          # Maximum number of retries and retry intervals
+          echo "Waiting for all deployed resources (including AI Services) to be deleted..."
+      
+          # Convert AI_SERVICES space-separated string into an array
+          IFS=' ' read -r -a resources_to_check <<< "${{ env.AI_SERVICES }}"
+      
+          echo "Resources to check for deletion:"
+          printf '%s\n' "${resources_to_check[@]}"
+      
+          # Get the current resource list in YAML
+          resource_list=$(az resource list --subscription "${{ secrets.AZURE_SUBSCRIPTION_ID }}" --output yaml)
+      
+          # Set up retry logic
           max_retries=3
           retry_intervals=(30 60 120)
           retries=0
-          
+      
           while true; do
             resource_found=false
-            # Iterate through the resources to check
             for resource in "${resources_to_check[@]}"; do
-              echo "Checking resource: $resource"
+              echo "Checking if resource '$resource' still exists..."
               if echo "$resource_list" | grep -q "name: $resource"; then
-                echo "Resource '$resource' exists in the subscription."
+                echo "Resource '$resource' still exists."
                 resource_found=true
               else
-                echo "Resource '$resource' does not exist in the subscription."
+                echo "Resource '$resource' has been deleted."
               fi
             done
-
-            # If any resource exists, retry
+      
             if [ "$resource_found" = true ]; then
               retries=$((retries + 1))
               if [ "$retries" -ge "$max_retries" ]; then
-                echo "Maximum retry attempts reached. Exiting."
+                echo "Reached max retry attempts. Exiting wait loop."
                 break
               else
-                echo "Waiting for ${retry_intervals[$retries-1]} seconds before retrying..."
-                sleep ${retry_intervals[$retries-1]}
+                echo "Some resources still exist. Waiting for ${retry_intervals[$((retries-1))]} seconds..."
+                sleep "${retry_intervals[$((retries-1))]}"
+                resource_list=$(az resource list --subscription "${{ secrets.AZURE_SUBSCRIPTION_ID }}" --output yaml)
               fi
             else
-              echo "No resources found. Exiting."
+              echo "All resources have been deleted."
               break
             fi
           done
+        
 
-      - name: Purging the Resources
-        if: success()
+      - name: Wait for Soft Deletion of Key Vault and AI Services
+        if: always()
         run: |
-          set -e
-          # Purging resources based on solution prefix
-          echo "Purging resources..."
-
-          # List of resources to purge
-          resources_to_purge=(
-            "aoai-${{ env.SOLUTION_PREFIX }}"
-            "appins-${{ env.SOLUTION_PREFIX }}"
-            "db-cosmos-${{ env.SOLUTION_PREFIX }}"
-            "${{ env.SOLUTION_PREFIX }}-plan"
-            "search-${{ env.SOLUTION_PREFIX }}"
-            "webapp-${{ env.SOLUTION_PREFIX }}"
-            "worksp-${{ env.SOLUTION_PREFIX }}"
-          )
+          echo "Waiting for resources to be soft deleted..."
+      
+          # Wait for Key Vault to be soft deleted
+          if [ -n "${{ env.KEYVAULT_NAME }}" ]; then
+            while true; do
+              DELETED_VAULT=$(az keyvault show-deleted --name ${{ env.KEYVAULT_NAME }} --query "id" -o tsv 2>/dev/null || echo "")
+              if [ -n "$DELETED_VAULT" ]; then
+                echo "Key Vault soft deleted!"
+                break
+              fi
+              echo "Key Vault not yet soft deleted. Retrying in 15s..."
+              sleep 15
+            done
+          fi
+
+      
+          # Wait for AI Services to be soft deleted
+          for AI_SERVICE in ${{ env.AI_SERVICES }}; do
+            while true; do
+              DELETED_AI_SERVICE=$(az cognitiveservices account list-deleted --query "[?name=='$AI_SERVICE'].id" -o tsv 2>/dev/null || echo "")
+              if [ -n "$DELETED_AI_SERVICE" ]; then
+                echo "AI Service $AI_SERVICE is soft deleted!"
+                break
+              fi
+              echo "AI Service $AI_SERVICE not yet soft deleted. Retrying in 15s..."
+              sleep 15
+            done
+          done
+              
+        
+      - name: Purge Key Vault and AI Services
+        if: always()
+        run: |
+          echo "Purging soft deleted resources..."
           
-          for resource in "${resources_to_purge[@]}"; do
-            echo "Purging resource: $resource"
-            if ! az resource delete --ids /subscriptions/${{ secrets.AZURE_SUBSCRIPTION_ID }}/providers/Microsoft.CognitiveServices/locations/uksouth/deletedAccounts/$resource --verbose; then
-              echo "Failed to purge resource: $resource"
+          # Ensure AI_SERVICES is properly split into individual services
+          IFS=' ' read -r -a SERVICES <<< "${{ env.AI_SERVICES }}"
+
+          for AI_SERVICE in "${SERVICES[@]}"; do
+            echo "Checking location for AI Service: $AI_SERVICE"
+
+            # Fetch AI Service location
+            SERVICE_LOCATION=$(az cognitiveservices account list-deleted --query "[?name=='$AI_SERVICE'].location" -o tsv 2>/dev/null || echo "")
+
+            if [ -n "$SERVICE_LOCATION" ]; then
+              echo "Purging AI Service $AI_SERVICE in $SERVICE_LOCATION"
+              az cognitiveservices account purge --location "$SERVICE_LOCATION" --resource-group "${{ env.RESOURCE_GROUP_NAME }}" --name "$AI_SERVICE"
+            else
+              echo "Could not determine location for AI Service: $AI_SERVICE. Skipping purge."
+            fi
+          done
+
+          # --- Purge Key Vaults ---
+          echo "Starting purge for Key Vaults..."
+          IFS=' ' read -r -a VAULTS <<< "${{ env.KEYVAULT_NAME }}"
+
+          for VAULT in "${VAULTS[@]}"; do
+            echo "Checking location for Key Vault: $VAULT"
+
+            # Fetch Key Vault location
+            VAULT_LOCATION=$(az keyvault list-deleted --query "[?name=='$VAULT'].properties.location" -o tsv 2>/dev/null || echo "")
+
+            if [ -n "$VAULT_LOCATION" ]; then
+              echo "Purging Key Vault $VAULT in $VAULT_LOCATION"
+              az keyvault purge --name "$VAULT" --location "$VAULT_LOCATION"
             else
-              echo "Purged the resource: $resource"
+              echo "Could not determine location for Key Vault: $VAULT. Skipping purge."
             fi
           done
 
-          echo "Resource purging completed successfully"
 
       - name: Send Notification on Failure
         if: failure()
diff --git a/src/frontend/src/components/ChatHistory/ChatHistoryListItem.tsx b/src/frontend/src/components/ChatHistory/ChatHistoryListItem.tsx
@@ -225,8 +225,14 @@ export const ChatHistoryListItemCell: React.FC<ChatHistoryListItemCellProps> = (
       tabIndex={0}
       aria-label="chat history item"
       className={styles.itemCell}
-      onClick={() => handleSelectItem()}
-      onKeyDown={e => (e.key === 'Enter' || e.key === ' ' ? handleSelectItem() : null)}
+      onClick={() => {if (!edit) handleSelectItem()}}
+      onKeyDown={e => {
+        if (!edit && (e.key === 'Enter' || e.key === ' ')) {
+          handleSelectItem();
+        } else {
+          e.stopPropagation(); // stop from reaching here when editing
+        }
+      }}
       verticalAlign="center"
       // horizontal
       onMouseEnter={() => setIsHovered(true)}
@@ -258,7 +264,7 @@ export const ChatHistoryListItemCell: React.FC<ChatHistoryListItemCellProps> = (
                     <Stack aria-label="action button group" horizontal verticalAlign={'center'}>
                       <IconButton
                         role="button"
-                        disabled={errorRename !== undefined}
+                        disabled={errorRename !== undefined || editTitle == item.title}
                         onKeyDown={e => (e.key === ' ' || e.key === 'Enter' ? handleSaveEdit(e) : null)}
                         onClick={e => handleSaveEdit(e)}
                         aria-label="confirm new title"
@@ -311,13 +317,21 @@ export const ChatHistoryListItemCell: React.FC<ChatHistoryListItemCellProps> = (
                   disabled={isButtonDisabled}
                   onKeyDown={e => (e.key === ' ' ? toggleDeleteDialog() : null)}
                 />
-                <IconButton
+               <IconButton
                   className={styles.itemButton}
                   iconProps={{ iconName: 'Edit' }}
                   title="Edit"
-                  onClick={onEdit}
+                  onClick={(e) => {
+                    e.stopPropagation(); // Prevent triggering parent click
+                    onEdit();
+                  }}
                   disabled={isButtonDisabled}
-                  onKeyDown={e => (e.key === ' ' ? onEdit() : null)}
+                  onKeyDown={(e) => {
+                    if (e.key === ' ') {
+                      e.stopPropagation(); // Prevent triggering parent keydown
+                      onEdit();
+                    }
+                  }}
                 />
               </Stack>
             )}
diff --git a/src/frontend/src/components/ChatHistory/chatHistoryListItem.test.tsx b/src/frontend/src/components/ChatHistory/chatHistoryListItem.test.tsx
@@ -487,10 +487,6 @@ describe('ChatHistoryListItemCell', () => {
     // Simulate clicking the confirm button
     userEvent.click(screen.getByRole('button', { name: 'confirm new title' }))
 
-    // Wait for the error message to appear
-    await waitFor(() => {
-      expect(screen.getByText(/Error: Enter a new title to proceed./i)).toBeInTheDocument()
-    })
 
     // Wait for the error message to disappear after 5 seconds
     await waitFor(() => expect(screen.queryByText('Error: Enter a new title to proceed.')).not.toBeInTheDocument(), {
@@ -550,18 +546,11 @@ describe('ChatHistoryListItemCell', () => {
       await userEvent.type(inputItem, 'update Chat')
     })
 
-    userEvent.click(screen.getByRole('button', { name: 'confirm new title' }))
-
-    await waitFor(() => {
-      expect(screen.getByText(/Error: Enter a new title to proceed./i)).toBeInTheDocument()
-    })
 
     // Wait for the error to be hidden after 5 seconds
     await waitFor(() => expect(screen.queryByText('Error: could not rename item')).not.toBeInTheDocument(), {
       timeout: 6000
     })
-    const input = screen.getByLabelText('chat history item')
-    expect(input).toHaveFocus()
   }, 10000)
 
   test('shows error when trying to rename to an existing title', async () => {
