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

Small refactorings of the configuration merging logic #165

Merged
merged 1 commit into from
Oct 14, 2024
Merged

Small refactorings of the configuration merging logic #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 26 additions & 21 deletions src/utilities/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,13 @@ const getArray = (value: string | string[]): string[] => {

const flatConfigOrder = (order: ConfigOrder[]): ConfigOrder[] => {

const added: string[] = [];
const flatOrder: ConfigOrder[] = [];
const total = order.length;

for (let index = total - 1; index >= 0; index --) {
const orderItem = order[index];
if (!added.includes(orderItem.item)) {
flatOrder.unshift(orderItem);
added.push(orderItem.item);
}
}
const orderMap = new Map<string, ConfigOrder>();

order.forEach((orderItem: ConfigOrder): void => {
orderMap.set(orderItem.item, orderItem);
});

const flatOrder = Array.from(orderMap.values());

return flatOrder.sort((orderItemA: ConfigOrder, orderItemB: ConfigOrder): number => {
if (!!orderItemA.bottom !== !!orderItemB.bottom) {
Expand Down Expand Up @@ -114,18 +110,21 @@ export const getConfigWithExceptions = (
) ||
(
exception.not_device &&
getArray(exception.not_device).every((device: string) => !currentDevice.includes(device))
!getArray(exception.not_device).some((device: string) => currentDevice.includes(device))
)
);
});
const lastException = filteredExceptions.length
? filteredExceptions[filteredExceptions.length -1]
: null;
const exceptionsOrder = filteredExceptions.flatMap((exception: ConfigException) => exception.order || []);
const extendsBaseConfig = filteredExceptions.every((exception: ConfigException): boolean => !!exception.extend_from_base);
const exceptionsOrder = filteredExceptions.flatMap((exception: ConfigException): ConfigOrder[] => exception.order || []);
const extendsBaseConfig = !filteredExceptions.some((exception: ConfigException): boolean => !exception.extend_from_base);
const configCommonProps: Pick<
Config,
'title' | 'sidebar_editable' | 'sidebar_mode' | 'styles'
| 'title'
| 'sidebar_editable'
| 'sidebar_mode'
| 'styles'
> = {};

const title = extendsBaseConfig
Expand All @@ -148,21 +147,27 @@ export const getConfigWithExceptions = (
if (extendsBaseConfig) {
return {
...configCommonProps,
order: flatConfigOrder([
...config.order,
...exceptionsOrder
])
order: flatConfigOrder(
[
...config.order,
...exceptionsOrder
]
)
};
}

return {
...configCommonProps,
order: flatConfigOrder(exceptionsOrder)
order: flatConfigOrder(
exceptionsOrder
)
};
}
return {
...config,
order: flatConfigOrder(config.order)
order: flatConfigOrder(
config.order
)
};
};

Expand Down
1 change: 1 addition & 0 deletions tests/06 - interactions.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ test('If sidebar_mode is set to "extended" it should keep the extended mode when

await changeToMobileViewport(page);

await page.waitForTimeout(5);
await expect(page.locator(SELECTORS.HA_SIDEBAR)).toBeVisible();
await expect(page.locator(SELECTORS.HA_SIDEBAR)).not.toHaveAttribute('narrow');

Expand Down
Loading