feat(provider): provider attributes and actions

apps/provider-console/src/components/become-provider/ProviderAttributes.tsx

@@ -14,21 +14,29 @@ import {
   SelectContent,
   SelectItem,
   SelectTrigger,
-  Separator
+  Separator,
+  Alert,
+  AlertDescription,
+  AlertTitle
 } from "@akashnetwork/ui/components";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Plus, Trash } from "iconoir-react";
 import { useAtom } from "jotai";
 import { z } from "zod";
 
-import providerProcessStore from "@src/store/providerProcessStore";
+import providerProcessStore, { ProviderAttribute } from "@src/store/providerProcessStore";
 import { providerAttributesFormValuesSchema } from "../../types/providerAttributes";
 import { ResetProviderForm } from "./ResetProviderProcess";
+import restClient from "@src/utils/restClient";
+import { useControlMachine } from "@src/context/ControlMachineProvider";
+import { sanitizeMachineAccess } from "@src/utils/sanityUtils";
 
 const attributeKeys = Object.keys(providerAttributesFormValuesSchema.shape);
 
 interface ProviderAttributesProps {
-  onComplete: () => void;
+  existingAttributes?: ProviderAttribute[];
+  editMode?: boolean;
+  onComplete?: () => void;
 }
 
 const providerFormSchema = z.object({
@@ -43,40 +51,68 @@ const providerFormSchema = z.object({
 
 type ProviderFormValues = z.infer<typeof providerFormSchema>;
 
-export const ProviderAttributes: React.FC<ProviderAttributesProps> = ({ onComplete }) => {
+export const ProviderAttributes: React.FunctionComponent<ProviderAttributesProps> = ({ onComplete, existingAttributes, editMode }) => {
   const [providerPricing, setProviderPricing] = useAtom(providerProcessStore.providerProcessAtom);
   const form = useForm<ProviderFormValues>({
     resolver: zodResolver(providerFormSchema),
     defaultValues: {
-      attributes: [{ key: "", value: "", customKey: "" }]
+      attributes: existingAttributes
+        ? existingAttributes.map(attr => ({
+            key: attributeKeys.includes(attr.key) ? attr.key : "unknown-attributes",
+            value: attr.value,
+            customKey: attributeKeys.includes(attr.key) ? "" : attr.key
+          }))
+        : [{ key: "", value: "", customKey: "" }]
     }
   });
 
   const { control } = form;
-
   const { fields, append, remove } = useFieldArray({
     control,
     name: "attributes"
   });
 
+  const { activeControlMachine } = useControlMachine();
+
+  const [showSuccess, setShowSuccess] = React.useState(false);
+
   const updateProviderAttributesAndProceed: SubmitHandler<ProviderFormValues> = async data => {
-    const updatedProviderPricing = {
-      ...providerPricing,
-      attributes: data.attributes.map(attr => ({
-        ...attr,
-        customKey: attr.customKey || ""
-      }))
-    };
-    setProviderPricing(updatedProviderPricing);
-    onComplete();
+    if (!editMode) {
+      const updatedProviderPricing = {
+        ...providerPricing,
+        attributes: data.attributes.map(attr => ({
+          key: attr.key === "unknown-attributes" ? attr.customKey || "" : attr.key || "",
+          value: attr.value
+        }))
+      };
+      setProviderPricing(updatedProviderPricing);
+      onComplete && onComplete();
+    } else {
+      const attributes = data.attributes.map(attr => ({
+        key: attr.key === "unknown-attributes" ? attr.customKey || "" : attr.key || "",
+        value: attr.value
+      }));
+      const request = {
+        control_machine: sanitizeMachineAccess(activeControlMachine),
+        attributes
+      };
+
+      const response = await restClient.post(`/update-provider-attributes`, request);
+      if (response) {
+        setShowSuccess(true);
+        setTimeout(() => setShowSuccess(false), 10000);
+      }
+    }
   };
 
   return (
     <div className="flex w-full flex-col items-center pt-10">
       <div className="w-full max-w-2xl space-y-6">
         <div>
-          <h3 className="text-xl font-bold">Provider Attributes</h3>
-          <p className="text-muted-foreground text-sm">Please enter your provider attributes.</p>
+          <h3 className="text-xl font-bold">{existingAttributes ? "Edit Provider Attributes" : "Provider Attributes"}</h3>
+          <p className="text-muted-foreground text-sm">
+            {existingAttributes ? "Please update your provider attributes." : "Please enter your provider attributes."}
+          </p>
         </div>
         <div>
           <Separator />
@@ -154,16 +190,20 @@ export const ProviderAttributes: React.FC<ProviderAttributesProps> = ({ onComple
                 <Separator />
               </div>
               <div className="flex w-full justify-between">
-                <div className="flex justify-start">
-                  <ResetProviderForm />
-                </div>
+                <div className="flex justify-start">{!editMode && <ResetProviderForm />}</div>
                 <div className="flex justify-end">
-                  <Button type="submit">Next</Button>
+                  <Button type="submit">{editMode ? "Update Attributes" : "Next"}</Button>
                 </div>
               </div>
             </form>
           </Form>
         </div>
+        {showSuccess && (
+          <Alert>
+            <AlertTitle>Success</AlertTitle>
+            <AlertDescription>Provider attributes updated successfully</AlertDescription>
+          </Alert>
+        )}
       </div>
     </div>
   );

apps/provider-console/src/components/become-provider/WalletImport.tsx

@@ -139,7 +139,7 @@ export const WalletImport: React.FC<WalletImportProps> = ({ onComplete }) => {
           };
           await setControlMachine(machineWithAddress);
           resetProviderProcess();
-          router.push(`/action?id=${response.action_id}`);
+          router.push(`/actions/${response.action_id}`);
         } else {
           throw new Error("Invalid response from server");
         }

apps/provider-console/src/components/layout/Sidebar.tsx

@@ -57,9 +57,9 @@ export const Sidebar: React.FC<Props> = ({ isMobileOpen, handleDrawerToggle, isN
         {
           title: "Actions",
           icon: props => <ClipboardCheck {...props} />,
-          url: "#",
-          activeRoutes: ["#"],
-          disabled: true
+          url: UrlService.actions(),
+          activeRoutes: [UrlService.actions()],
+          disabled: false
         },
         {
           title: "Pricing",
@@ -71,9 +71,9 @@ export const Sidebar: React.FC<Props> = ({ isMobileOpen, handleDrawerToggle, isN
         {
           title: "Attributes",
           icon: props => <ListSelect {...props} />,
-          url: "#",
-          activeRoutes: ["#"],
-          disabled: true
+          url: UrlService.attributes(),
+          activeRoutes: [UrlService.attributes()],
+          disabled: false
         },
         {
           title: "Settings",

apps/provider-console/src/components/shared/ProviderActionList.tsx

@@ -56,7 +56,7 @@ export const ProviderActionList: React.FC<ProviderActionListProps> = ({ actions
   };
 
   const handleRowClick = (actionId: string) => {
-    router.push(`/action-details/?id=${actionId}`);
+    router.push(`/actions/${actionId}`);
   };
 
   return (

apps/provider-console/src/pages/action-details/index.tsx → apps/provider-console/src/pages/actions/[id]/index.tsx

@@ -1,16 +1,16 @@
 "use client";
 
 import React from "react";
-import { useSearchParams } from "next/navigation";
 
 import { Layout } from "@src/components/layout/Layout";
 import { ProviderActionDetails } from "@src/components/shared/ProviderActionDetails";
 
-export default function ActionDetailsPage() {
-  const searchParams = useSearchParams();
-  const actionId = searchParams.get("id");
+type Props = {
+  id: string | null;
+};
 
-  if (!actionId) {
+const ActionDetailsPage: React.FC<Props> = ({ id }) => {
+  if (!id) {
     return (
       <Layout>
         <div>Error: No action ID provided</div>
@@ -21,8 +21,20 @@ export default function ActionDetailsPage() {
   return (
     <Layout>
       <div className="container mx-auto">
-        <ProviderActionDetails actionId={actionId} />
+        <ProviderActionDetails actionId={id} />
       </div>
     </Layout>
   );
+};
+
+export default ActionDetailsPage;
+
+// export default withAuth(ActionDetailsPage);
+
+export async function getServerSideProps({ params }) {
+  return {
+    props: {
+      id: params?.id
+    }
+  };
 }

apps/provider-console/src/pages/actions/index.tsx

@@ -0,0 +1,35 @@
+"use client";
+import { Layout } from "@src/components/layout/Layout";
+import { ProviderActionList } from "@src/components/shared/ProviderActionList";
+import { useEffect, useState } from "react";
+import restClient from "@src/utils/restClient";
+import { Title } from "@src/components/shared/Title";
+
+const ActionsList: React.FC = () => {
+  const [actions, setActions] = useState<any[]>([]);
+  useEffect(() => {
+    const fetchActions = async () => {
+      const response: any = await restClient.get(`/actions`);
+      setActions(response.actions);
+    };
+    fetchActions();
+  }, []);
+  return (
+    <Layout>
+      <div className="flex items-center">
+        <div className="w-10 flex-1">
+          <Title>User Actions</Title>
+        </div>
+      </div>
+      <div className="mt-10">
+        <div className="text-sm font-semibold">
+          <div className="items-center space-x-2">
+            <ProviderActionList actions={actions} />
+          </div>
+        </div>
+      </div>
+    </Layout>
+  );
+};
+
+export default ActionsList;

apps/provider-console/src/pages/attributes/index.tsx

@@ -0,0 +1,34 @@
+import React from "react";
+import { useQuery } from "react-query";
+
+import { ProviderAttributes } from "@src/components/become-provider/ProviderAttributes";
+import { Layout } from "@src/components/layout/Layout";
+import { useSelectedChain } from "@src/context/CustomChainProvider";
+import consoleClient from "@src/utils/consoleClient";
+
+const Attributes: React.FunctionComponent = () => {
+  const { address } = useSelectedChain();
+  const { data: providerDetails, isLoading: isLoadingProviderDetails }: { data: any; isLoading: boolean } = useQuery(
+    "providerDetails",
+    () => consoleClient.get(`/v1/providers/${address}`),
+    {
+      // You might want to adjust these options based on your needs
+      refetchOnWindowFocus: false,
+      retry: 3
+    }
+  );
+
+  return (
+    <Layout>
+      {isLoadingProviderDetails ? (
+        <div>Loading...</div>
+      ) : (
+        <div>
+          <ProviderAttributes existingAttributes={providerDetails.attributes} editMode={true} />
+        </div>
+      )}
+    </Layout>
+  );
+};
+
+export default Attributes;

apps/provider-console/src/store/providerProcessStore.ts

@@ -27,7 +27,7 @@ interface ProviderPricing {
   endpointBidPrice: number
 }
 
-interface ProviderAttribute { key: string, value: string, customKey: string }
+export interface ProviderAttribute { key: string, value: string }
 
 interface ProviderProcess {
   machines: MachineInformation[],

apps/provider-console/src/utils/sanityUtils.ts

@@ -0,0 +1,15 @@
+import { ControlMachineWithAddress } from "@src/types/controlMachine";
+
+export function sanitizeMachineAccess(machine: ControlMachineWithAddress | null) {
+    if (!machine) {
+        return undefined;
+    }
+    return {
+        hostname: machine.access.hostname,
+        port: machine.access.port,
+        username: machine.access.username,
+        keyfile: machine.access.file || null,
+        password: machine.access.password || null,
+        passphrase: machine.access.passphrase || null
+    };
+}

apps/provider-console/src/utils/urlUtils.ts

@@ -17,7 +17,9 @@ export const domainName = "https://provider.akash.network";
 export class UrlService {
   static home = () => "/";
   static deployments = () => "/deployments";
+  static attributes = () => "/attributes";
   static getStarted = () => "/get-started";
   static privacyPolicy = () => "/privacy-policy";
   static termsOfService = () => "/terms-of-service";
+  static actions = () => "/actions";
 }