sdk tweaks (#2760)

* sdk tweaks * update action result types * accommodate new action response types * fix: show action value labels * Feature/get status effect (#2765) * wip: get status * feat: Add the get_status for effects * feat: Do a callback --------- Co-authored-by: J H <dragondef@gmail.com> --------- Co-authored-by: Matt Hill <mattnine@protonmail.com> Co-authored-by: waterplea <alexander@inkin.ru> Co-authored-by: J H <dragondef@gmail.com>
2026-03-30 12:11:56 +00:00 · 2024-10-28 12:12:36 -06:00
parent 42cfd69463
commit 26ae0bf207
28 changed files with 871 additions and 456 deletions
--- a/web/projects/ui/src/app/services/action.service.ts
+++ b/web/projects/ui/src/app/services/action.service.ts
@@ -118,13 +118,17 @@ export class ActionService {
        input: input || null,
      })

-      if (res) {
+      if (!res) return true
+
+      if (res.result) {
        this.dialogs
          .open(new PolymorpheusComponent(ActionSuccessPage), {
-            label: res.name,
+            label: res.title,
            data: res,
          })
          .subscribe()
+      } else if (res.message) {
+        this.dialogs.open(res.message, { label: res.title }).subscribe()
      }
      return true // needed to dismiss original modal/alert
    } catch (e: any) {
--- a/web/projects/ui/src/app/services/api/api.fixures.ts
+++ b/web/projects/ui/src/app/services/api/api.fixures.ts
@@ -1049,77 +1049,91 @@ export module Mock {
    },
  }

-  export const ActionRes: RR.ActionRes = {
+  export const ActionResMessage: RR.ActionRes = {
    version: '1',
-    type: 'string',
-    name: 'New Password',
-    description:
-      'Action was run successfully Action was run successfully Action was run successfully Action was run successfully Action was run successfully',
-    copyable: true,
-    qr: true,
-    masked: true,
-    value: 'iwejdoiewdhbew',
+    title: 'New Password',
+    message:
+      'Action was run successfully and smoothly and fully and all is good on the western front.',
+    result: null,
  }

-  export const ActionProperties: RR.ActionRes = {
+  export const ActionResSingle: RR.ActionRes = {
    version: '1',
-    type: 'object',
-    name: 'Properties',
-    value: [
-      {
-        type: 'string',
-        name: 'LND Connect',
-        description: 'This is some information about the thing.',
-        copyable: true,
-        qr: true,
-        masked: true,
-        value:
-          'lndconnect://udlyfq2mxa4355pt7cqlrdipnvk2tsl4jtsdw7zaeekenufwcev2wlad.onion:10009?cert=MIICJTCCAcugAwIBAgIRAOyq85fqAiA3U3xOnwhH678wCgYIKoZIzj0EAwIwODEfMB0GAkUEChMWbG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEVMBMGA1UEAxMMNTc0OTkwMzIyYzZlMB4XDTIwMTAyNjA3MzEyN1oXDTIxMTIyMTA3MzEyN1owODEfMB0GA1UEChMWbG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEVMBMGA1UEAxMMNTc0OTkwMzIyYzZlMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEKqfhAMMZdY-eFnU5P4bGrQTSx0lo7m8u4V0yYkzUM6jlql_u31_mU2ovLTj56wnZApkEjoPl6fL2yasZA2wiy6OBtTCBsjAOBgNVHQ8BAf8EBAMCAqQwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0TAQH_BAUwAwEB_zAdBgNVHQ4EFgQUYQ9uIO6spltnVCx4rLFL5BvBF9IwWwYDVR0RBFQwUoIMNTc0OTkwMzIyYzZlgglsb2NhbGhvc3SCBHVuaXiCCnVuaXhwYWNrZXSCB2J1ZmNvbm6HBH8AAAGHEAAAAAAAAAAAAAAAAAAAAAGHBKwSAAswCgYIKoZIzj0EAwIDSAAwRQIgVZH2Z2KlyAVY2Q2aIQl0nsvN-OEN49wreFwiBqlxNj4CIQD5_JbpuBFJuf81I5J0FQPtXY-4RppWOPZBb-y6-rkIUQ&macaroon=AgEDbG5kAusBAwoQuA8OUMeQ8Fr2h-f65OdXdRIBMBoWCgdhZGRyZXNzEgRyZWFkEgV3cml0ZRoTCgRpbmZvEgRyZWFkEgV3cml0ZRoXCghpbnZvaWNlcxIEcmVhZBIFd3JpdGUaFAoIbWFjYXJvb24SCGdlbmVyYXRlGhYKB21lc3NhZ2USBHJlYWQSBXdyaXRlGhcKCG9mZmNoYWluEgRyZWFkEgV3cml0ZRoWCgdvbmNoYWluEgRyZWFkEgV3cml0ZRoUCgVwZWVycxIEcmVhZBIFd3JpdGUaGAoGc2lnbmVyEghnZW5lcmF0ZRIEcmVhZAAABiCYsRUoUWuAHAiCSLbBR7b_qULDSl64R8LIU2aqNIyQfA',
-      },
-      {
-        type: 'object',
-        name: 'Nested Stuff',
-        description: 'This is a nested thing metric',
-        value: [
-          {
-            type: 'string',
-            name: 'Last Name',
-            description: 'The last name of the user',
-            copyable: true,
-            qr: true,
-            masked: false,
-            value: 'Hill',
-          },
-          {
-            type: 'string',
-            name: 'Age',
-            description: 'The age of the user',
-            copyable: false,
-            qr: false,
-            masked: false,
-            value: '35',
-          },
-          {
-            type: 'string',
-            name: 'Password',
-            description: 'A secret password',
-            copyable: true,
-            qr: false,
-            masked: true,
-            value: 'password123',
-          },
-        ],
-      },
-      {
-        type: 'string',
-        name: 'Another Value',
-        description: 'Some more information about the service.',
-        copyable: false,
-        qr: true,
-        masked: false,
-        value: 'https://guessagain.com',
-      },
-    ],
+    title: 'New Password',
+    message:
+      'Action was run successfully and smoothly and fully and all is good on the western front.',
+    result: {
+      type: 'single',
+      copyable: true,
+      qr: true,
+      masked: true,
+      value: 'iwejdoiewdhbew',
+    },
+  }
+
+  export const ActionResGroup: RR.ActionRes = {
+    version: '1',
+    title: 'Properties',
+    message:
+      'Successfully retrieved properties. Here is a bunch of useful information about this service.',
+    result: {
+      type: 'group',
+      value: [
+        {
+          type: 'single',
+          name: 'LND Connect',
+          description: 'This is some information about the thing.',
+          copyable: true,
+          qr: true,
+          masked: true,
+          value:
+            'lndconnect://udlyfq2mxa4355pt7cqlrdipnvk2tsl4jtsdw7zaeekenufwcev2wlad.onion:10009?cert=MIICJTCCAcugAwIBAgIRAOyq85fqAiA3U3xOnwhH678wCgYIKoZIzj0EAwIwODEfMB0GAkUEChMWbG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEVMBMGA1UEAxMMNTc0OTkwMzIyYzZlMB4XDTIwMTAyNjA3MzEyN1oXDTIxMTIyMTA3MzEyN1owODEfMB0GA1UEChMWbG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEVMBMGA1UEAxMMNTc0OTkwMzIyYzZlMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEKqfhAMMZdY-eFnU5P4bGrQTSx0lo7m8u4V0yYkzUM6jlql_u31_mU2ovLTj56wnZApkEjoPl6fL2yasZA2wiy6OBtTCBsjAOBgNVHQ8BAf8EBAMCAqQwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0TAQH_BAUwAwEB_zAdBgNVHQ4EFgQUYQ9uIO6spltnVCx4rLFL5BvBF9IwWwYDVR0RBFQwUoIMNTc0OTkwMzIyYzZlgglsb2NhbGhvc3SCBHVuaXiCCnVuaXhwYWNrZXSCB2J1ZmNvbm6HBH8AAAGHEAAAAAAAAAAAAAAAAAAAAAGHBKwSAAswCgYIKoZIzj0EAwIDSAAwRQIgVZH2Z2KlyAVY2Q2aIQl0nsvN-OEN49wreFwiBqlxNj4CIQD5_JbpuBFJuf81I5J0FQPtXY-4RppWOPZBb-y6-rkIUQ&macaroon=AgEDbG5kAusBAwoQuA8OUMeQ8Fr2h-f65OdXdRIBMBoWCgdhZGRyZXNzEgRyZWFkEgV3cml0ZRoTCgRpbmZvEgRyZWFkEgV3cml0ZRoXCghpbnZvaWNlcxIEcmVhZBIFd3JpdGUaFAoIbWFjYXJvb24SCGdlbmVyYXRlGhYKB21lc3NhZ2USBHJlYWQSBXdyaXRlGhcKCG9mZmNoYWluEgRyZWFkEgV3cml0ZRoWCgdvbmNoYWluEgRyZWFkEgV3cml0ZRoUCgVwZWVycxIEcmVhZBIFd3JpdGUaGAoGc2lnbmVyEghnZW5lcmF0ZRIEcmVhZAAABiCYsRUoUWuAHAiCSLbBR7b_qULDSl64R8LIU2aqNIyQfA',
+        },
+        {
+          type: 'group',
+          name: 'Nested Stuff',
+          description: 'This is a nested thing metric',
+          value: [
+            {
+              type: 'single',
+              name: 'Last Name',
+              description: 'The last name of the user',
+              copyable: true,
+              qr: true,
+              masked: false,
+              value: 'Hill',
+            },
+            {
+              type: 'single',
+              name: 'Age',
+              description: 'The age of the user',
+              copyable: false,
+              qr: false,
+              masked: false,
+              value: '35',
+            },
+            {
+              type: 'single',
+              name: 'Password',
+              description: 'A secret password',
+              copyable: true,
+              qr: false,
+              masked: true,
+              value: 'password123',
+            },
+          ],
+        },
+        {
+          type: 'single',
+          name: 'Another Value',
+          description: 'Some more information about the service.',
+          copyable: false,
+          qr: true,
+          masked: false,
+          value: 'https://guessagain.com',
+        },
+      ],
+    },
  }

  export const getActionInputSpec = async (): Promise<IST.InputSpec> =>
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -784,7 +784,9 @@ export class MockApiService extends ApiService {
    await pauseFor(2000)

    if (params.actionId === 'properties') {
-      return Mock.ActionProperties
+      // return Mock.ActionResGroup
+      return Mock.ActionResMessage
+      // return Mock.ActionResSingle
    } else if (params.actionId === 'config') {
      const patch: RemoveOperation[] = [
        {
@@ -795,7 +797,8 @@ export class MockApiService extends ApiService {
      this.mockRevision(patch)
      return null
    } else {
-      return Mock.ActionRes
+      return Mock.ActionResMessage
+      // return Mock.ActionResSingle
    }
  }