Skip to content

fix: pass system to resources in builder #4926

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

Merged
merged 2 commits into from
Feb 27, 2025
Merged

fix: pass system to resources in builder #4926

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2770334
fix: pass system to resources in builder
TrySound Feb 27, 2025
c218ac3
Fix unused
TrySound Feb 27, 2025
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
14 changes: 5 additions & 9 deletions apps/builder/app/shared/nano-states/props.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import { uploadingFileDataToAsset } from "~/builder/shared/assets/asset-utils";
import { fetch } from "~/shared/fetch.client";
import { $selectedPage, getInstanceKey } from "../awareness";
import { computeExpression } from "../data-variables";
import { $currentSystem, $currentSystemVariableId } from "../system";
import { $currentSystem } from "../system";

export const assetBaseUrl = "/cgi/asset/";

Expand Down Expand Up @@ -168,14 +168,10 @@ const $unscopedVariableValues = computed(
* circular updates
*/
const $loaderVariableValues = computed(
[
$dataSources,
$dataSourceVariables,
$currentSystemVariableId,
$currentSystem,
],
(dataSources, dataSourceVariables, systemVariableId, system) => {
[$dataSources, $dataSourceVariables, $selectedPage, $currentSystem],
(dataSources, dataSourceVariables, selectedPage, system) => {
const values = new Map<string, unknown>();
values.set(SYSTEM_VARIABLE_ID, system);
for (const [dataSourceId, dataSource] of dataSources) {
if (dataSource.type === "variable") {
values.set(
Expand All @@ -185,7 +181,7 @@ const $loaderVariableValues = computed(
}
if (dataSource.type === "parameter") {
let value = dataSourceVariables.get(dataSourceId);
if (dataSource.id === systemVariableId) {
if (dataSource.id === selectedPage?.systemDataSourceId) {
value = system;
}
values.set(dataSourceId, value);
Expand Down
6 changes: 0 additions & 6 deletions apps/builder/app/shared/system.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ import { $selectedPage } from "./awareness";
import { $pages, $publishedOrigin } from "./nano-states";
import { serverSyncStore } from "./sync";

export const $currentSystemVariableId = computed(
$selectedPage,
// fallback to global system variable
(page) => page?.systemDataSourceId ?? SYSTEM_VARIABLE_ID
);

export const $systemDataByPage = atom(
new Map<Page["id"], Pick<System, "search" | "params">>()
);
Expand Down
Loading