fix bug with content

This commit is contained in:
Julia Gru
2023-09-06 10:08:17 +02:00
parent 92a6773978
commit ab0a5cc11b
3 changed files with 10 additions and 12 deletions

View File

@@ -169,7 +169,6 @@ class UmbStylesheetData extends UmbEntityData<StylesheetDBItem> {
}
const { content } = await requestBody;
if (!content) return { rules: [] };
const rules = [...content.matchAll(regex)].map((match) => match.groups);
return { rules };
}
@@ -180,25 +179,23 @@ class UmbStylesheetData extends UmbEntityData<StylesheetDBItem> {
throw Error('No request body');
}
const { content, rules } = requestBody;
if (!content && !rules) return { content: '' };
console.log(content);
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
//@ts-ignore
// eslint-disable-next-line no-unsafe-optional-chaining
const cleanedContent = content?.replaceAll(regex, '');
const newContent = rules?.map(
(rule) =>
`/**umb_name:${rule.name}*/
const newContent = rules
?.map(
(rule) =>
`/**umb_name:${rule.name}*/
${rule.selector} {
${rule.styles}
}
${cleanedContent}
`,
);
)
.join('');
return { content: newContent };
}

View File

@@ -84,8 +84,8 @@ const rulesHandlers = [
return res(ctx.status(200), ctx.json(response));
}),
rest.post(umbracoPath('/stylesheet/rich-text/interpolate-rules'), (req, res, ctx) => {
const requestBody = req.json() as InterpolateRichTextStylesheetRequestModel;
rest.post(umbracoPath('/stylesheet/rich-text/interpolate-rules'), async (req, res, ctx) => {
const requestBody = (await req.json()) as InterpolateRichTextStylesheetRequestModel;
if (!requestBody) return res(ctx.status(400, 'no body found'));
const response = umbStylesheetData.interpolateRules({ requestBody });
return res(ctx.status(200), ctx.json(response));

View File

@@ -54,6 +54,8 @@ export class UmbStylesheetWorkspaceContext extends UmbWorkspaceContext<UmbStyles
updateRule(unique: string, rule: RichTextRuleModelSortable) {
this.#rules.updateOne(unique, rule);
this.sendRulesGetContent();
}
setRules(rules: RichTextRuleModelSortable[]) {
@@ -92,7 +94,6 @@ export class UmbStylesheetWorkspaceContext extends UmbWorkspaceContext<UmbStyles
content: this.getData()?.content,
rules: this.getRules(),
};
const { data } = await this.repository.interpolateStylesheetRules(requestBody);
this.setContent(data?.content ?? '');
}