Skip to content

Commit

Permalink
Merge branch 'main' into ds/cl-506/angular-18
Browse files Browse the repository at this point in the history
  • Loading branch information
vleague2 authored Jan 6, 2025
2 parents 6173262 + 196c1e1 commit 662c24d
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1193,7 +1193,7 @@ jobs:
if: |
github.event_name != 'pull_request_target'
&& (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/rc' || github.ref == 'refs/heads/hotfix-rc-desktop')
uses: slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3 # v1.27.1
uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
with:
channel-id: C074F5UESQ0
payload: |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<bit-search
autocomplete="off"
[placeholder]="'search' | i18n"
[(ngModel)]="searchText"
(ngModelChange)="onSearchTextChanged()"
Expand Down
16 changes: 8 additions & 8 deletions apps/desktop/desktop_native/Cargo.lock

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

4 changes: 2 additions & 2 deletions apps/desktop/desktop_native/macos_provider/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ serde = { version = "1.0.205", features = ["derive"] }
serde_json = "1.0.122"
tokio = { version = "1.39.2", features = ["sync"] }
tokio-util = "0.7.11"
uniffi = { version = "0.28.0", features = ["cli"] }
uniffi = { version = "0.28.3", features = ["cli"] }

[target.'cfg(target_os = "macos")'.dependencies]
oslog = "0.2.0"

[build-dependencies]
uniffi = { version = "0.28.0", features = ["build"] }
uniffi = { version = "0.28.3", features = ["build"] }
2 changes: 1 addition & 1 deletion apps/desktop/desktop_native/napi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ tokio-stream = "=0.1.15"
windows-registry = "=0.3.0"

[build-dependencies]
napi-build = "=2.1.3"
napi-build = "=2.1.4"
2 changes: 1 addition & 1 deletion apps/desktop/desktop_native/objc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ tokio = "1.39.1"
core-foundation = "=0.10.0"

[build-dependencies]
cc = "1.0.104"
cc = "1.2.4"
glob = "0.3.1"
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,9 @@ export class EventsComponent extends BaseEventsComponent implements OnInit, OnDe

protected getUserName(r: EventResponse, userId: string) {
if (r.installationId != null) {
return `Installation: ${r.installationId}`;
return {
name: `Installation: ${r.installationId}`,
};
}

if (userId != null) {
Expand Down
1 change: 1 addition & 0 deletions libs/components/src/search/search.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@
(ngModelChange)="onChange($event)"
(blur)="onTouch()"
[disabled]="disabled"
[attr.autocomplete]="autocomplete"
/>
</div>
1 change: 1 addition & 0 deletions libs/components/src/search/search.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export class SearchComponent implements ControlValueAccessor, FocusableElement {

@Input() disabled: boolean;
@Input() placeholder: string;
@Input() autocomplete: string;

getFocusTarget() {
return this.input.nativeElement;
Expand Down

0 comments on commit 662c24d

Please sign in to comment.