Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

onlyoffice connector issues #560

Merged
merged 2 commits into from
Jun 5, 2024
Merged

onlyoffice connector issues #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0693a3b
🐛 Make plugin proxy wait for full transmission (#515)
ericlinagora Jun 4, 2024
e9404c6
🔇 Removing some frontend console noise
ericlinagora Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tdrive/backend/node/src/services/applications-api/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,17 @@ export default class ApplicationsApiService extends TdriveService<undefined> {
return;
}

rep.send(response.data);
await rep.send(response.data);
} catch (err) {
logger.error(`${err}`);
rep.raw.statusCode = 500;
rep.raw.end(JSON.stringify({ error: err.message }));
}
});
logger.info("Listening at ", "/" + prefix + "/*");
logger.info("Listening at /" + prefix + "/*");
} catch (e) {
logger.error(e);
logger.info("Can't listen to ", "/" + prefix + "/*");
logger.info("Can't listen to /" + prefix + "/*");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tdrive/frontend/src/app/atoms/button/button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export const Button = (props: ButtonProps) => {
props.className
}
disabled={disabled}
{..._.omit(props, 'loading', 'children', 'className')}
{..._.omit(props, 'loading', 'children', 'className', 'icon')}
>
{props.loading && (
<>
Expand Down
6 changes: 1 addition & 5 deletions tdrive/frontend/src/app/features/global/services/feature-toggles-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ class FeatureTogglesService {
}

public setFeaturesFromCompanyPlan(plan: { features: { [key: string]: FeatureValueType } }): void {
console.debug("Setting company features");
console.debug(plan);
for (const [featureName, defaultValue] of availableFeaturesWithDefaults) {
this.setActiveFeatureName(
featureName,
Expand All @@ -72,9 +70,7 @@ class FeatureTogglesService {
}

public isActiveFeatureName(featureName: FeatureNames) {
const b = this.activeFeatureNames.includes(featureName);
console.debug(`Feature ${featureName} is ${b}`);
return b;
return this.activeFeatureNames.includes(featureName);
}

public getFeatureValue<T>(featureName: FeatureNames): T {
Expand Down
6 changes: 3 additions & 3 deletions tdrive/frontend/src/app/views/client/body/drive/browser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ export default memo(
},
})
}

}

function draggableMarkup(index: number, child: any) {
Expand All @@ -226,13 +226,13 @@ export default memo(
isMobile ? (
<DocumentRow {...commonProps} />
) : (
<Draggable id={index}>
<Draggable id={index} key={index}>
<DocumentRow {...commonProps} />
</Draggable>
)
);
}


return (
<>
Expand Down
Loading