Merge branch 'main' into main

Author: shootyourbricks

apps/builder/app/builder/features/address-bar.tsx

@@ -27,34 +27,16 @@ import {
   MenuList,
 } from "@webstudio-is/design-system";
 import { CheckMarkIcon, CopyIcon, DynamicPageIcon } from "@webstudio-is/icons";
-import {
-  findParentFolderByChildId,
-  ROOT_FOLDER_ID,
-  getPagePath,
-} from "@webstudio-is/sdk";
-import { $pages, $publishedOrigin } from "~/shared/nano-states";
+import { $publishedOrigin } from "~/shared/nano-states";
 import {
   compilePathnamePattern,
   isPathnamePattern,
   matchPathnamePattern,
   tokenizePathnamePattern,
 } from "~/builder/shared/url-pattern";
-import { $selectedPage } from "~/shared/awareness";
+import { $selectedPage, $selectedPagePath } from "~/shared/awareness";
 import { $currentSystem, updateCurrentSystem } from "~/shared/system";
 
-const $selectedPagePath = computed([$selectedPage, $pages], (page, pages) => {
-  if (pages === undefined || page === undefined) {
-    return "/";
-  }
-  const parentFolder = findParentFolderByChildId(page.id, pages.folders);
-  const parentFolderId = parentFolder?.id ?? ROOT_FOLDER_ID;
-  const foldersPath = getPagePath(parentFolderId, pages);
-  return [foldersPath, page?.path ?? ""]
-    .filter(Boolean)
-    .join("/")
-    .replace(/\/+/g, "/");
-});
-
 const $selectedPageHistory = computed(
   $selectedPage,
   (page) => page?.history ?? []

apps/builder/app/builder/features/settings-panel/controls/resource-control.tsx

@@ -25,16 +25,25 @@ import {
   BindingPopover,
   type BindingVariant,
 } from "~/builder/shared/binding-popover";
-import { $props, $resources } from "~/shared/nano-states";
+import {
+  $dataSources,
+  $props,
+  $resources,
+  $variableValuesByInstanceSelector,
+} from "~/shared/nano-states";
 import { computeExpression } from "~/shared/data-variables";
 import { updateWebstudioData } from "~/shared/instance-utils";
-import { $selectedInstance } from "~/shared/awareness";
 import {
-  $selectedInstanceResourceScope,
+  $selectedInstance,
+  $selectedInstanceKeyWithRoot,
+  $selectedPage,
+} from "~/shared/awareness";
+import {
   UrlField,
   MethodField,
   Headers,
   parseResource,
+  getResourceScopeForInstance,
 } from "../resource-panel";
 import { type ControlProps, useLocalValue, VerticalLayout } from "../shared";
 import { PropertyLabel } from "../property-label";
@@ -77,6 +86,23 @@ const ResourceButton = forwardRef<
 });
 ResourceButton.displayName = "ResourceButton";
 
+const $selectedInstanceResourceScope = computed(
+  [
+    $selectedPage,
+    $selectedInstanceKeyWithRoot,
+    $variableValuesByInstanceSelector,
+    $dataSources,
+  ],
+  (page, instanceKey, variableValuesByInstanceSelector, dataSources) => {
+    return getResourceScopeForInstance({
+      page,
+      instanceKey,
+      dataSources,
+      variableValuesByInstanceSelector,
+    });
+  }
+);
+
 const ResourceForm = ({ resource }: { resource: Resource }) => {
   const { scope, aliases } = useStore($selectedInstanceResourceScope);
   const [url, setUrl] = useState(resource.url);