2025-04-07 23:47:06 -07:00
|
|
|
import { useState, useEffect, useCallback } from 'react';
|
|
|
|
|
|
|
|
|
|
export interface SearchSourceConnector {
|
|
|
|
|
id: number;
|
|
|
|
|
name: string;
|
|
|
|
|
connector_type: string;
|
|
|
|
|
is_indexable: boolean;
|
|
|
|
|
last_indexed_at: string | null;
|
feat: Enhance Slack Connector Functionality
I've implemented several improvements and new features for the Slack connector,
addressing your requirements for more granular control over indexing
and data synchronization.
Key changes include:
Backend (`surfsense_backend`):
- I've updated the `SearchSourceConnector` schema for Slack to include new
configuration options:
- `slack_periodic_indexing_enabled` (boolean)
- `slack_periodic_indexing_frequency` (string: "daily", "weekly", "monthly")
- `slack_max_messages_per_channel_periodic` (integer)
- I've modified the `index_slack_messages` task:
- It now supports on-demand re-indexing of specific `target_channel_ids`.
- It allows `force_reindex_all_messages` to override `last_indexed_at`
for specified channels, using initial indexing settings or custom
date ranges (`reindex_start_date_str`, `reindex_latest_date_str`).
- It uses `slack_max_messages_per_channel_periodic` for regular
periodic updates.
- I've updated the Slack Connector Routes:
- The `/slack/{connector_id}/reindex-channels` endpoint now accepts
`channel_ids`, `force_reindex_all_messages`, `reindex_start_date`,
and `reindex_latest_date` to trigger targeted re-indexing.
- The main `/connector/{id}/index` endpoint for Slack can now accept
`force_full_reindex` to re-index all configured channels from scratch.
Frontend (`surfsense_web`):
- I've created `EditSlackConnectorConfigForm.tsx` to provide a dedicated UI
for Slack connector settings, including the new periodic indexing fields.
- I've integrated this form into the main connector editing page
(`.../connectors/[connector_id]/edit/page.tsx`).
- I've enhanced the Slack connector edit page with a "Channel Management" tab:
- UI for discovering Slack channels via `/api/v1/slack/{id}/discover-channels`.
- Allows selection of channels to be saved into
`config.slack_selected_channel_ids` when membership filter is "selected".
- UI for triggering on-demand re-indexing of selected channels via
`/api/v1/slack/{id}/reindex-channels`, with options for forcing
full re-index and specifying date ranges.
- I've updated the `useSearchSourceConnectors.ts` hook:
- I've added the `discoverSlackChannels` function.
- I've added the `reindexSlackChannels` function with parameters for
channel IDs, force flag, and date ranges.
These changes fulfill your requirements for:
1. Configurable Membership/Join Behavior (via existing `slack_membership_filter_type` and new channel selection UI).
2. Configurable Periodic Indexing (new backend schema and UI fields).
3. Granular Channel Selection (new UI for discovering and selecting channels).
4. On-Demand Re-index (new backend and UI capabilities for specific channels).
5. Initial Indexing Timestamp Range (I've verified existing backend logic and UI).
2025-05-28 09:36:25 +00:00
|
|
|
config: Record<string, any>; // This allows any keys, including new Slack fields
|
2025-04-07 23:47:06 -07:00
|
|
|
user_id?: string;
|
|
|
|
|
created_at?: string;
|
|
|
|
|
}
|
|
|
|
|
|
feat: Enhance Slack Connector Functionality
I've implemented several improvements and new features for the Slack connector,
addressing your requirements for more granular control over indexing
and data synchronization.
Key changes include:
Backend (`surfsense_backend`):
- I've updated the `SearchSourceConnector` schema for Slack to include new
configuration options:
- `slack_periodic_indexing_enabled` (boolean)
- `slack_periodic_indexing_frequency` (string: "daily", "weekly", "monthly")
- `slack_max_messages_per_channel_periodic` (integer)
- I've modified the `index_slack_messages` task:
- It now supports on-demand re-indexing of specific `target_channel_ids`.
- It allows `force_reindex_all_messages` to override `last_indexed_at`
for specified channels, using initial indexing settings or custom
date ranges (`reindex_start_date_str`, `reindex_latest_date_str`).
- It uses `slack_max_messages_per_channel_periodic` for regular
periodic updates.
- I've updated the Slack Connector Routes:
- The `/slack/{connector_id}/reindex-channels` endpoint now accepts
`channel_ids`, `force_reindex_all_messages`, `reindex_start_date`,
and `reindex_latest_date` to trigger targeted re-indexing.
- The main `/connector/{id}/index` endpoint for Slack can now accept
`force_full_reindex` to re-index all configured channels from scratch.
Frontend (`surfsense_web`):
- I've created `EditSlackConnectorConfigForm.tsx` to provide a dedicated UI
for Slack connector settings, including the new periodic indexing fields.
- I've integrated this form into the main connector editing page
(`.../connectors/[connector_id]/edit/page.tsx`).
- I've enhanced the Slack connector edit page with a "Channel Management" tab:
- UI for discovering Slack channels via `/api/v1/slack/{id}/discover-channels`.
- Allows selection of channels to be saved into
`config.slack_selected_channel_ids` when membership filter is "selected".
- UI for triggering on-demand re-indexing of selected channels via
`/api/v1/slack/{id}/reindex-channels`, with options for forcing
full re-index and specifying date ranges.
- I've updated the `useSearchSourceConnectors.ts` hook:
- I've added the `discoverSlackChannels` function.
- I've added the `reindexSlackChannels` function with parameters for
channel IDs, force flag, and date ranges.
These changes fulfill your requirements for:
1. Configurable Membership/Join Behavior (via existing `slack_membership_filter_type` and new channel selection UI).
2. Configurable Periodic Indexing (new backend schema and UI fields).
3. Granular Channel Selection (new UI for discovering and selecting channels).
4. On-Demand Re-index (new backend and UI capabilities for specific channels).
5. Initial Indexing Timestamp Range (I've verified existing backend logic and UI).
2025-05-28 09:36:25 +00:00
|
|
|
// Interface for Slack channel discovery
|
|
|
|
|
export interface SlackChannelInfo {
|
|
|
|
|
id: string;
|
|
|
|
|
name: string;
|
|
|
|
|
is_private: boolean;
|
|
|
|
|
is_member: boolean;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Interface for re-indexing request payload (though used internally)
|
|
|
|
|
interface ReindexSlackChannelsPayload {
|
|
|
|
|
channel_ids: string[];
|
|
|
|
|
force_reindex_all_messages?: boolean;
|
|
|
|
|
reindex_start_date?: string | null; // Allow null to be passed if date is empty
|
|
|
|
|
reindex_latest_date?: string | null; // Allow null to be passed if date is empty
|
|
|
|
|
}
|
|
|
|
|
|
2025-04-07 23:47:06 -07:00
|
|
|
export interface ConnectorSourceItem {
|
|
|
|
|
id: number;
|
|
|
|
|
name: string;
|
|
|
|
|
type: string;
|
|
|
|
|
sources: any[];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Hook to fetch search source connectors from the API
|
|
|
|
|
*/
|
|
|
|
|
export const useSearchSourceConnectors = () => {
|
|
|
|
|
const [connectors, setConnectors] = useState<SearchSourceConnector[]>([]);
|
|
|
|
|
const [isLoading, setIsLoading] = useState(true);
|
|
|
|
|
const [error, setError] = useState<Error | null>(null);
|
|
|
|
|
const [connectorSourceItems, setConnectorSourceItems] = useState<ConnectorSourceItem[]>([
|
|
|
|
|
{
|
|
|
|
|
id: 1,
|
|
|
|
|
name: "Crawled URL",
|
|
|
|
|
type: "CRAWLED_URL",
|
|
|
|
|
sources: [],
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
id: 2,
|
|
|
|
|
name: "File",
|
|
|
|
|
type: "FILE",
|
|
|
|
|
sources: [],
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
id: 3,
|
|
|
|
|
name: "Extension",
|
|
|
|
|
type: "EXTENSION",
|
|
|
|
|
sources: [],
|
2025-04-11 15:05:17 -07:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
id: 4,
|
|
|
|
|
name: "Youtube Video",
|
|
|
|
|
type: "YOUTUBE_VIDEO",
|
|
|
|
|
sources: [],
|
2025-04-07 23:47:06 -07:00
|
|
|
}
|
|
|
|
|
]);
|
|
|
|
|
|
|
|
|
|
useEffect(() => {
|
|
|
|
|
const fetchConnectors = async () => {
|
|
|
|
|
try {
|
|
|
|
|
setIsLoading(true);
|
|
|
|
|
const token = localStorage.getItem('surfsense_bearer_token');
|
|
|
|
|
|
|
|
|
|
if (!token) {
|
|
|
|
|
throw new Error('No authentication token found');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const response = await fetch(
|
|
|
|
|
`${process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL}/api/v1/search-source-connectors/`,
|
|
|
|
|
{
|
|
|
|
|
method: 'GET',
|
|
|
|
|
headers: {
|
|
|
|
|
'Content-Type': 'application/json',
|
|
|
|
|
'Authorization': `Bearer ${token}`
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
if (!response.ok) {
|
|
|
|
|
throw new Error(`Failed to fetch connectors: ${response.statusText}`);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const data = await response.json();
|
|
|
|
|
setConnectors(data);
|
|
|
|
|
|
|
|
|
|
// Update connector source items when connectors change
|
|
|
|
|
updateConnectorSourceItems(data);
|
|
|
|
|
} catch (err) {
|
|
|
|
|
setError(err instanceof Error ? err : new Error('An unknown error occurred'));
|
|
|
|
|
console.error('Error fetching search source connectors:', err);
|
|
|
|
|
} finally {
|
|
|
|
|
setIsLoading(false);
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
fetchConnectors();
|
|
|
|
|
}, []);
|
|
|
|
|
|
|
|
|
|
// Update connector source items when connectors change
|
|
|
|
|
const updateConnectorSourceItems = (currentConnectors: SearchSourceConnector[]) => {
|
|
|
|
|
// Start with the default hardcoded connectors
|
|
|
|
|
const defaultConnectors: ConnectorSourceItem[] = [
|
|
|
|
|
{
|
|
|
|
|
id: 1,
|
|
|
|
|
name: "Crawled URL",
|
|
|
|
|
type: "CRAWLED_URL",
|
|
|
|
|
sources: [],
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
id: 2,
|
|
|
|
|
name: "File",
|
|
|
|
|
type: "FILE",
|
|
|
|
|
sources: [],
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
id: 3,
|
|
|
|
|
name: "Extension",
|
|
|
|
|
type: "EXTENSION",
|
|
|
|
|
sources: [],
|
2025-04-11 15:05:17 -07:00
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
id: 4,
|
|
|
|
|
name: "Youtube Video",
|
|
|
|
|
type: "YOUTUBE_VIDEO",
|
|
|
|
|
sources: [],
|
2025-04-07 23:47:06 -07:00
|
|
|
}
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
// Add the API connectors
|
|
|
|
|
const apiConnectors: ConnectorSourceItem[] = currentConnectors.map((connector, index) => ({
|
|
|
|
|
id: 1000 + index, // Use a high ID to avoid conflicts with hardcoded IDs
|
|
|
|
|
name: connector.name,
|
|
|
|
|
type: connector.connector_type,
|
|
|
|
|
sources: [],
|
|
|
|
|
}));
|
|
|
|
|
|
|
|
|
|
setConnectorSourceItems([...defaultConnectors, ...apiConnectors]);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Create a new search source connector
|
|
|
|
|
*/
|
|
|
|
|
const createConnector = async (connectorData: Omit<SearchSourceConnector, 'id' | 'user_id' | 'created_at'>) => {
|
|
|
|
|
try {
|
|
|
|
|
const token = localStorage.getItem('surfsense_bearer_token');
|
|
|
|
|
|
|
|
|
|
if (!token) {
|
|
|
|
|
throw new Error('No authentication token found');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const response = await fetch(
|
|
|
|
|
`${process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL}/api/v1/search-source-connectors/`,
|
|
|
|
|
{
|
|
|
|
|
method: 'POST',
|
|
|
|
|
headers: {
|
|
|
|
|
'Content-Type': 'application/json',
|
|
|
|
|
'Authorization': `Bearer ${token}`
|
|
|
|
|
},
|
|
|
|
|
body: JSON.stringify(connectorData)
|
|
|
|
|
}
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
if (!response.ok) {
|
|
|
|
|
throw new Error(`Failed to create connector: ${response.statusText}`);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const newConnector = await response.json();
|
|
|
|
|
const updatedConnectors = [...connectors, newConnector];
|
|
|
|
|
setConnectors(updatedConnectors);
|
|
|
|
|
updateConnectorSourceItems(updatedConnectors);
|
|
|
|
|
return newConnector;
|
|
|
|
|
} catch (err) {
|
|
|
|
|
console.error('Error creating search source connector:', err);
|
|
|
|
|
throw err;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Update an existing search source connector
|
|
|
|
|
*/
|
|
|
|
|
const updateConnector = async (
|
|
|
|
|
connectorId: number,
|
|
|
|
|
connectorData: Partial<Omit<SearchSourceConnector, 'id' | 'user_id' | 'created_at'>>
|
|
|
|
|
) => {
|
|
|
|
|
try {
|
|
|
|
|
const token = localStorage.getItem('surfsense_bearer_token');
|
|
|
|
|
|
|
|
|
|
if (!token) {
|
|
|
|
|
throw new Error('No authentication token found');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const response = await fetch(
|
|
|
|
|
`${process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL}/api/v1/search-source-connectors/${connectorId}`,
|
|
|
|
|
{
|
|
|
|
|
method: 'PUT',
|
|
|
|
|
headers: {
|
|
|
|
|
'Content-Type': 'application/json',
|
|
|
|
|
'Authorization': `Bearer ${token}`
|
|
|
|
|
},
|
|
|
|
|
body: JSON.stringify(connectorData)
|
|
|
|
|
}
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
if (!response.ok) {
|
|
|
|
|
throw new Error(`Failed to update connector: ${response.statusText}`);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const updatedConnector = await response.json();
|
|
|
|
|
const updatedConnectors = connectors.map(connector =>
|
|
|
|
|
connector.id === connectorId ? updatedConnector : connector
|
|
|
|
|
);
|
|
|
|
|
setConnectors(updatedConnectors);
|
|
|
|
|
updateConnectorSourceItems(updatedConnectors);
|
|
|
|
|
return updatedConnector;
|
|
|
|
|
} catch (err) {
|
|
|
|
|
console.error('Error updating search source connector:', err);
|
|
|
|
|
throw err;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Delete a search source connector
|
|
|
|
|
*/
|
|
|
|
|
const deleteConnector = async (connectorId: number) => {
|
|
|
|
|
try {
|
|
|
|
|
const token = localStorage.getItem('surfsense_bearer_token');
|
|
|
|
|
|
|
|
|
|
if (!token) {
|
|
|
|
|
throw new Error('No authentication token found');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const response = await fetch(
|
|
|
|
|
`${process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL}/api/v1/search-source-connectors/${connectorId}`,
|
|
|
|
|
{
|
|
|
|
|
method: 'DELETE',
|
|
|
|
|
headers: {
|
|
|
|
|
'Content-Type': 'application/json',
|
|
|
|
|
'Authorization': `Bearer ${token}`
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
if (!response.ok) {
|
|
|
|
|
throw new Error(`Failed to delete connector: ${response.statusText}`);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const updatedConnectors = connectors.filter(connector => connector.id !== connectorId);
|
|
|
|
|
setConnectors(updatedConnectors);
|
|
|
|
|
updateConnectorSourceItems(updatedConnectors);
|
|
|
|
|
} catch (err) {
|
|
|
|
|
console.error('Error deleting search source connector:', err);
|
|
|
|
|
throw err;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Index content from a connector to a search space
|
|
|
|
|
*/
|
|
|
|
|
const indexConnector = async (connectorId: number, searchSpaceId: string | number) => {
|
|
|
|
|
try {
|
|
|
|
|
const token = localStorage.getItem('surfsense_bearer_token');
|
|
|
|
|
|
|
|
|
|
if (!token) {
|
|
|
|
|
throw new Error('No authentication token found');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const response = await fetch(
|
|
|
|
|
`${process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL}/api/v1/search-source-connectors/${connectorId}/index?search_space_id=${searchSpaceId}`,
|
|
|
|
|
{
|
|
|
|
|
method: 'POST',
|
|
|
|
|
headers: {
|
|
|
|
|
'Content-Type': 'application/json',
|
|
|
|
|
'Authorization': `Bearer ${token}`
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
if (!response.ok) {
|
|
|
|
|
throw new Error(`Failed to index connector content: ${response.statusText}`);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const result = await response.json();
|
|
|
|
|
|
|
|
|
|
// Update the connector's last_indexed_at timestamp
|
|
|
|
|
const updatedConnectors = connectors.map(connector =>
|
|
|
|
|
connector.id === connectorId
|
|
|
|
|
? { ...connector, last_indexed_at: new Date().toISOString() }
|
|
|
|
|
: connector
|
|
|
|
|
);
|
|
|
|
|
setConnectors(updatedConnectors);
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
} catch (err) {
|
|
|
|
|
console.error('Error indexing connector content:', err);
|
|
|
|
|
throw err;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Get connector source items - memoized to prevent unnecessary re-renders
|
|
|
|
|
*/
|
|
|
|
|
const getConnectorSourceItems = useCallback(() => {
|
|
|
|
|
return connectorSourceItems;
|
|
|
|
|
}, [connectorSourceItems]);
|
|
|
|
|
|
feat: Enhance Slack Connector Functionality
I've implemented several improvements and new features for the Slack connector,
addressing your requirements for more granular control over indexing
and data synchronization.
Key changes include:
Backend (`surfsense_backend`):
- I've updated the `SearchSourceConnector` schema for Slack to include new
configuration options:
- `slack_periodic_indexing_enabled` (boolean)
- `slack_periodic_indexing_frequency` (string: "daily", "weekly", "monthly")
- `slack_max_messages_per_channel_periodic` (integer)
- I've modified the `index_slack_messages` task:
- It now supports on-demand re-indexing of specific `target_channel_ids`.
- It allows `force_reindex_all_messages` to override `last_indexed_at`
for specified channels, using initial indexing settings or custom
date ranges (`reindex_start_date_str`, `reindex_latest_date_str`).
- It uses `slack_max_messages_per_channel_periodic` for regular
periodic updates.
- I've updated the Slack Connector Routes:
- The `/slack/{connector_id}/reindex-channels` endpoint now accepts
`channel_ids`, `force_reindex_all_messages`, `reindex_start_date`,
and `reindex_latest_date` to trigger targeted re-indexing.
- The main `/connector/{id}/index` endpoint for Slack can now accept
`force_full_reindex` to re-index all configured channels from scratch.
Frontend (`surfsense_web`):
- I've created `EditSlackConnectorConfigForm.tsx` to provide a dedicated UI
for Slack connector settings, including the new periodic indexing fields.
- I've integrated this form into the main connector editing page
(`.../connectors/[connector_id]/edit/page.tsx`).
- I've enhanced the Slack connector edit page with a "Channel Management" tab:
- UI for discovering Slack channels via `/api/v1/slack/{id}/discover-channels`.
- Allows selection of channels to be saved into
`config.slack_selected_channel_ids` when membership filter is "selected".
- UI for triggering on-demand re-indexing of selected channels via
`/api/v1/slack/{id}/reindex-channels`, with options for forcing
full re-index and specifying date ranges.
- I've updated the `useSearchSourceConnectors.ts` hook:
- I've added the `discoverSlackChannels` function.
- I've added the `reindexSlackChannels` function with parameters for
channel IDs, force flag, and date ranges.
These changes fulfill your requirements for:
1. Configurable Membership/Join Behavior (via existing `slack_membership_filter_type` and new channel selection UI).
2. Configurable Periodic Indexing (new backend schema and UI fields).
3. Granular Channel Selection (new UI for discovering and selecting channels).
4. On-Demand Re-index (new backend and UI capabilities for specific channels).
5. Initial Indexing Timestamp Range (I've verified existing backend logic and UI).
2025-05-28 09:36:25 +00:00
|
|
|
// Helper function for authenticated fetch requests
|
|
|
|
|
const fetchWithAuth = async (url: string, options: RequestInit = {}) => {
|
|
|
|
|
const token = localStorage.getItem('surfsense_bearer_token');
|
|
|
|
|
if (!token) {
|
|
|
|
|
throw new Error('No authentication token found');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const headers = {
|
|
|
|
|
'Content-Type': 'application/json',
|
|
|
|
|
'Authorization': `Bearer ${token}`,
|
|
|
|
|
...options.headers,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const response = await fetch(url, { ...options, headers });
|
|
|
|
|
|
|
|
|
|
if (!response.ok) {
|
|
|
|
|
const errorBody = await response.text(); // Try to get more error info
|
|
|
|
|
throw new Error(`API request failed: ${response.statusText} - ${errorBody}`);
|
|
|
|
|
}
|
|
|
|
|
// For 202 or 204, response.json() will fail. Handle it.
|
|
|
|
|
if (response.status === 202 || response.status === 204) {
|
|
|
|
|
return null; // Or some specific success indicator
|
|
|
|
|
}
|
|
|
|
|
return response.json();
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Discover Slack channels for a given connector
|
|
|
|
|
*/
|
|
|
|
|
const discoverSlackChannels = async (connectorId: number): Promise<SlackChannelInfo[]> => {
|
|
|
|
|
try {
|
|
|
|
|
const data = await fetchWithAuth(
|
|
|
|
|
`${process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL}/api/v1/slack/${connectorId}/discover-channels`,
|
|
|
|
|
{ method: 'GET' }
|
|
|
|
|
);
|
|
|
|
|
// The backend route for discover-channels returns { channels: SlackChannelInfo[] }
|
|
|
|
|
// So, we need to access data.channels
|
|
|
|
|
return data.channels as SlackChannelInfo[];
|
|
|
|
|
} catch (err) {
|
|
|
|
|
console.error(`Error discovering Slack channels for connector ${connectorId}:`, err);
|
|
|
|
|
throw err; // Re-throw to be handled by the caller
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Trigger re-indexing for specific Slack channels
|
|
|
|
|
*/
|
|
|
|
|
const reindexSlackChannels = async (
|
|
|
|
|
connectorId: number,
|
|
|
|
|
channelIds: string[],
|
|
|
|
|
forceReindexAllMessages?: boolean,
|
|
|
|
|
reindexStartDate?: string,
|
|
|
|
|
reindexLatestDate?: string
|
|
|
|
|
): Promise<any> => {
|
|
|
|
|
try {
|
|
|
|
|
const payload: ReindexSlackChannelsPayload = {
|
|
|
|
|
channel_ids: channelIds,
|
|
|
|
|
force_reindex_all_messages: forceReindexAllMessages,
|
|
|
|
|
reindex_start_date: reindexStartDate || null, // Ensure null if empty string
|
|
|
|
|
reindex_latest_date: reindexLatestDate || null, // Ensure null if empty string
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const result = await fetchWithAuth(
|
|
|
|
|
`${process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL}/api/v1/slack/${connectorId}/reindex-channels`,
|
|
|
|
|
{
|
|
|
|
|
method: 'POST',
|
|
|
|
|
body: JSON.stringify(payload),
|
|
|
|
|
}
|
|
|
|
|
);
|
|
|
|
|
return result; // Typically a success message or status
|
|
|
|
|
} catch (err) {
|
|
|
|
|
console.error(`Error re-indexing Slack channels for connector ${connectorId}:`, err);
|
|
|
|
|
throw err; // Re-throw to be handled by the caller
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
2025-04-07 23:47:06 -07:00
|
|
|
return {
|
|
|
|
|
connectors,
|
|
|
|
|
isLoading,
|
|
|
|
|
error,
|
|
|
|
|
createConnector,
|
|
|
|
|
updateConnector,
|
|
|
|
|
deleteConnector,
|
|
|
|
|
indexConnector,
|
|
|
|
|
getConnectorSourceItems,
|
feat: Enhance Slack Connector Functionality
I've implemented several improvements and new features for the Slack connector,
addressing your requirements for more granular control over indexing
and data synchronization.
Key changes include:
Backend (`surfsense_backend`):
- I've updated the `SearchSourceConnector` schema for Slack to include new
configuration options:
- `slack_periodic_indexing_enabled` (boolean)
- `slack_periodic_indexing_frequency` (string: "daily", "weekly", "monthly")
- `slack_max_messages_per_channel_periodic` (integer)
- I've modified the `index_slack_messages` task:
- It now supports on-demand re-indexing of specific `target_channel_ids`.
- It allows `force_reindex_all_messages` to override `last_indexed_at`
for specified channels, using initial indexing settings or custom
date ranges (`reindex_start_date_str`, `reindex_latest_date_str`).
- It uses `slack_max_messages_per_channel_periodic` for regular
periodic updates.
- I've updated the Slack Connector Routes:
- The `/slack/{connector_id}/reindex-channels` endpoint now accepts
`channel_ids`, `force_reindex_all_messages`, `reindex_start_date`,
and `reindex_latest_date` to trigger targeted re-indexing.
- The main `/connector/{id}/index` endpoint for Slack can now accept
`force_full_reindex` to re-index all configured channels from scratch.
Frontend (`surfsense_web`):
- I've created `EditSlackConnectorConfigForm.tsx` to provide a dedicated UI
for Slack connector settings, including the new periodic indexing fields.
- I've integrated this form into the main connector editing page
(`.../connectors/[connector_id]/edit/page.tsx`).
- I've enhanced the Slack connector edit page with a "Channel Management" tab:
- UI for discovering Slack channels via `/api/v1/slack/{id}/discover-channels`.
- Allows selection of channels to be saved into
`config.slack_selected_channel_ids` when membership filter is "selected".
- UI for triggering on-demand re-indexing of selected channels via
`/api/v1/slack/{id}/reindex-channels`, with options for forcing
full re-index and specifying date ranges.
- I've updated the `useSearchSourceConnectors.ts` hook:
- I've added the `discoverSlackChannels` function.
- I've added the `reindexSlackChannels` function with parameters for
channel IDs, force flag, and date ranges.
These changes fulfill your requirements for:
1. Configurable Membership/Join Behavior (via existing `slack_membership_filter_type` and new channel selection UI).
2. Configurable Periodic Indexing (new backend schema and UI fields).
3. Granular Channel Selection (new UI for discovering and selecting channels).
4. On-Demand Re-index (new backend and UI capabilities for specific channels).
5. Initial Indexing Timestamp Range (I've verified existing backend logic and UI).
2025-05-28 09:36:25 +00:00
|
|
|
connectorSourceItems,
|
|
|
|
|
discoverSlackChannels, // Export new function
|
|
|
|
|
reindexSlackChannels, // Export new function
|
2025-04-07 23:47:06 -07:00
|
|
|
};
|
feat: Enhance Slack Connector Functionality
I've implemented several improvements and new features for the Slack connector,
addressing your requirements for more granular control over indexing
and data synchronization.
Key changes include:
Backend (`surfsense_backend`):
- I've updated the `SearchSourceConnector` schema for Slack to include new
configuration options:
- `slack_periodic_indexing_enabled` (boolean)
- `slack_periodic_indexing_frequency` (string: "daily", "weekly", "monthly")
- `slack_max_messages_per_channel_periodic` (integer)
- I've modified the `index_slack_messages` task:
- It now supports on-demand re-indexing of specific `target_channel_ids`.
- It allows `force_reindex_all_messages` to override `last_indexed_at`
for specified channels, using initial indexing settings or custom
date ranges (`reindex_start_date_str`, `reindex_latest_date_str`).
- It uses `slack_max_messages_per_channel_periodic` for regular
periodic updates.
- I've updated the Slack Connector Routes:
- The `/slack/{connector_id}/reindex-channels` endpoint now accepts
`channel_ids`, `force_reindex_all_messages`, `reindex_start_date`,
and `reindex_latest_date` to trigger targeted re-indexing.
- The main `/connector/{id}/index` endpoint for Slack can now accept
`force_full_reindex` to re-index all configured channels from scratch.
Frontend (`surfsense_web`):
- I've created `EditSlackConnectorConfigForm.tsx` to provide a dedicated UI
for Slack connector settings, including the new periodic indexing fields.
- I've integrated this form into the main connector editing page
(`.../connectors/[connector_id]/edit/page.tsx`).
- I've enhanced the Slack connector edit page with a "Channel Management" tab:
- UI for discovering Slack channels via `/api/v1/slack/{id}/discover-channels`.
- Allows selection of channels to be saved into
`config.slack_selected_channel_ids` when membership filter is "selected".
- UI for triggering on-demand re-indexing of selected channels via
`/api/v1/slack/{id}/reindex-channels`, with options for forcing
full re-index and specifying date ranges.
- I've updated the `useSearchSourceConnectors.ts` hook:
- I've added the `discoverSlackChannels` function.
- I've added the `reindexSlackChannels` function with parameters for
channel IDs, force flag, and date ranges.
These changes fulfill your requirements for:
1. Configurable Membership/Join Behavior (via existing `slack_membership_filter_type` and new channel selection UI).
2. Configurable Periodic Indexing (new backend schema and UI fields).
3. Granular Channel Selection (new UI for discovering and selecting channels).
4. On-Demand Re-index (new backend and UI capabilities for specific channels).
5. Initial Indexing Timestamp Range (I've verified existing backend logic and UI).
2025-05-28 09:36:25 +00:00
|
|
|
};
|