This is an automated email from the ASF dual-hosted git repository.
ako pushed a commit to branch ageviewer_go
in repository https://gitbox.apache.org/repos/asf/age.git
The following commit(s) were added to refs/heads/ageviewer_go by this push:
new 4baee9d7 establish connection to db (#968)
4baee9d7 is described below
commit 4baee9d7bca7d8e05072854bf82313ac4a4bd2db
Author: farakh-shahid <[email protected]>
AuthorDate: Fri Jun 9 12:12:47 2023 +0500
establish connection to db (#968)
---
.../src/features/database/DatabaseSlice.js | 42 +++++++++++++---------
age-viewer/frontend/wailsjs/go/main/App.d.ts | 0
age-viewer/frontend/wailsjs/go/main/App.js | 0
age-viewer/frontend/wailsjs/runtime/runtime.d.ts | 8 +++++
age-viewer/frontend/wailsjs/runtime/runtime.js | 14 ++++++--
age-viewer/go.mod | 3 +-
age-viewer/go.sum | 8 ++---
go.work.sum | 2 ++
8 files changed, 49 insertions(+), 28 deletions(-)
diff --git a/age-viewer/frontend/src/features/database/DatabaseSlice.js
b/age-viewer/frontend/src/features/database/DatabaseSlice.js
index 6fa6fade..16747f11 100644
--- a/age-viewer/frontend/src/features/database/DatabaseSlice.js
+++ b/age-viewer/frontend/src/features/database/DatabaseSlice.js
@@ -22,21 +22,27 @@ import { createAsyncThunk, createSlice } from
'@reduxjs/toolkit';
export const connectToDatabase = createAsyncThunk(
'database/connectToDatabase',
async (formData) => {
- formData.port = String(formData.port)
- console.log(formData);
+ formData.port = parseInt(formData.port);
+ const appendForm = {
+ ssl: 'disbale',
+ graph_init: false,
+ version: 11,
+ };
+
+ const updateFormData = { ...formData, ...appendForm };
+
try {
- const response = await fetch('http://localhost:3001/api/v1/db/connect',
- {
- method: 'POST',
- headers: {
- Accept: 'application/json',
- 'Content-Type': 'application/json',
- },
- body: JSON.stringify(formData),
- });
- if (response.ok) {
+ const response = await fetch('http://localhost:8080/connect', {
+ method: 'POST',
+ headers: {
+ Accept: 'application/json',
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(updateFormData),
+ });
+ if (response.ok) {
console.log(response);
- return await response.json();
+ return await response.json();
}
throw response;
} catch (error) {
@@ -48,14 +54,14 @@ export const connectToDatabase = createAsyncThunk(
};
throw errorDetail;
}
- },
+ }
);
export const disconnectToDatabase = createAsyncThunk(
'database/disconnectToDatabase',
async () => {
await fetch('http://localhost:3001/api/v1/db/disconnect');
- },
+ }
);
export const getConnectionStatus = createAsyncThunk(
@@ -63,7 +69,9 @@ export const getConnectionStatus = createAsyncThunk(
async () => {
try {
const response = await fetch('http://localhost:3001/api/v1/db');
- if (response.ok) { return await response.json(); }
+ if (response.ok) {
+ return await response.json();
+ }
throw response;
} catch (error) {
const errorJson = await error.json();
@@ -74,7 +82,7 @@ export const getConnectionStatus = createAsyncThunk(
};
throw errorDetail;
}
- },
+ }
);
const DatabaseSlice = createSlice({
diff --git a/age-viewer/frontend/wailsjs/go/main/App.d.ts
b/age-viewer/frontend/wailsjs/go/main/App.d.ts
old mode 100644
new mode 100755
diff --git a/age-viewer/frontend/wailsjs/go/main/App.js
b/age-viewer/frontend/wailsjs/go/main/App.js
old mode 100644
new mode 100755
diff --git a/age-viewer/frontend/wailsjs/runtime/runtime.d.ts
b/age-viewer/frontend/wailsjs/runtime/runtime.d.ts
index 40068079..a3723f94 100644
--- a/age-viewer/frontend/wailsjs/runtime/runtime.d.ts
+++ b/age-viewer/frontend/wailsjs/runtime/runtime.d.ts
@@ -225,3 +225,11 @@ export function Hide(): void;
// [Show](https://wails.io/docs/reference/runtime/intro#show)
// Shows the application.
export function Show(): void;
+
+//
[ClipboardGetText](https://wails.io/docs/reference/runtime/clipboard#clipboardgettext)
+// Returns the current text stored on clipboard
+export function ClipboardGetText(): Promise<string>;
+
+//
[ClipboardSetText](https://wails.io/docs/reference/runtime/clipboard#clipboardsettext)
+// Sets a text on the clipboard
+export function ClipboardSetText(text: string): Promise<boolean>;
diff --git a/age-viewer/frontend/wailsjs/runtime/runtime.js
b/age-viewer/frontend/wailsjs/runtime/runtime.js
index b9be812c..bd4f371a 100644
--- a/age-viewer/frontend/wailsjs/runtime/runtime.js
+++ b/age-viewer/frontend/wailsjs/runtime/runtime.js
@@ -37,11 +37,11 @@ export function LogFatal(message) {
}
export function EventsOnMultiple(eventName, callback, maxCallbacks) {
- window.runtime.EventsOnMultiple(eventName, callback, maxCallbacks);
+ return window.runtime.EventsOnMultiple(eventName, callback, maxCallbacks);
}
export function EventsOn(eventName, callback) {
- EventsOnMultiple(eventName, callback, -1);
+ return EventsOnMultiple(eventName, callback, -1);
}
export function EventsOff(eventName, ...additionalEventNames) {
@@ -49,7 +49,7 @@ export function EventsOff(eventName, ...additionalEventNames)
{
}
export function EventsOnce(eventName, callback) {
- EventsOnMultiple(eventName, callback, 1);
+ return EventsOnMultiple(eventName, callback, 1);
}
export function EventsEmit(eventName) {
@@ -192,3 +192,11 @@ export function Hide() {
export function Show() {
window.runtime.Show();
}
+
+export function ClipboardGetText() {
+ return window.runtime.ClipboardGetText();
+}
+
+export function ClipboardSetText(text) {
+ return window.runtime.ClipboardSetText(text);
+}
\ No newline at end of file
diff --git a/age-viewer/go.mod b/age-viewer/go.mod
index 988958a7..f9f9be66 100644
--- a/age-viewer/go.mod
+++ b/age-viewer/go.mod
@@ -7,7 +7,7 @@ require (
github.com/gin-contrib/cors v1.4.0
github.com/gin-gonic/gin v1.9.0
github.com/lib/pq v1.10.7
- github.com/wailsapp/wails/v2 v2.3.1
+ github.com/wailsapp/wails/v2 v2.5.0
)
require (
@@ -22,7 +22,6 @@ require (
github.com/go-playground/validator/v10 v10.11.2 // indirect
github.com/goccy/go-json v0.10.0 // indirect
github.com/google/uuid v1.1.2 // indirect
- github.com/imdario/mergo v0.3.12 // indirect
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e //
indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
diff --git a/age-viewer/go.sum b/age-viewer/go.sum
index 0f3af6c6..e05180ca 100644
--- a/age-viewer/go.sum
+++ b/age-viewer/go.sum
@@ -43,8 +43,6 @@ github.com/google/go-cmp v0.5.5/go.mod
h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/gofuzz v1.0.0/go.mod
h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
github.com/google/uuid v1.1.2/go.mod
h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/imdario/mergo v0.3.12
h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
-github.com/imdario/mergo v0.3.12/go.mod
h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e
h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck=
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod
h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
github.com/json-iterator/go v1.1.12
h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -126,8 +124,8 @@ github.com/valyala/fasttemplate v1.2.1
h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52
github.com/valyala/fasttemplate v1.2.1/go.mod
h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
github.com/wailsapp/mimetype v1.4.1
h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs=
github.com/wailsapp/mimetype v1.4.1/go.mod
h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o=
-github.com/wailsapp/wails/v2 v2.3.1
h1:ZJz+pyIBKyASkgO8JO31NuHO1gTTHmvwiHYHwei1CqM=
-github.com/wailsapp/wails/v2 v2.3.1/go.mod
h1:zlNLI0E2c2qA6miiuAHtp0Bac8FaGH0tlhA19OssR/8=
+github.com/wailsapp/wails/v2 v2.5.0
h1:Zqqi7SNppKO5nxuQUuvoNaw3Ak1pvDZuRrvv16R7T+M=
+github.com/wailsapp/wails/v2 v2.5.0/go.mod
h1:jbOZbcr/zm79PxXxAjP8UoVlDd9wLW3uDs+isIthDfs=
golang.org/x/arch v0.0.0-20210923205945-b76863e36670
h1:18EFjUmQOcUvxNYSkA6jO9VAiXCnxFY6NyDX0bHDmkU=
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod
h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod
h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -169,8 +167,6 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod
h1:Co6ibVJAznAaIkqp8
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod
h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod
h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod
h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/go.work.sum b/go.work.sum
index f8910557..d1953cb5 100644
--- a/go.work.sum
+++ b/go.work.sum
@@ -41,6 +41,7 @@ github.com/gookit/color v1.4.2/go.mod
h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQ
github.com/gookit/color v1.5.0/go.mod
h1:43aQb+Zerm/BWh2GnrgOQm7ffz7tvQXEKV6BFMl7wAo=
github.com/gookit/color v1.5.2/go.mod
h1:w8h4bGiHeeBpvQVePTutdbERIUf3oJE5lZ8HM0UgXyg=
github.com/gorilla/css v1.0.0/go.mod
h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
+github.com/imdario/mergo v0.3.12/go.mod
h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/jackmordaunt/icns v1.0.0/go.mod
h1:7TTQVEuGzVVfOPPlLNHJIkzA6CoV7aH1Dv9dW351oOo=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod
h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
github.com/jessevdk/go-flags v1.5.0/go.mod
h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
@@ -145,3 +146,4 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod
h1:Co6ibVJAznAaIkqp8
gopkg.in/warnings.v0 v0.1.2/go.mod
h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
