Skip to content

Commit 68899ea

Browse files
committed
Merge branch 'dev' into dependabot-upgrades
2 parents 3e29c56 + 1c9ef08 commit 68899ea

File tree

14 files changed

+337
-395
lines changed

14 files changed

+337
-395
lines changed

.github/workflows/linter.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ jobs:
182182
REACT_APP_FEEDBACK_CAMPAIGN_ID: ${{ secrets.REACT_APP_FEEDBACK_CAMPAIGN_ID }},
183183
REACT_APP_NPS_FEEDBACK_CAMPAIGN_ID: ${{secrets.REACT_APP_NPS_FEEDBACK_CAMPAIGN_ID}}
184184
REACT_APP_INSTRUMENTATION_KEY: ${{ secrets.REACT_APP_STAGING_INSTRUMENTATION_KEY }}
185+
REACT_APP_CONNECTION_STRING: ${{ secrets.REACT_APP_STAGING_CONNECTION_STRING }}
185186
REACT_APP_NOMINATION_PERIOD: ${{secrets.REACT_APP_NOMINATION_PERIOD}}
186187
REACT_APP_COOLDOWN_PERIOD: ${{secrets.REACT_APP_COOLDOWN_PERIOD}}
187188
REACT_APP_USAGE_TIME: ${{secrets.REACT_APP_USAGE_TIME}}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Release Please for Master
2+
3+
on:
4+
push:
5+
branches:
6+
- dev # Trigger when dev is updated
7+
8+
jobs:
9+
release-please-master:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout repository
13+
uses: actions/checkout@v3
14+
15+
- name: Run Release Please for Master
16+
uses: googleapis/release-please-action@v4
17+
with:
18+
token: ${{ secrets.GITHUB_TOKEN }}
19+
target-branch: master
20+
config-file: release-please-config.json
21+
manifest-file: .release-please-manifest.json

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "10.5.1"
2+
".": "10.5.4"
33
}

CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,28 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [10.5.4](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/compare/v10.5.3...v10.5.4) (2025-03-05)
6+
7+
8+
### Bug Fixes
9+
10+
* add deploy to blob storage task ([#3694](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/issues/3694)) ([d5f3012](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/commit/d5f3012aee43e0bad418b24ce739fa94b8d61a97))
11+
12+
## [10.5.3](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/compare/v10.5.2...v10.5.3) (2025-02-28)
13+
14+
15+
### Bug Fixes
16+
17+
* use connectionString for NSP enabled components ([#3618](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/issues/3618)) ([0a15bbc](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/commit/0a15bbc347b6a29992298107843cafd21d2a4114))
18+
19+
## [10.5.2](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/compare/v10.5.1...v10.5.2) (2025-02-26)
20+
21+
22+
### Bug Fixes
23+
24+
* disable save all button after saving changes ([#3656](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/issues/3656)) ([7388fd7](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/commit/7388fd7c0c24f421b235327bf49f00c4e826d2d5))
25+
* make the dialog actions responsive in collections ([#3493](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/issues/3493)) ([b285bbd](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/commit/b285bbdd4f16f91947319b4597bd7ff075ef624f))
26+
527
## [10.5.1](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/compare/v10.5.0...v10.5.1) (2025-01-16)
628

729

__mocks__/@azure/msal-browser

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
export class PublicClientApplication {
2-
constructor(configuration: any) {
3-
// Mock constructor
4-
}
2+
constructor(configuration: any) {
3+
// Mock constructor
4+
}
55

6-
initialize() {
7-
// Mock initialize method
8-
}
6+
async initialize() {
7+
// Mock implementation of initialize
8+
return Promise.resolve();
9+
}
910

10-
acquireTokenSilent() {
11-
// Mock acquireTokenSilent method
12-
return Promise.resolve({ accessToken: 'mock-access-token' });
13-
}
11+
acquireTokenSilent() {
12+
// Mock acquireTokenSilent method
13+
return Promise.resolve({ accessToken: 'mock-access-token' });
14+
}
1415

15-
acquireTokenPopup() {
16-
// Mock acquireTokenPopup method
17-
return Promise.resolve({ accessToken: 'mock-access-token' });
18-
}
16+
acquireTokenPopup() {
17+
// Mock acquireTokenPopup method
18+
return Promise.resolve({ accessToken: 'mock-access-token' });
19+
}
1920

20-
loginPopup() {
21-
// Mock loginPopup method
22-
return Promise.resolve({ account: { username: 'mock-user' } });
23-
}
21+
loginPopup() {
22+
// Mock loginPopup method
23+
return Promise.resolve({ account: { username: 'mock-user' } });
24+
}
2425

25-
logout() {
26-
// Mock logout method
27-
return Promise.resolve();
28-
}
29-
}
26+
logout() {
27+
// Mock logout method
28+
return Promise.resolve();
29+
}
30+
}

0 commit comments

Comments
 (0)