Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"main": "dist/cjs/index.js",
"types": "dist/index.d.ts",
"dependencies": {
"@perses-dev/spec": "0.2.0-beta.3",
"@perses-dev/spec": "0.2.0-beta.6",
"zod": "^3.21.4"
},
"scripts": {
Expand Down
6 changes: 0 additions & 6 deletions client/src/model/http.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,4 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import { HTTPProxy } from '@perses-dev/spec';

export type RequestHeaders = Record<string, string>;
export interface HTTPDatasourceSpec {

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have removed that because this is part of the spec now

directUrl?: string;
proxy?: HTTPProxy;
}
2 changes: 1 addition & 1 deletion components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@date-fns/tz": "^1.4.1",
"@fontsource/inter": "^5.0.0",
"@mui/x-date-pickers": "^7.23.1",
"@perses-dev/spec": "0.2.0-beta.3",
"@perses-dev/spec": "0.2.0-beta.6",
"@perses-dev/client": "0.54.0-beta.7",
"numbro": "^2.3.6",
"@tanstack/match-sorter-utils": "^8.19.4",
Expand Down
6 changes: 3 additions & 3 deletions cue/common/proxy/proxy.cue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
package proxy

import (
specCommon "github.com/perses/spec/cue/common"
"github.com/perses/spec/cue/datasource"
httpProxy "github.com/perses/spec/cue/datasource/proxy/http"
sqlProxy "github.com/perses/spec/cue/datasource/proxy/sql"
)
Expand All @@ -31,12 +31,12 @@ import (

#HTTPProxy: httpProxy.#Proxy

#baseHTTPDatasourceSpec: { directUrl: specCommon.#URL } | { proxy: #HTTPProxy }
#baseHTTPDatasourceSpec: datasource.#HTTPDatasourceSpec

#MySQL: sqlProxy.#MySQLConfig

#Postgres: sqlProxy.#PostgresConfig

#SQLProxy: sqlProxy.#Proxy

#baseSQLDatasourceSpec: { driver: "mysql" | "mariadb" | "postgres", host: string, database: string } | { proxy: #SQLProxy }
#baseSQLDatasourceSpec: datasource.#SQLDatasourceSpec
2 changes: 1 addition & 1 deletion cue/cue.mod/module.cue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ source: {
}
deps: {
"github.com/perses/spec/cue@v0": {
v: "v0.2.0-beta.3"
v: "v0.2.0-beta.6"
default: true
}
}
2 changes: 1 addition & 1 deletion dashboards/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"dependencies": {
"@perses-dev/components": "0.54.0-beta.7",
"@perses-dev/plugin-system": "0.54.0-beta.7",
"@perses-dev/spec": "0.2.0-beta.3",
"@perses-dev/spec": "0.2.0-beta.6",
"@perses-dev/client": "0.54.0-beta.7",
"@tanstack/hotkeys": "^0.8.0",
"@tanstack/react-hotkeys": "^0.9.1",
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion plugin-system/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@module-federation/enhanced": "^2.3.3",
"@perses-dev/components": "0.54.0-beta.7",
"@perses-dev/core": "0.53.0",
"@perses-dev/spec": "0.2.0-beta.3",
"@perses-dev/spec": "0.2.0-beta.6",
"@perses-dev/client": "0.54.0-beta.7",
"date-fns": "^4.1.0",
"date-fns-tz": "^3.2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { render, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { FormProvider, useForm } from 'react-hook-form';
import { ReactElement } from 'react';
import { HTTPDatasourceSpec } from '@perses-dev/client';
import { HTTPDatasourceSpec } from '@perses-dev/spec';
import { HTTPSettingsEditor } from './HTTPSettingsEditor';

describe('HTTPSettingsEditor - Request Headers', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
import { Grid, IconButton, MenuItem, TextField, Typography } from '@mui/material';
import React, { Fragment, ReactElement, useState } from 'react';
import { produce } from 'immer';
import { Controller, useForm, useFieldArray } from 'react-hook-form';
import { Controller, useFieldArray, useForm } from 'react-hook-form';
import MinusIcon from 'mdi-material-ui/Minus';
import PlusIcon from 'mdi-material-ui/Plus';
import { HTTPDatasourceSpec, RequestHeaders } from '@perses-dev/client';
import { HTTPDatasourceSpec } from '@perses-dev/spec';
import { RequestHeaders } from '@perses-dev/client';
import { OptionsEditorRadios } from '../OptionsEditorRadios';

type HeaderEntry = {
Expand Down
Loading