Skip to content

Commit 78bcab5

Browse files
marle3003marle3003
committed
improve dashboard links in tables
1 parent 39eb302 commit 78bcab5

40 files changed

Lines changed: 370 additions & 160 deletions

‎api/handler_http.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ type param struct {
5353
Required bool `json:"required"`
5454
Deprecated bool `json:"deprecated"`
5555
Style string `json:"style,omitempty"`
56-
Exploded bool `json:"exploded"`
56+
Explode bool `json:"explode"`
5757
AllowReserved bool `json:"allowReserved"`
5858
Schema *schema.Schema `json:"schema"`
5959
}
@@ -302,7 +302,7 @@ func getParameters(params openapi.Parameters) (result []param) {
302302
Required: p.Value.Required,
303303
Deprecated: p.Value.Deprecated,
304304
Style: p.Value.Style,
305-
Exploded: p.Value.IsExplode(),
305+
Explode: p.Value.IsExplode(),
306306
AllowReserved: p.Value.AllowReserved,
307307
Schema: p.Value.Schema,
308308
}

‎api/handler_http_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func TestHandler_Http(t *testing.T) {
119119
)
120120
},
121121
requestUrl: "http://foo.api/api/services/http/foo",
122-
responseBody: `{"name":"foo","servers":[{"url":"/","description":""}],"paths":[{"path":"/foo/{bar}","operations":[{"method":"get","deprecated":false,"parameters":[{"name":"bar","type":"path","required":true,"deprecated":false,"exploded":false,"allowReserved":false,"schema":{"type":"string"}}]}]}]`,
122+
responseBody: `{"name":"foo","servers":[{"url":"/","description":""}],"paths":[{"path":"/foo/{bar}","operations":[{"method":"get","deprecated":false,"parameters":[{"name":"bar","type":"path","required":true,"deprecated":false,"explode":false,"allowReserved":false,"schema":{"type":"string"}}]}]}]`,
123123
},
124124
{
125125
name: "get http service with requestBody",

‎examples/mokapi/http.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,11 @@ components:
122122
type: string
123123
explode:
124124
type: boolean
125+
allowReserved:
126+
type: boolean
125127
schema:
126128
$ref: 'schema.yml#/components/schemas/Schema'
129+
required: [ name, type, required, deprecated, explode, allowReserved ]
127130
Header:
128131
type: object
129132
properties:

‎examples/mokapi/services_http.js‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,11 @@ export let apps = [
156156
{
157157
type: "query",
158158
name: "$format",
159-
schema: {type: "string"}
159+
schema: {type: "string"},
160+
required: false,
161+
deprecated: false,
162+
explode: false,
163+
allowReserved: false
160164
}
161165
],
162166
requestBody: {
@@ -277,7 +281,10 @@ export let apps = [
277281
type: "integer",
278282
format: "int64"
279283
},
280-
required: true
284+
required: false,
285+
deprecated: false,
286+
explode: false,
287+
allowReserved: false
281288
},
282289
{
283290
name: "name",
@@ -286,7 +293,10 @@ export let apps = [
286293
schema: {
287294
type: "string"
288295
},
289-
required: false
296+
required: false,
297+
deprecated: false,
298+
explode: false,
299+
allowReserved: false
290300
},
291301
{
292302
name: "status",
@@ -295,7 +305,10 @@ export let apps = [
295305
schema: {
296306
type: "string"
297307
},
298-
required: false
308+
required: false,
309+
deprecated: false,
310+
explode: false,
311+
allowReserved: false
299312
}
300313
],
301314
responses: [
@@ -337,7 +350,10 @@ export let apps = [
337350
type: "integer",
338351
format: "int64"
339352
},
340-
required: true
353+
required: false,
354+
deprecated: false,
355+
explode: false,
356+
allowReserved: false
341357
}
342358
],
343359
responses: [
@@ -377,7 +393,9 @@ export let apps = [
377393
type: "string",
378394
enum: ["available", "pending", "sold"]
379395
}
380-
}
396+
},
397+
deprecated: false,
398+
allowReserved: false
381399
}
382400
],
383401
responses: [

‎webui/e2e/Dashboard/kafka/cluster.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ test('Visit Kafka cluster "Kafka World"', async ({ page }) => {
5555
const configs = useTable(page.getByRole('region', { name: "Configs" }).getByRole('table', { name: 'Configs' }), ['URL', 'Provider', 'Last Update'])
5656
const config = configs.getRow(1)
5757
await expect(config.getCellByName('URL')).toHaveText('https://www.example.com/foo/bar/communication/service/asyncapi.json')
58-
await expect(config.getCellByName('Provider')).toHaveText('http')
58+
await expect(config.getCellByName('Provider')).toHaveText('HTTP')
5959
await expect(config.getCellByName('Last Update')).toHaveText(formatDateTime('2023-02-15T08:49:25.482366+01:00'))
6060
})
6161

@@ -73,7 +73,7 @@ test('Visit Kafka cluster config file', async ({ page, context }) => {
7373
await page.getByRole('table', { name: 'Configs' }).getByText('https://www.example.com/foo/bar/communication/service/asyncapi.json').click()
7474

7575
await expect(page.getByLabel('URL')).toHaveText('https://www.example.com/foo/bar/communication/service/asyncapi.json')
76-
await expect(page.getByLabel('Provider')).toHaveText('http')
76+
await expect(page.getByLabel('Provider')).toHaveText('HTTP')
7777
await expect(page.getByLabel('Last Modified')).toHaveText(formatDateTime('2023-02-15T08:49:25.482366+01:00'))
7878

7979
const { test: testSourceView } = useSourceView(page.getByRole('region', { name: 'Content' }))

‎webui/e2e/components/dashboard.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ export function useDashboard(page: Page) {
1010
export function useDashboardTabs(page: Page) {
1111
return {
1212
overview: page.getByRole('link', { name: 'Overview' }),
13-
http: page.getByRole('link', { name: 'HTTP' }),
14-
kafka: page.getByRole('link', { name: 'Kafka' }),
15-
mail: page.getByRole('link', { name: 'Mail' }),
16-
ldap: page.getByRole('link', { name: 'LDAP' }),
17-
configs: page.getByRole('link', { name: 'Configs' }),
13+
http: page.getByRole('link', { name: 'HTTP', exact: true }),
14+
kafka: page.getByRole('link', { name: 'Kafka', exact: true }),
15+
mail: page.getByRole('link', { name: 'Mail', exact: true }),
16+
ldap: page.getByRole('link', { name: 'LDAP', exact: true }),
17+
configs: page.getByRole('link', { name: 'Configs', exact: true }),
1818
}
1919
}

‎webui/e2e/dashboard-demo/kafka.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ test('Visit Kafka Order Service', async ({ page }) => {
9696
await test.step('Verify Configs', async () => {
9797
const table = page.getByRole('table', { name: 'Configs' });
9898
await expect(await getCellByColumnName(table, 'URL')).toContainText('/webui/scripts/dashboard-demo/demo-configs/asyncapi.yaml');
99-
await expect(await getCellByColumnName(table, 'Provider')).toHaveText('file');
99+
await expect(await getCellByColumnName(table, 'Provider')).toHaveText('File');
100100
});
101101

102102
await test.step('Verify Recent Messages', async () => {

‎webui/e2e/dashboard-demo/ldap.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ test('Visit LDAP Testserver', async ({ page }) => {
3535

3636
const table = page.getByRole('table', { name: 'Configs' });
3737
await expect(await getCellByColumnName(table, 'URL')).toContainText('/webui/scripts/dashboard-demo/demo-configs/ldap.yaml');
38-
await expect(await getCellByColumnName(table, 'Provider')).toHaveText('file');
38+
await expect(await getCellByColumnName(table, 'Provider')).toHaveText('File');
3939

4040
});
4141

‎webui/e2e/dashboard-demo/mail.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ test('Visit Mail Server', async ({ page }) => {
168168
await page.getByRole('tab', { name: 'Configs' }).click();
169169
const table = page.getByRole('table', { name: 'Configs' });
170170
await expect(await getCellByColumnName(table, 'URL')).toContainText('/webui/scripts/dashboard-demo/demo-configs/mail.yaml');
171-
await expect(await getCellByColumnName(table, 'Provider')).toHaveText('file');
171+
await expect(await getCellByColumnName(table, 'Provider')).toHaveText('File');
172172

173173
});
174174
});

‎webui/e2e/dashboard-demo/petstore.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ test('Visit Petstore Demo', async ({ page }) => {
6060
await test.step('Verify Configs', async () => {
6161
const table = page.getByRole('table', { name: 'Configs' });
6262
await expect(await getCellByColumnName(table, 'URL')).toContainText('/webui/scripts/dashboard-demo/demo-configs/petstore.yaml');
63-
await expect(await getCellByColumnName(table, 'Provider')).toHaveText('file');
63+
await expect(await getCellByColumnName(table, 'Provider')).toHaveText('File');
6464
});
6565

6666
await test.step('Verify Recent Requests', async () => {

0 commit comments

Comments
 (0)