@stoplight/elements-dev-portal 1.6.14 → 1.6.17

package/components/NodeContent/NodeContent.d.ts

@@ -12,3 +12,7 @@ export declare type NodeContentProps = {
     refResolver?: ReferenceResolver;
 };
 export declare const NodeContent: ({ node, Link, hideTryIt, hideTryItPanel, hideMocking, hideExport, tryItCredentialsPolicy, tryItCorsProxy, refResolver, }: NodeContentProps) => JSX.Element;
+export declare const getNodeUriParts: (uri: string) => {
+    fileUri: string;
+    pointer: string;
+};

package/consts.d.ts

@@ -16,10 +16,12 @@ export declare const devPortalCacheKeys: {
     search: () => string[];
     searchNodes: (filters: {
         projectIds?: string[];
+        branchSlug?: string;
         workspaceId?: string;
         search?: string;
     }) => (string | {
         projectIds?: string[] | undefined;
+        branchSlug?: string | undefined;
         workspaceId?: string | undefined;
         search?: string | undefined;
     })[];

package/hooks/useGetNodes.d.ts

@@ -1,6 +1,7 @@
-export declare function useGetNodes({ search, workspaceId, projectIds, pause, }: {
+export declare function useGetNodes({ search, workspaceId, projectIds, branch, pause, }: {
     search: string;
     workspaceId?: string;
     projectIds?: string[];
+    branch?: string;
     pause?: boolean;
 }): import("react-query").UseQueryResult<import("..").NodeSearchResult[], unknown>;

package/index.esm.js

@@ -66,7 +66,15 @@ const LinkComponent = ({ children, href }) => {
     }
     if (href && ctx) {
         const [node, Link] = ctx;
-        const resolvedUri = resolve(dirname(node.uri), href);
+        const { fileUri } = getNodeUriParts(node.uri);
+        const { fileUri: hrefFileUri } = getNodeUriParts(href);
+        let resolvedUri;
+        if (hrefFileUri) {
+            resolvedUri = resolve(dirname(fileUri), href);
+        }
+        else {
+            resolvedUri = resolve(fileUri, href);
+        }
         const [resolvedUriWithoutAnchor, hash] = resolvedUri.split('#');
         const decodedUrl = decodeURIComponent(href);
         const decodedResolvedUriWithoutAnchor = decodeURIComponent(resolvedUriWithoutAnchor);
@@ -85,7 +93,15 @@ function getBundledUrl(url) {
     searchParams.append('deref', 'optimizedBundle');
     bundledUrl.search = searchParams.toString();
     return bundledUrl.toString();
-}
+}
+const getNodeUriParts = (uri) => {
+    const parts = uri.split(/(\.yaml|\.yml|\.json|\.md)/);
+    if (parts.length === 1) {
+        return { fileUri: '', pointer: parts[0] || '' };
+    }
+    const fileUri = `${parts[0] || ''}${parts[1] || ''}`;
+    return { fileUri, pointer: parts[2] || '' };
+};
 
 const SearchImpl = ({ isLoading, search, searchResults, isOpen, onClose, onClick, onSearch }) => {
     const listBoxRef = React.useRef(null);
@@ -202,7 +218,7 @@ const UpgradeToStarter = () => (React__default.createElement(Flex, { as: "a", hr
     React__default.createElement(Icon, { icon: faExclamationTriangle, size: "4x" }),
     React__default.createElement(Box, { pt: 3 }, "Please upgrade your Stoplight Workspace to the Starter Plan to use Elements Dev Portal in production.")));
 
-const appVersion = '1.6.14';
+const appVersion = '1.6.17';
 
 class ResponseError extends Error {
     constructor(message, responseCode) {
@@ -321,6 +337,9 @@ const StoplightProjectImpl = ({ projectId, hideTryIt, hideMocking, hideExport, c
     else if (!node) {
         elem = React.createElement(NotFound, null);
     }
+    else if ((node === null || node === void 0 ? void 0 : node.slug) && nodeSlug !== node.slug) {
+        return React.createElement(Redirect, { to: branchSlug ? `/branches/${branchSlug}/${node.slug}` : `/${node.slug}` });
+    }
     else {
         elem = (React.createElement(NodeContent, { node: node, Link: ReactRouterMarkdownLink, hideTryIt: hideTryIt, hideMocking: hideMocking, hideExport: hideExport, tryItCredentialsPolicy: tryItCredentialsPolicy, tryItCorsProxy: tryItCorsProxy }));
     }
@@ -370,7 +389,7 @@ const getNodes = ({ workspaceId, branchSlug, projectIds, search, platformUrl = '
     }
     if (branchSlug) {
         const encodedBranchSlug = encodeURIComponent(branchSlug);
-        queryParams.push(`branchSlug=${encodedBranchSlug}`);
+        queryParams.push(`branch=${encodedBranchSlug}`);
     }
     const query = queryParams.length ? `?${queryParams.join('&')}` : '';
     const encodedWorkspaceId = encodeURIComponent(fetchedWorkspaceId);
@@ -623,14 +642,14 @@ function useDebounce(value, delay, options) {
     return [state, { cancel: debounced.cancel, isPending: debounced.isPending, flush: debounced.flush }];
 }
 
-function useGetNodes({ search, workspaceId, projectIds, pause, }) {
+function useGetNodes({ search, workspaceId, projectIds, branch, pause, }) {
     const { platformUrl, platformAuthToken } = React.useContext(PlatformContext);
     const [debounceSearch] = useDebounce(search, 500);
     return useQuery([
-        ...devPortalCacheKeys.searchNodes({ projectIds, workspaceId, search: debounceSearch }),
+        ...devPortalCacheKeys.searchNodes({ projectIds, branchSlug: branch, workspaceId, search: debounceSearch }),
         platformUrl,
         platformAuthToken,
-    ], () => getNodes({ workspaceId, projectIds, search: debounceSearch, platformUrl, platformAuthToken }), { enabled: !pause, keepPreviousData: true });
+    ], () => getNodes({ workspaceId, projectIds, branchSlug: branch, search: debounceSearch, platformUrl, platformAuthToken }), { enabled: !pause, keepPreviousData: true });
 }
 
 function useGetWorkspace({ projectIds }) {

package/index.js

@@ -93,7 +93,15 @@ const LinkComponent = ({ children, href }) => {
     }
     if (href && ctx) {
         const [node, Link] = ctx;
-        const resolvedUri = path.resolve(path.dirname(node.uri), href);
+        const { fileUri } = getNodeUriParts(node.uri);
+        const { fileUri: hrefFileUri } = getNodeUriParts(href);
+        let resolvedUri;
+        if (hrefFileUri) {
+            resolvedUri = path.resolve(path.dirname(fileUri), href);
+        }
+        else {
+            resolvedUri = path.resolve(fileUri, href);
+        }
         const [resolvedUriWithoutAnchor, hash] = resolvedUri.split('#');
         const decodedUrl = decodeURIComponent(href);
         const decodedResolvedUriWithoutAnchor = decodeURIComponent(resolvedUriWithoutAnchor);
@@ -112,7 +120,15 @@ function getBundledUrl(url) {
     searchParams.append('deref', 'optimizedBundle');
     bundledUrl.search = searchParams.toString();
     return bundledUrl.toString();
-}
+}
+const getNodeUriParts = (uri) => {
+    const parts = uri.split(/(\.yaml|\.yml|\.json|\.md)/);
+    if (parts.length === 1) {
+        return { fileUri: '', pointer: parts[0] || '' };
+    }
+    const fileUri = `${parts[0] || ''}${parts[1] || ''}`;
+    return { fileUri, pointer: parts[2] || '' };
+};
 
 const SearchImpl = ({ isLoading, search, searchResults, isOpen, onClose, onClick, onSearch }) => {
     const listBoxRef = React__namespace.useRef(null);
@@ -229,7 +245,7 @@ const UpgradeToStarter = () => (React__default["default"].createElement(mosaic.F
     React__default["default"].createElement(mosaic.Icon, { icon: freeSolidSvgIcons.faExclamationTriangle, size: "4x" }),
     React__default["default"].createElement(mosaic.Box, { pt: 3 }, "Please upgrade your Stoplight Workspace to the Starter Plan to use Elements Dev Portal in production.")));
 
-const appVersion = '1.6.14';
+const appVersion = '1.6.17';
 
 class ResponseError extends Error {
     constructor(message, responseCode) {
@@ -348,6 +364,9 @@ const StoplightProjectImpl = ({ projectId, hideTryIt, hideMocking, hideExport, c
     else if (!node) {
         elem = React__namespace.createElement(NotFound, null);
     }
+    else if ((node === null || node === void 0 ? void 0 : node.slug) && nodeSlug !== node.slug) {
+        return React__namespace.createElement(reactRouterDom.Redirect, { to: branchSlug ? `/branches/${branchSlug}/${node.slug}` : `/${node.slug}` });
+    }
     else {
         elem = (React__namespace.createElement(NodeContent, { node: node, Link: elementsCore.ReactRouterMarkdownLink, hideTryIt: hideTryIt, hideMocking: hideMocking, hideExport: hideExport, tryItCredentialsPolicy: tryItCredentialsPolicy, tryItCorsProxy: tryItCorsProxy }));
     }
@@ -397,7 +416,7 @@ const getNodes = ({ workspaceId, branchSlug, projectIds, search, platformUrl = '
     }
     if (branchSlug) {
         const encodedBranchSlug = encodeURIComponent(branchSlug);
-        queryParams.push(`branchSlug=${encodedBranchSlug}`);
+        queryParams.push(`branch=${encodedBranchSlug}`);
     }
     const query = queryParams.length ? `?${queryParams.join('&')}` : '';
     const encodedWorkspaceId = encodeURIComponent(fetchedWorkspaceId);
@@ -650,14 +669,14 @@ function useDebounce(value, delay, options) {
     return [state, { cancel: debounced.cancel, isPending: debounced.isPending, flush: debounced.flush }];
 }
 
-function useGetNodes({ search, workspaceId, projectIds, pause, }) {
+function useGetNodes({ search, workspaceId, projectIds, branch, pause, }) {
     const { platformUrl, platformAuthToken } = React__namespace.useContext(PlatformContext);
     const [debounceSearch] = useDebounce(search, 500);
     return reactQuery.useQuery([
-        ...devPortalCacheKeys.searchNodes({ projectIds, workspaceId, search: debounceSearch }),
+        ...devPortalCacheKeys.searchNodes({ projectIds, branchSlug: branch, workspaceId, search: debounceSearch }),
         platformUrl,
         platformAuthToken,
-    ], () => getNodes({ workspaceId, projectIds, search: debounceSearch, platformUrl, platformAuthToken }), { enabled: !pause, keepPreviousData: true });
+    ], () => getNodes({ workspaceId, projectIds, branchSlug: branch, search: debounceSearch, platformUrl, platformAuthToken }), { enabled: !pause, keepPreviousData: true });
 }
 
 function useGetWorkspace({ projectIds }) {

package/index.mjs

@@ -66,7 +66,15 @@ const LinkComponent = ({ children, href }) => {
     }
     if (href && ctx) {
         const [node, Link] = ctx;
-        const resolvedUri = resolve(dirname(node.uri), href);
+        const { fileUri } = getNodeUriParts(node.uri);
+        const { fileUri: hrefFileUri } = getNodeUriParts(href);
+        let resolvedUri;
+        if (hrefFileUri) {
+            resolvedUri = resolve(dirname(fileUri), href);
+        }
+        else {
+            resolvedUri = resolve(fileUri, href);
+        }
         const [resolvedUriWithoutAnchor, hash] = resolvedUri.split('#');
         const decodedUrl = decodeURIComponent(href);
         const decodedResolvedUriWithoutAnchor = decodeURIComponent(resolvedUriWithoutAnchor);
@@ -85,7 +93,15 @@ function getBundledUrl(url) {
     searchParams.append('deref', 'optimizedBundle');
     bundledUrl.search = searchParams.toString();
     return bundledUrl.toString();
-}
+}
+const getNodeUriParts = (uri) => {
+    const parts = uri.split(/(\.yaml|\.yml|\.json|\.md)/);
+    if (parts.length === 1) {
+        return { fileUri: '', pointer: parts[0] || '' };
+    }
+    const fileUri = `${parts[0] || ''}${parts[1] || ''}`;
+    return { fileUri, pointer: parts[2] || '' };
+};
 
 const SearchImpl = ({ isLoading, search, searchResults, isOpen, onClose, onClick, onSearch }) => {
     const listBoxRef = React.useRef(null);
@@ -202,7 +218,7 @@ const UpgradeToStarter = () => (React__default.createElement(Flex, { as: "a", hr
     React__default.createElement(Icon, { icon: faExclamationTriangle, size: "4x" }),
     React__default.createElement(Box, { pt: 3 }, "Please upgrade your Stoplight Workspace to the Starter Plan to use Elements Dev Portal in production.")));
 
-const appVersion = '1.6.14';
+const appVersion = '1.6.17';
 
 class ResponseError extends Error {
     constructor(message, responseCode) {
@@ -321,6 +337,9 @@ const StoplightProjectImpl = ({ projectId, hideTryIt, hideMocking, hideExport, c
     else if (!node) {
         elem = React.createElement(NotFound, null);
     }
+    else if ((node === null || node === void 0 ? void 0 : node.slug) && nodeSlug !== node.slug) {
+        return React.createElement(Redirect, { to: branchSlug ? `/branches/${branchSlug}/${node.slug}` : `/${node.slug}` });
+    }
     else {
         elem = (React.createElement(NodeContent, { node: node, Link: ReactRouterMarkdownLink, hideTryIt: hideTryIt, hideMocking: hideMocking, hideExport: hideExport, tryItCredentialsPolicy: tryItCredentialsPolicy, tryItCorsProxy: tryItCorsProxy }));
     }
@@ -370,7 +389,7 @@ const getNodes = ({ workspaceId, branchSlug, projectIds, search, platformUrl = '
     }
     if (branchSlug) {
         const encodedBranchSlug = encodeURIComponent(branchSlug);
-        queryParams.push(`branchSlug=${encodedBranchSlug}`);
+        queryParams.push(`branch=${encodedBranchSlug}`);
     }
     const query = queryParams.length ? `?${queryParams.join('&')}` : '';
     const encodedWorkspaceId = encodeURIComponent(fetchedWorkspaceId);
@@ -623,14 +642,14 @@ function useDebounce(value, delay, options) {
     return [state, { cancel: debounced.cancel, isPending: debounced.isPending, flush: debounced.flush }];
 }
 
-function useGetNodes({ search, workspaceId, projectIds, pause, }) {
+function useGetNodes({ search, workspaceId, projectIds, branch, pause, }) {
     const { platformUrl, platformAuthToken } = React.useContext(PlatformContext);
     const [debounceSearch] = useDebounce(search, 500);
     return useQuery([
-        ...devPortalCacheKeys.searchNodes({ projectIds, workspaceId, search: debounceSearch }),
+        ...devPortalCacheKeys.searchNodes({ projectIds, branchSlug: branch, workspaceId, search: debounceSearch }),
         platformUrl,
         platformAuthToken,
-    ], () => getNodes({ workspaceId, projectIds, search: debounceSearch, platformUrl, platformAuthToken }), { enabled: !pause, keepPreviousData: true });
+    ], () => getNodes({ workspaceId, projectIds, branchSlug: branch, search: debounceSearch, platformUrl, platformAuthToken }), { enabled: !pause, keepPreviousData: true });
 }
 
 function useGetWorkspace({ projectIds }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stoplight/elements-dev-portal",
-  "version": "1.6.14",
+  "version": "1.6.17",
   "description": "UI components for composing beautiful developer documentation.",
   "keywords": [],
   "main": "./index.js",
@@ -29,7 +29,7 @@
     "@fortawesome/free-solid-svg-icons": "^5.10.2",
     "@stoplight/elements-core": "~7.5.13",
     "@stoplight/markdown-viewer": "^5.4.2",
-    "@stoplight/mosaic": "^1.15.4",
+    "@stoplight/mosaic": "^1.16.2",
     "@stoplight/path": "^1.3.2",
     "@stoplight/types": "^12.0.0",
     "classnames": "^2.2.6",

package/version.d.ts

@@ -1 +1 @@
-export declare const appVersion = "1.6.14";
+export declare const appVersion = "1.6.17";