fix: merge conflicts and compilation errors

Author: raghavyuva

api/api/versions.json

@@ -3,7 +3,7 @@
     {
       "version": "v1",
       "status": "active",
-      "release_date": "2025-12-06T16:23:50.657646+05:30",
+      "release_date": "2025-12-06T19:40:52.670434+05:30",
       "end_of_life": "0001-01-01T00:00:00Z",
       "changes": [
         "Initial API version"

api/doc/openapi.json

@@ -68,41 +68,6 @@ func (c *GithubConnectorService) UpdateGithubConnectorRequest(InstallationID str
 		}
 	}
 
-	var connectorToUpdate *shared_types.GithubConnector
-
-	// If ConnectorID is provided, find and update that specific connector
-	if ConnectorID != "" {
-		// Validate UUID format
-		if _, err := uuid.Parse(ConnectorID); err != nil {
-			return fmt.Errorf("invalid connector_id format: %v", err)
-		}
-
-		// Find the connector with matching ID
-		for i := range connectors {
-			if connectors[i].ID.String() == ConnectorID {
-				connectorToUpdate = &connectors[i]
-				break
-			}
-		}
-
-		if connectorToUpdate == nil {
-			return fmt.Errorf("connector with id %s not found", ConnectorID)
-		}
-	} else {
-		// Find connector without installation_id (newly created connector)
-		for i := range connectors {
-			if connectors[i].InstallationID == "" || strings.TrimSpace(connectors[i].InstallationID) == "" {
-				connectorToUpdate = &connectors[i]
-				break
-			}
-		}
-
-		// If no connector without installation_id found, use first connector
-		if connectorToUpdate == nil {
-			connectorToUpdate = &connectors[0]
-		}
-	}
-
 	err = c.storage.UpdateConnector(connectorToUpdate.ID.String(), InstallationID)
 	if err != nil {
 		return err

api/internal/features/github-connector/service/update_connector.go

@@ -45,7 +45,6 @@ const ConnectorItem: React.FC<ConnectorItemProps> = ({
 
   const handleDelete = (e: React.MouseEvent) => {
     e.stopPropagation();
-  const handleDelete = () => {
     setShowDeleteDialog(true);
   };
 
@@ -96,26 +95,6 @@ const ConnectorItem: React.FC<ConnectorItemProps> = ({
           </div>
         </div>
         <div className="flex items-center gap-2 shrink-0" onClick={(e) => e.stopPropagation()}>
-        <div className="flex items-center gap-2 shrink-0">
-          {!isActive && (
-            <Button
-              variant="outline"
-              size="sm"
-              onClick={() => onSetActive(connector.id)}
-              disabled={isDeleting || isUpdating}
-            >
-              {t('selfHost.connectorSettings.actions.switch.label' as any)}
-            </Button>
-          )}
-          <Button
-            variant="outline"
-            size="sm"
-            onClick={() => onReset(connector.id)}
-            disabled={isDeleting || isUpdating}
-            title={t('selfHost.connectorSettings.actions.reset.label' as any)}
-          >
-            <RefreshCw size={16} />
-          </Button>
           <Button
             variant="destructive"
             size="sm"
@@ -132,10 +111,9 @@ const ConnectorItem: React.FC<ConnectorItemProps> = ({
         open={showDeleteDialog}
         onOpenChange={setShowDeleteDialog}
         title={t('selfHost.connectorSettings.actions.delete.dialog.title' as any)}
-        description={t('selfHost.connectorSettings.actions.delete.dialog.description' as any).replace(
-          '{name}',
-          connector.name || connector.slug
-        )}
+        description={t(
+          'selfHost.connectorSettings.actions.delete.dialog.description' as any
+        ).replace('{name}', connector.name || connector.slug)}
         onConfirm={confirmDelete}
         confirmText={
           isDeleting
@@ -237,6 +215,7 @@ const GitHubConnectorSettingsModal: React.FC<GitHubConnectorSettingsModalProps>
                   isActive={connector.id === activeConnectorId}
                   onSetActive={handleSetActiveConnector}
                   onDelete={handleDeleteConnector}
+                  onReset={handleResetConnector}
                   isDeleting={isDeleting === connector.id}
                   isUpdating={isUpdating === connector.id}
                 />
@@ -302,4 +281,3 @@ const GitHubConnectorSettingsModal: React.FC<GitHubConnectorSettingsModalProps>
 };
 
 export default GitHubConnectorSettingsModal;
-