Skip to content

Commit

Permalink
clean up logs and format code
Browse files Browse the repository at this point in the history 
Signed-off-by: Kama Huang <[email protected]>
  • Loading branch information
Kama Huang committed Dec 26, 2024
1 parent 7cf2f77 commit d25422a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 74 deletions.
5 changes: 0 additions & 5 deletions public/pages/workflow_detail/workflow_inputs/processors_list.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,16 @@ export function ProcessorsList(props: ProcessorsListProps) {

useEffect(() => {
const dataSourceId = getDataSourceFromURL(location).dataSourceId;
console.log('DataSourceId:', dataSourceId);

const enabled = getDataSourceEnabled().enabled;
if (!enabled) {
console.log('MDS disabled, setting version to 2.19.0');
setVersion('2.19.0');
return;
}

if (dataSourceId) {
getEffectiveVersion(dataSourceId)
.then((ver) => {
console.log('Current version:', ver);
setVersion(ver);
})
.catch(console.error);
Expand All @@ -114,8 +111,6 @@ export function ProcessorsList(props: ProcessorsListProps) {
const getMenuItems = () => {
const isPreV219 =
semver.gte(version, '2.17.0') && semver.lt(version, '2.19.0');
console.log('Version:', version);
console.log('Is pre-2.19:', isPreV219);
const ingestProcessors = [
...(isPreV219
? [
Expand Down
72 changes: 3 additions & 69 deletions public/pages/workflows/new_workflow/new_workflow.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,30 +42,18 @@ interface NewWorkflowProps {}
export const getEffectiveVersion = async (
dataSourceId: string | undefined
): Promise<string> => {
// console.log('Checking data source enabled status...');
// const dataSourceEnabled = getDataSourceEnabled().enabled;
// console.log('Data source enabled:', dataSourceEnabled);

// // If MDS is disabled, return a default version
// if (!dataSourceEnabled) {
// console.log('MDS is disabled, returning latest version');
// return '2.19.0';
// }

try {
if (dataSourceId === undefined) {
console.log('cannot find data source');
throw new Error('Data source is required');
}

const dataSource = await getSavedObjectsClient().get<DataSourceAttributes>(
'data-source',
dataSourceId
);
// const version =
// dataSource?.attributes?.dataSourceVersion || MIN_SUPPORTED_VERSION;
// return version;
return '2.19.0';
const version =
dataSource?.attributes?.dataSourceVersion || MIN_SUPPORTED_VERSION;
return version;
} catch (error) {
console.error('Error getting version:', error);
return MIN_SUPPORTED_VERSION;
Expand All @@ -79,9 +67,7 @@ const filterPresetsByVersion = async (
console.log('Initial workflows count:', workflows.length);
// if MDS is disabled, skip the version check and assume it is version 2.19+
const dataSourceEnabled = getDataSourceEnabled().enabled;
console.log('MDS enabled:', dataSourceEnabled);
if (!dataSourceEnabled) {
console.log('MDS is disabled, returning all workflows');
return workflows;
}

Expand Down Expand Up @@ -128,9 +114,6 @@ export function NewWorkflow(props: NewWorkflowProps) {
const dispatch = useAppDispatch();
const dataSourceId = getDataSourceId();
const dataSourceEnabled = getDataSourceEnabled().enabled;

console.log('Initial render:', { dataSourceId, dataSourceEnabled });

// workflows state
const { presetWorkflows, loading } = useSelector(
(state: AppState) => state.presets
Expand Down Expand Up @@ -159,43 +142,17 @@ export function NewWorkflow(props: NewWorkflowProps) {
}
}, [dataSourceId, dataSourceEnabled]);

useEffect(() => {
console.log('State changed:', {
loading,
isVersionLoading,
presetWorkflowsLength: presetWorkflows?.length,
allWorkflowsLength: allWorkflows.length,
filteredWorkflowsLength: filteredWorkflows.length,
});
}, [
loading,
isVersionLoading,
presetWorkflows,
allWorkflows,
filteredWorkflows,
]);

// initial hook to populate all workflows
// enrich them with dynamically-generated UI flows based on use case
useEffect(() => {
const loadWorkflows = async () => {
console.log('loadWorkflows called:', {
hasPresetWorkflows: Boolean(presetWorkflows?.length),
dataSourceId,
});

if (!presetWorkflows || presetWorkflows.length === 0) {
console.log('No preset workflows, returning early');

return;
}

const dataSourceEnabled = getDataSourceEnabled().enabled;
console.log('MDS enabled:', dataSourceEnabled);

if (!dataSourceEnabled) {
console.log('MDS disabled, setting all workflows');

const enrichedWorkflows = presetWorkflows.map((presetWorkflow) =>
enrichPresetWorkflowWithUiMetadata(presetWorkflow, '2.19.0')
);
Expand All @@ -206,33 +163,16 @@ export function NewWorkflow(props: NewWorkflowProps) {
}

if (!dataSourceId) {
console.log('No datasource ID, clearing workflows and setting loading');

setAllWorkflows([]);
setFilteredWorkflows([]);
setIsVersionLoading(true);
return;
}
console.log('Starting version check');

setIsVersionLoading(true);

// const version = await getEffectiveVersion(dataSourceId);
// const enrichedWorkflows = presetWorkflows.map((presetWorkflow) =>
// enrichPresetWorkflowWithUiMetadata(presetWorkflow, version)
// );

// const versionFilteredWorkflows = await filterPresetsByVersion(
// enrichedWorkflows,
// dataSourceId
// );

// setAllWorkflows(versionFilteredWorkflows);
// setFilteredWorkflows(versionFilteredWorkflows);
// };
try {
const version = await getEffectiveVersion(dataSourceId);
console.log('Got version:', version);

const enrichedWorkflows = presetWorkflows.map((presetWorkflow) =>
enrichPresetWorkflowWithUiMetadata(presetWorkflow, version)
Expand All @@ -242,10 +182,6 @@ export function NewWorkflow(props: NewWorkflowProps) {
enrichedWorkflows,
dataSourceId
);
console.log(
'Setting filtered workflows:',
versionFilteredWorkflows.length
);

setAllWorkflows(versionFilteredWorkflows);
setFilteredWorkflows(versionFilteredWorkflows);
Expand All @@ -263,8 +199,6 @@ export function NewWorkflow(props: NewWorkflowProps) {
loadWorkflows();
}, [presetWorkflows, dataSourceId, dataSourceEnabled]);

console.log('Render - loading states:', { loading, isVersionLoading });

// When search query updated, re-filter preset list
useEffect(() => {
setFilteredWorkflows(fetchFilteredWorkflows(allWorkflows, searchQuery));
Expand Down

0 comments on commit d25422a

Please sign in to comment.