Clean code

This commit is contained in:
martmull
2024-02-05 14:56:54 +01:00
parent 893cc46ba2
commit 887f002b6e
5 changed files with 16 additions and 10 deletions
@@ -30,7 +30,6 @@ export const PageChangeEffect = () => {
const [previousLocation, setPreviousLocation] = useState('');
const onboardingStatus = useOnboardingStatus();
console.log('onboardingStatus', onboardingStatus);
const setHotkeyScope = useSetHotkeyScope();
@@ -42,9 +42,11 @@ export const getOnboardingStatus = ({
if (!currentWorkspace?.displayName) {
return OnboardingStatus.OngoingWorkspaceCreation;
}
if (!currentWorkspaceMember) {
return undefined;
}
if (
!currentWorkspaceMember.name.firstName ||
!currentWorkspaceMember.name.lastName
+1 -1
View File
@@ -1,4 +1,4 @@
/* eslint-disable no-console */
export const logDebug = (message: any, ...optionalParams: any[]) => {
console.log(message, optionalParams);
console.debug(message, optionalParams);
};
@@ -45,7 +45,6 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {
if (!workspace) {
throw new UnauthorizedException();
}
if (payload.jti) {
const dataSourceMetadata =
await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
@@ -21,17 +21,23 @@ export class UserService extends TypeOrmQueryService<User> {
}
async loadWorkspaceMember(user: User) {
let dataSourceMetadata;
const dataSourcesMetadata =
await this.dataSourceService.getDataSourcesMetadataFromWorkspaceId(
user.defaultWorkspace.id,
);
try {
dataSourceMetadata =
await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
user.defaultWorkspace.id,
);
} catch (e) {
if (!dataSourcesMetadata.length) {
return;
}
if (dataSourcesMetadata.length > 1) {
throw new Error(
`user '${user.id}' default workspace '${user.defaultWorkspace.id}' has multiple data source metadata`,
);
}
const dataSourceMetadata = dataSourcesMetadata[0];
const workspaceDataSource =
await this.typeORMService.connectToDataSource(dataSourceMetadata);