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.

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

Add flix dependency filter #232

Draft
wants to merge 1 commit into
base: previewnet
Choose a base branch
from
Draft
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion apps/web/next.config.js
Original file line number Diff line number Diff line change
@@ -10,11 +10,16 @@ const nextConfig = {
]
},
async redirects() {
if (process.env.NODE_ENV === "development") {
return [];
}

return [
{
source: "/",
destination: "/previewnet",
permanent: true
permanent: true,

},
// Redirect to the main release that doesn't support Cadence v1.0
{
6 changes: 0 additions & 6 deletions apps/web/src/common/NetworkDropdown.tsx
Original file line number Diff line number Diff line change
@@ -36,12 +36,6 @@ export function NetworkDropdown(props: NetworkDropdownProps) {
{network}
</MenuItem>
))}
<MenuItem
onClick={() => window.open("https://previewnet.flowser.dev/previewnet")}
className="capitalize"
>
Previewnet
</MenuItem>
</Menu>
)
}
4 changes: 4 additions & 0 deletions apps/web/src/common/interaction-page-params.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import { FlowNetworkId } from "@onflowser/core/src/flow-utils";
import {
InteractionTemplateFilters
} from "@onflowser/ui/src/interactions/components/InteractionTemplates/interaction-templates-controller.provider";

// Must be placed in separate (type-only) file,
// so that opengraph-image doesn't reach code size limit.
export type InteractionsPageParams = {
networkId: FlowNetworkId;
interaction?: string;
templateFilters: InteractionTemplateFilters;
}
33 changes: 19 additions & 14 deletions apps/web/src/common/root.tsx
Original file line number Diff line number Diff line change
@@ -50,6 +50,9 @@ import { BaseDialog } from "@onflowser/ui/src/common/overlays/dialogs/base/BaseD
import { NetworkDropdown } from "./NetworkDropdown";
import { ProfileDropdown } from "@/common/ProfileDropdown";
import { ConfirmDialogProvider } from "@onflowser/ui/src/contexts/confirm-dialog.context";
import {
InteractionTemplateFiltersProvider
} from "@onflowser/ui/src/interactions/components/InteractionTemplates/interaction-templates-controller.provider";

const indexSyncIntervalInMs = 500;

@@ -448,7 +451,7 @@ function ApiSetupPrompt(props: {
}

function Content() {
const { networkId, interaction, setNetworkId } = useInteractionsPageParams();
const { networkId, interaction, setNetworkId, templateFilters } = useInteractionsPageParams();
const interactionRegistry = useInteractionRegistry();
const templatesRegistry = useTemplatesRegistry();

@@ -488,19 +491,21 @@ function Content() {

return (
<ConfirmDialogProvider>
<InteractionsPage
headerRowContent={
<div className="m-2 flex gap-x-[10px]">
<ProfileDropdown currentNetwork={networkId} />
<NetworkDropdown value={networkId} onChange={setNetworkId} />
</div>
}
tabOrder={["templates", "history"]}
enabledInteractionSourceTypes={[
'session',
'flix',
]}
/>
<InteractionTemplateFiltersProvider filters={templateFilters}>
<InteractionsPage
headerRowContent={
<div className="m-2 flex gap-x-[10px]">
<ProfileDropdown currentNetwork={networkId} />
<NetworkDropdown value={networkId} onChange={setNetworkId} />
</div>
}
tabOrder={["templates", "history"]}
enabledInteractionSourceTypes={[
'session',
'flix',
]}
/>
</InteractionTemplateFiltersProvider>
</ConfirmDialogProvider>
);
}
30 changes: 27 additions & 3 deletions apps/web/src/common/use-interaction-page-params.ts
Original file line number Diff line number Diff line change
@@ -1,31 +1,55 @@
import { useParams, useRouter } from "next/navigation";
import { useParams, useRouter, useSearchParams } from "next/navigation";
import { FlowNetworkId, FlowUtils } from "@onflowser/core/src/flow-utils";
import { InteractionsPageParams } from "@/common/interaction-page-params";
import {
InteractionTemplateFilters
} from "@onflowser/ui/src/interactions/components/InteractionTemplates/interaction-templates-controller.provider";
import { ensurePrefixedAddress } from "@onflowser/core";

type UseInteractionPageParams = InteractionsPageParams & {
setNetworkId: (network: FlowNetworkId) => void;
}

export function useInteractionsPageParams(): UseInteractionPageParams {
const params = useParams();
const search = useSearchParams();
const router = useRouter();

const interaction = params.interaction as string | undefined;
const networkId = params.networkId;
const templateFilters: InteractionTemplateFilters = {};

const rawFlixDependency = search.get("flix-dependency");
if (rawFlixDependency) {
// Accepts format A.address.ContractName
const [prefix, address, name] = rawFlixDependency.split(".");

templateFilters.dependencies = {
contractAddress: ensurePrefixedAddress(address),
contractName: name
}
}

if (!FlowUtils.isValidFlowNetwork(networkId)) {
throw new Error(`Unknown Flow network: ${networkId}`)
}

function setNetworkId(network: FlowNetworkId) {
let prefix = "";

if (network === "previewnet") {
prefix = "https://previewnet.flowser.dev"
}

if (interaction) {
router.replace(`/${network}/${interaction}`)
router.replace(`${prefix}/${network}/${interaction}`)
} else {
router.replace(`/${network}`)
router.replace(`${prefix}/${network}`)
}
}

return {
templateFilters,
networkId,
interaction,
setNetworkId
Original file line number Diff line number Diff line change
@@ -19,6 +19,9 @@ import { Shimmer } from "../../../common/loaders/Shimmer/Shimmer";
import { MenuItem } from "@szhsin/react-menu";
import { EditTemplateNameDialog } from "../EditTemplateNameDialog/EditTemplateNameDialog";
import { Menu } from "../../../common/overlays/Menu/Menu";
import { useOptionalInteractionTemplateFilters } from "./interaction-templates-controller.provider";
import { FlixUtils } from "@onflowser/core";
import { useFlowNetworkId } from "../../../contexts/flow-network.context";

type InteractionTemplatesProps = {
enabledSourceTypes: InteractionSourceType[];
@@ -35,14 +38,38 @@ export function InteractionTemplates(props: InteractionTemplatesProps): ReactEle

function StoredTemplates(props: InteractionTemplatesProps) {
const [searchTerm, setSearchTerm] = useState("");
const networkId = useFlowNetworkId();
const templatesRegistry = useTemplatesRegistry();
const filters = useOptionalInteractionTemplateFilters();
const [filterToSources, setFilterToSources] = useLocalStorage<InteractionSourceType[]>("interaction-filters", []);
const filteredTemplates = useMemo(() => {
const searchQueryResults = searchTerm === "" ? templatesRegistry.templates : templatesRegistry.templates.filter((template) => template.name.toLowerCase().includes(searchTerm.toLowerCase()));
let results = Array.from(templatesRegistry.templates);

const sourceFilterResults = filterToSources.length === 0 ? searchQueryResults : searchQueryResults.filter(e => filterToSources.includes(e.source));
if (filters?.dependencies) {
results = results.filter(template => template.flix && FlixUtils.getDependencies(template.flix, networkId).some(dependency => {
let shouldInclude = true;

return sourceFilterResults;
if (filters.dependencies?.contractAddress) {
shouldInclude = shouldInclude && dependency.address == filters.dependencies.contractAddress;
}

if (filters.dependencies?.contractName) {
shouldInclude = shouldInclude && dependency.name === filters.dependencies.contractName;
}

return shouldInclude;
}));
}

if (searchTerm) {
results = results.filter((template) => template.name.toLowerCase().includes(searchTerm.toLowerCase()))
}

if (filterToSources.length > 0) {
results = results.filter(template => filterToSources.includes(template.source))
}

return results;
}, [searchTerm, filterToSources, templatesRegistry.templates]);
const filteredAndSortedTemplates = useMemo(
() =>
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { createContext, ReactNode, useContext } from "react";

export type InteractionTemplateFilters = {
dependencies?: {
contractAddress?: string;
contractName?: string;
}
}

const Context = createContext<InteractionTemplateFilters>(undefined as never);

type Props = {
filters: InteractionTemplateFilters;
children: ReactNode;
}

export function InteractionTemplateFiltersProvider(props: Props) {
return (
<Context.Provider value={props.filters}>
{props.children}
</Context.Provider>
)
}

export function useOptionalInteractionTemplateFilters(): InteractionTemplateFilters | undefined {
return useContext(Context);
}