Skip to content

Commit 176f3b1

Browse files
anfibiacreativaShibanishibbassinedied
authored
chore: merge develop back into main (#148)
* chore: replaced property decorator for state where boolean * chore: update the import * chore: update vite config * chore: create a barrel for all exports * chore: add a teaser type * chore: add a barrel for core modules * chore: update global config according to teaser type * chore: move teaserlist styles to own file * chore: rename main styles import to chat * chore: remove default questions from main component * chore: create teaserlist component * chore: handle teaser click event on teaserlist * chore: handle teaserlist click on chat component * chore: remove debugging statements * chore: add tab component * chore: add tab component styles * chore: decouple tab component (thought process) * chore: add tab component to bundle * chore: change name of function to generic * chore: update styles from main restyling * chore: update styles for teaserlist * chore: add event cancellation from main * chore: add latest changes * fix: merge conflicts on error styles * chore: fix eslint errors * chore: refactor voice input into it's own component * chore: refactor tab component to be generic * chore: refactor markdown preview to it's own component * fix: fix follow up question click * test: add test for followup questions * test: iterate through all follow up questions * chore: use the imports for lit elements * feat: add support for pdf rendering in document-previewer * chore: correct teaserlist filename * chore: make tab content children of tab content * chore: move citations to their own component * chore: refactor the chat-thread-list into it's own component * fix: correct the action button disable * chore: refactor action buttons to it's own component * fix: exported name for chat-action * chore: delete old style file * chore: run github actions on develop * docs: update README.md with additional security measures * fix: fix typo Co-authored-by: Yohan Lasorsa <[email protected]> * fix(indexer): incorrect path on Windows (#141) * chore: cleanup unused webapp files. * fix: show which citation is being viewed across the chat-threads. * chore: refactor teaser list to be use passed in values * chore: clean up the styles * chore: cleanup tabs and teaser list * chore: move type to dev dependency * fix: use correct fields for developer settings * fix: tests to work with the correct overrides * fix: ask uses the prompt-template-* overrides only when it's not empty --------- Co-authored-by: Shibani <[email protected]> Co-authored-by: Shibani Basava (from Dev Box) <[email protected]> Co-authored-by: Yohan Lasorsa <[email protected]>
1 parent 793314b commit 176f3b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2135
-2060
lines changed

‎.github/workflows/azure-dev-validation.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: Validate AZD template
22
on:
33
push:
4-
branches: [main]
4+
branches: [main, develop]
55
paths:
66
- 'infra/**'
77
pull_request:
8-
branches: [main]
8+
branches: [main, develop]
99
paths:
1010
- 'infra/**'
1111

‎.github/workflows/azure-dev.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ name: Deploy on Azure
22
on:
33
workflow_dispatch:
44
push:
5-
# Run when commits are pushed to mainline branch (main or master)
5+
# Run when commits are pushed to mainline branch (main)
66
# Set this to the mainline branch you are using
77
branches:
88
- main
9-
- master
109

1110
# GitHub Actions workflow to deploy to Azure using azd
1211
# To configure required secrets for connecting to Azure, simply run `azd pipeline config`

‎.github/workflows/build-test.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ on:
33
push:
44
branches:
55
- main
6+
- develop
67
pull_request:
78
branches:
89
- main
10+
- develop
911

1012
jobs:
1113
test:

‎.github/workflows/playwright.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: Playwright Tests
22
on:
33
push:
4-
branches: [main]
4+
branches: [main, develop]
55
pull_request:
6-
branches: [main]
6+
branches: [main, develop]
77
jobs:
88
test:
99
timeout-minutes: 60

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ To then limit access to a specific set of users or groups, you can follow the st
228228

229229
### Additional security considerations
230230

231-
We recommend deploying additional security mechanisms. When applicable, consider setting up a [VNet](https://learn.microsoft.com/azure/virtual-network/virtual-networks-overview) or setting up a [Proxy Policy](https://learn.microsoft.com/azure/api-management/proxy-policy).
231+
We recommend deploying additional security mechanisms. When applicable, consider setting up a [VNet](https://learn.microsoft.com/azure/virtual-network/virtual-networks-overview) or setting up a [Proxy Policy](https://learn.microsoft.com/en-us/azure/api-management/proxy-policy).
232232

233233
### Enabling CORS for an alternate frontend
234234

‎package-lock.json

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/chat-component/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ <h1>Welcome to this Azure OpenAI JavaScript Chat Sample</h1>
4343
}
4444
}
4545
</style>
46-
<script type="module" src="/src/main.ts"></script>
46+
<script type="module" src="/src/index.ts"></script>
4747
</body>
4848
</html>

‎packages/chat-component/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"marked": "^9.1.5"
2828
},
2929
"devDependencies": {
30+
"@types/dom-speech-recognition": "^0.0.4",
3031
"@types/dompurify": "^3.0.3",
3132
"rimraf": "^5.0.1",
3233
"typescript": "^5.2.2",

‎packages/chat-component/src/components/chat-action-button.ts

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import { LitElement, html } from 'lit';
2+
import { customElement, property } from 'lit/decorators.js';
3+
4+
import { styles } from '../styles/chat-action-button.js';
5+
import { unsafeSVG } from 'lit/directives/unsafe-svg.js';
6+
7+
export interface ChatActionButton {
8+
label: string;
9+
svgIcon: string;
10+
isDisabled: boolean;
11+
id: string;
12+
}
13+
14+
@customElement('chat-action-button')
15+
export class ChatActionButtonComponent extends LitElement {
16+
static override styles = [styles];
17+
18+
@property({ type: String })
19+
label = '';
20+
21+
@property({ type: String })
22+
svgIcon = '';
23+
24+
@property({ type: Boolean })
25+
isDisabled = false;
26+
27+
@property({ type: String })
28+
actionId = '';
29+
30+
@property({ type: String })
31+
tooltip: string | undefined = undefined;
32+
33+
override render() {
34+
return html`
35+
<button title="${this.label}" data-testid="${this.actionId}" ?disabled="${this.isDisabled}">
36+
<span>${this.tooltip ?? this.label}</span>
37+
${unsafeSVG(this.svgIcon)}
38+
</button>
39+
`;
40+
}
41+
}

0 commit comments

Comments
 (0)