random-mirrors/cosmos-explorer
1
0
Fork 0
mirror of https://github.com/Azure/cosmos-explorer.git synced 2025-07-15 00:14:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove dependency on previous prop of deletion id

Browse Source
This commit is contained in:
Sung-Hyun Kang 2024-06-17 13:23:22 -05:00
parent ac8dbbc0d2
commit 1ab6bf3d81
3 changed files with 20 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Common/dataAccess/readCollection.ts
View File

@ -8,7 +8,6 @@ import { handleError } from "../ErrorHandlingUtils";
export async function readCollection(databaseId: string, collectionId: string): Promise<DataModels.Collection> { export async function readCollection(databaseId: string, collectionId: string): Promise<DataModels.Collection> {
const cosmosClient = client(); const cosmosClient = client();
console.log("RUNNING HERE - readCollection");
return await readCollectionInternal(cosmosClient, databaseId, collectionId); return await readCollectionInternal(cosmosClient, databaseId, collectionId);
} }
@ -23,7 +22,6 @@ export async function readSampleCollection(): Promise<DataModels.Collection> {
return undefined; return undefined;
} }
console.log("RUNNING HERE - readSampleCollection");
return await readCollectionInternal(cosmosClient, databaseId, collectionId); return await readCollectionInternal(cosmosClient, databaseId, collectionId);
} }
@ -32,7 +30,6 @@ export async function readCollectionInternal(
databaseId: string, databaseId: string,
collectionId: string, collectionId: string,
): Promise<DataModels.Collection> { ): Promise<DataModels.Collection> {
console.log("RUNNING HERE - Read Collection Internal");
let collection: DataModels.Collection; let collection: DataModels.Collection;
const clearMessage = logConsoleProgress(`Querying container ${collectionId}`); const clearMessage = logConsoleProgress(`Querying container ${collectionId}`);
try { try {
@ -41,8 +38,7 @@ export async function readCollectionInternal(
} catch (error) { } catch (error) {
handleError(error, "ReadCollection", `Error while querying container ${collectionId}`); handleError(error, "ReadCollection", `Error while querying container ${collectionId}`);
throw error; throw error;
} finally {
clearMessage();
} }
clearMessage();
return collection; return collection;
} }

73
src/Explorer/Menus/NotificationConsole/NotificationConsoleComponent.tsx
View File

@ -265,70 +265,31 @@ export class NotificationConsoleComponent extends React.Component<
}; };
private updateConsoleData = (prevProps: NotificationConsoleComponentProps): void => { private updateConsoleData = (prevProps: NotificationConsoleComponentProps): void => {
this.setState((prevState) => { let updatedConsoleData: ConsoleData[] = [...this.state.allConsoleData];
let allConsoleData = [...prevState.allConsoleData]; let refresh = false;
let hasChanged = false;
if (!this.areConsoleDataEqual(this.props.consoleData, prevProps.consoleData)) { if (!this.areConsoleDataEqual(this.props.consoleData, prevProps.consoleData)) {
allConsoleData = [this.props.consoleData, ...allConsoleData]; updatedConsoleData = [this.props.consoleData, ...updatedConsoleData];
hasChanged = true; refresh = true;
} }
if ( if (this.props.inProgressConsoleDataIdToBeDeleted) {
this.props.inProgressConsoleDataIdToBeDeleted && const hasMatchingItem = updatedConsoleData.some(
prevProps.inProgressConsoleDataIdToBeDeleted !== this.props.inProgressConsoleDataIdToBeDeleted (data: ConsoleData) =>
) { data.type === ConsoleDataType.InProgress && data.id === this.props.inProgressConsoleDataIdToBeDeleted,
console.log("Deleting ", this.props.inProgressConsoleDataIdToBeDeleted); );
allConsoleData = allConsoleData.filter(
if (hasMatchingItem) {
updatedConsoleData = updatedConsoleData.filter(
(data: ConsoleData) => (data: ConsoleData) =>
!(data.type === ConsoleDataType.InProgress && data.id === this.props.inProgressConsoleDataIdToBeDeleted), !(data.type === ConsoleDataType.InProgress && data.id === this.props.inProgressConsoleDataIdToBeDeleted),
); );
hasChanged = true; refresh = true;
} }
}
// Only update the state if there are changes refresh && this.setState({ allConsoleData: updatedConsoleData });
if (hasChanged) {
return { allConsoleData };
} else {
return null;
}
});
}; };
// private updateConsoleData = (prevProps: NotificationConsoleComponentProps): void => {
// let allConsoleData: ConsoleData[] = [...this.state.allConsoleData];
// let updateState: boolean = false;
// if (!this.areConsoleDataEqual(this.props.consoleData, prevProps.consoleData)) {
// // this.setState({ allConsoleData: [this.props.consoleData, ...this.state.allConsoleData] });
// allConsoleData = [this.props.consoleData, ...allConsoleData];
// updateState = true;
// }
// if (
// this.props.inProgressConsoleDataIdToBeDeleted &&
// prevProps.inProgressConsoleDataIdToBeDeleted !== this.props.inProgressConsoleDataIdToBeDeleted
// ) {
// this.pendingDeletionIds.add(this.props.inProgressConsoleDataIdToBeDeleted);
// // const allConsoleData = this.state.allConsoleData.filter(
// // (data: ConsoleData) =>
// // !(data.type === ConsoleDataType.InProgress && data.id === this.props.inProgressConsoleDataIdToBeDeleted),
// // );
// // allConsoleData = allConsoleData.filter(
// // (data: ConsoleData) =>
// // !(data.type === ConsoleDataType.InProgress && data.id === this.props.inProgressConsoleDataIdToBeDeleted),
// // );
// // console.log(this.props.inProgressConsoleDataIdToBeDeleted);
// // console.log(allConsoleData);
// }
// if (this.pendingDeletionIds.size > 0) {
// allConsoleData = allConsoleData.filter((data: ConsoleData) => !this.pendingDeletionIds.has(data.id));
// this.pendingDeletionIds.clear();
// updateState = true;
// }
// updateState && this.setState({ allConsoleData });
// };
private areConsoleDataEqual = (currentData: ConsoleData, prevData: ConsoleData): boolean => { private areConsoleDataEqual = (currentData: ConsoleData, prevData: ConsoleData): boolean => {
if (!currentData || !prevData) { if (!currentData || !prevData) {
return !currentData && !prevData; return !currentData && !prevData;

6
src/hooks/useNotificationConsole.ts
View File

@ -23,10 +23,8 @@ export const useNotificationConsole: UseStore<NotificationConsoleState> = create
expandConsole: () => set((state) => ({ ...state, isExpanded: true })), expandConsole: () => set((state) => ({ ...state, isExpanded: true })),
setIsExpanded: (isExpanded) => set((state) => ({ ...state, isExpanded })), setIsExpanded: (isExpanded) => set((state) => ({ ...state, isExpanded })),
setNotificationConsoleData: (consoleData: ConsoleData) => set((state) => ({ ...state, consoleData })), setNotificationConsoleData: (consoleData: ConsoleData) => set((state) => ({ ...state, consoleData })),
setInProgressConsoleDataIdToBeDeleted: (id: string) => { setInProgressConsoleDataIdToBeDeleted: (id: string) =>
console.log("SETTING TO BE DELETED", id); set((state) => ({ ...state, inProgressConsoleDataIdToBeDeleted: id })),
set((state) => ({ ...state, inProgressConsoleDataIdToBeDeleted: id }));
},
setConsoleAnimationFinished: (consoleAnimationFinished: boolean) => setConsoleAnimationFinished: (consoleAnimationFinished: boolean) =>
set({ consoleAnimationFinished: consoleAnimationFinished }), set({ consoleAnimationFinished: consoleAnimationFinished }),
})); }));