584936fa29
* Added ProjectVersion to projects, defaults to V2 * Moved v3Enabled to the existing feature flags * Update to using the v3Enabled feature flag * Allow people to choose v3 when creating a new project * Added version to the ProjectPresenter * v2 project and v3 project redirecting * .env.example for the v3-catalog * Added sdkVersion and cliVersion columns to the BackgroundWorker table * Added additional classes for environments * First draft of the Tasks table * Link to the task page * V3 side menu project items * Moved the ListPagination component into the components folder * Moved the TaskListPresenter to a v3 folder * Bare bones task page with tabs * Task page, we’re going to delete this though * Bare bones runs table working * Rejigged the columns * The run table status * Environment and status filtering working * Added time filters * Cursor and direction is working… I think it’s tricky to know for sure * Added TaskRun numbers * Selecting a task now links to the runs page with filters turned on * Added support for the enqueued status * Reworked the task table * Link to the task and environment runs * The run page is rendering a tree of the events * Change the task table column to “Created at" * WIP on making the run tree view look good * Improvements to the run tree * Removed the janky scroll bar flash * Change the title of the task logs to just the task ID * Live timer when a span is running * Added “Show parent items” link * Fixed the bug jumping to parent items * Style improvements to the run * Added the resizable handle to the run page * Moved formatDuration to core/v3 * Wait for now has nice log messages * The run detail panel is working with just a title for now * Navigating to a span and persisting between page reloads is working * The run detail timeline * Wrap log dates in a paragraph * Latest span detail view * Scrolling in the right-hand panel * Tweak default resizable layout for the run page * Attempted improvements to stop a recursive issue on TreeView * TreeView useReducer WIP * Changed the change callback * Add changes to the state * Use the new onSelectedIdChanged in the app * Don’t update the state from the outside * Filtering fix, although navigation doesn’t work nicely * Filtering working when changing the content and clearing it * Don’t allow the same selectedId callback to be called twice… * useDebounce hook * Switch from using defer to just typedjson for now * Latest attempt at span navigation * Removed log * Turn off filtering for now, it’s causing the Links to break somehow * Fix for page height issue * Added (Developer Preview) to the v3 project select box * Revert "Filtering working when changing the content and clearing it" This reverts commit 20d9fbe36ded619e9d3eb0b23d4ed0568a88a615. # Conflicts: # apps/webapp/app/components/primitives/TreeView/TreeView.tsx * Switch to using the old filtering * Added useThrottle hook * Instantly close the panel when deselecting a node, use debounce when navigating to a span * Better spacing in the right hand panel * Comment out the v3 side menu pages that don’t exist yet * Fix for typecheck fail * Clear the statuses too
112 lines
2.9 KiB
TypeScript
112 lines
2.9 KiB
TypeScript
import type { UIMatch } from "@remix-run/react";
|
|
import { useMatches } from "@remix-run/react";
|
|
|
|
const DEFAULT_REDIRECT = "/";
|
|
|
|
/**
|
|
* This should be used any time the redirect path is user-provided
|
|
* (Like the query string on our login/signup pages). This avoids
|
|
* open-redirect vulnerabilities.
|
|
* @param {string} to The redirect destination
|
|
* @param {string} defaultRedirect The redirect to use if the to is unsafe.
|
|
*/
|
|
export function safeRedirect(
|
|
to: FormDataEntryValue | string | null | undefined,
|
|
defaultRedirect: string = DEFAULT_REDIRECT
|
|
) {
|
|
if (!to || typeof to !== "string") {
|
|
return defaultRedirect;
|
|
}
|
|
|
|
if (!to.startsWith("/") || to.startsWith("//")) {
|
|
return defaultRedirect;
|
|
}
|
|
|
|
return to;
|
|
}
|
|
|
|
/**
|
|
* This base hook is used in other hooks to quickly search for specific data
|
|
* across all loader data using useMatches.
|
|
* @param {string} id The route id
|
|
* @returns {JSON|undefined} The router data or undefined if not found
|
|
*/
|
|
export function useMatchesData(id: string | string[], debug: boolean = false): UIMatch | undefined {
|
|
const matchingRoutes = useMatches();
|
|
|
|
if (debug) {
|
|
console.log("matchingRoutes", matchingRoutes);
|
|
}
|
|
|
|
const paths = Array.isArray(id) ? id : [id];
|
|
|
|
// Get the first matching route
|
|
const route = paths.reduce((acc, path) => {
|
|
if (acc) return acc;
|
|
return matchingRoutes.find((route) => route.id === path);
|
|
}, undefined as UIMatch | undefined);
|
|
|
|
return route;
|
|
}
|
|
|
|
export function validateEmail(email: unknown): email is string {
|
|
return typeof email === "string" && email.length > 3 && email.includes("@");
|
|
}
|
|
|
|
export function hydrateObject<T>(object: any): T {
|
|
return hydrateDates(object) as T;
|
|
}
|
|
|
|
export function hydrateDates(object: any): any {
|
|
if (object === null || object === undefined) {
|
|
return object;
|
|
}
|
|
|
|
if (object instanceof Date) {
|
|
return object;
|
|
}
|
|
|
|
if (
|
|
typeof object === "string" &&
|
|
object.match(/\d{4}-\d{2}-\d{2}/) &&
|
|
!Number.isNaN(Date.parse(object))
|
|
) {
|
|
return new Date(object);
|
|
}
|
|
|
|
if (typeof object === "object") {
|
|
if (Array.isArray(object)) {
|
|
return object.map((item) => hydrateDates(item));
|
|
} else {
|
|
const hydratedObject: any = {};
|
|
for (const key in object) {
|
|
hydratedObject[key] = hydrateDates(object[key]);
|
|
}
|
|
return hydratedObject;
|
|
}
|
|
}
|
|
|
|
return object;
|
|
}
|
|
|
|
export function titleCase(original: string): string {
|
|
return original
|
|
.split(" ")
|
|
.map((word) => word[0].toUpperCase() + word.slice(1))
|
|
.join(" ");
|
|
}
|
|
|
|
// Takes an api key (either trigger_live_xxxx or trigger_development_xxxx) and returns trigger_live_********
|
|
export const obfuscateApiKey = (apiKey: string) => {
|
|
const [prefix, slug, secretPart] = apiKey.split("_");
|
|
return `${prefix}_${slug}_${"*".repeat(secretPart.length)}`;
|
|
};
|
|
|
|
export function appEnvTitleTag(appEnv?: string): string {
|
|
if (!appEnv || appEnv === "production") {
|
|
return "";
|
|
}
|
|
|
|
return ` (${appEnv})`;
|
|
}
|