Skip to content

Commit 3e6cfcb

Browse files
committed
Merge branch 'dev' into fix/telemetry
2 parents 5cda8e2 + e55b0c8 commit 3e6cfcb

File tree

14 files changed

+7076
-7043
lines changed

14 files changed

+7076
-7043
lines changed

.github/workflows/linter.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,8 @@ jobs:
161161
merge-multiple: true
162162

163163
- name: Run sonar cloud analysis
164-
uses: SonarSource/sonarcloud-github-action@master
164+
uses: SonarSource/sonarqube-scan-action@v5
165165
env:
166-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
167166
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
168167

169168
publish-preview-site:
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.2"
33
}

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
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.2](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/compare/v10.5.1...v10.5.2) (2025-02-26)
6+
7+
8+
### Bug Fixes
9+
10+
* 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))
11+
* 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))
12+
513
## [10.5.1](https://github.com/microsoftgraph/microsoft-graph-explorer-v4/compare/v10.5.0...v10.5.1) (2025-01-16)
614

715

__mocks__/@azure/msal-browser

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
export class PublicClientApplication {
2+
constructor(configuration: any) {
3+
// Mock constructor
4+
}
5+
6+
initialize() {
7+
// Mock initialize method
8+
}
9+
10+
acquireTokenSilent() {
11+
// Mock acquireTokenSilent method
12+
return Promise.resolve({ accessToken: 'mock-access-token' });
13+
}
14+
15+
acquireTokenPopup() {
16+
// Mock acquireTokenPopup method
17+
return Promise.resolve({ accessToken: 'mock-access-token' });
18+
}
19+
20+
loginPopup() {
21+
// Mock loginPopup method
22+
return Promise.resolve({ account: { username: 'mock-user' } });
23+
}
24+
25+
logout() {
26+
// Mock logout method
27+
return Promise.resolve();
28+
}
29+
}

azure-pipelines.yml

Lines changed: 1 addition & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -288,100 +288,4 @@ extends:
288288
parameters:
289289
directory: 'microsoft-graph-explorer-v4'
290290
repoName: ReleasePipelines
291-
dependsOn: ['Three']
292-
293-
- stage: DeployStaging
294-
condition: and(contains(variables['build.sourceBranch'], 'refs/heads/dev'), succeeded())
295-
dependsOn: BuildTestAndPublish
296-
jobs:
297-
- deployment: staging
298-
templateContext:
299-
type: releaseJob
300-
isProduction: false
301-
inputs:
302-
- input: pipelineArtifact
303-
artifactName: drop
304-
targetPath: '$(Build.ArtifactStagingDirectory)/drop'
305-
environment: graphexplorer-staging
306-
strategy:
307-
runOnce:
308-
deploy:
309-
steps:
310-
- task: AzureWebApp@1
311-
displayName: 'Deploy to graphTryIt-staging copy'
312-
inputs:
313-
azureSubscription: 'Federated GE Managed Identity Connection'
314-
appType: webApp
315-
appName: 'graphTryIt-staging'
316-
package: '$(Build.ArtifactStagingDirectory)/drop'
317-
318-
- task: AzureFileCopy@6
319-
displayName: 'Deploy to dev storage -tst'
320-
inputs:
321-
SourcePath: '$(Build.ArtifactStagingDirectory)/drop'
322-
azureSubscription: 'Federated GE Managed Identity Connection'
323-
Destination: AzureBlob
324-
storage: graphexplorerstorage
325-
ContainerName: deployments
326-
BlobPrefix: 'vendor/bower_components/explorer-v2/build'
327-
328-
- stage: DeployProduction
329-
condition: and(contains(variables['build.sourceBranch'], 'refs/heads/master'), succeeded())
330-
dependsOn: BuildTestAndPublish
331-
jobs:
332-
- deployment: production
333-
templateContext:
334-
type: releaseJob
335-
isProduction: true
336-
inputs:
337-
- input: pipelineArtifact
338-
artifactName: drop
339-
targetPath: '$(Build.ArtifactStagingDirectory)/drop'
340-
environment: graphexplorer-production
341-
strategy:
342-
runOnce:
343-
deploy:
344-
steps:
345-
- task: AzureWebApp@1
346-
displayName: 'Azure Web App Deploy: graphTryIt'
347-
inputs:
348-
azureSubscription: 'Federated GE Managed Identity Connection'
349-
appType: webApp
350-
appName: graphTryIt
351-
package: '$(Build.ArtifactStagingDirectory)/drop'
352-
353-
- task: AzureFileCopy@6
354-
displayName: 'Deploy to portal - staging'
355-
inputs:
356-
SourcePath: '$(Build.ArtifactStagingDirectory)/drop/*'
357-
azureSubscription: 'Federated GE-Portals Managed Identity Connection'
358-
Destination: AzureBlob
359-
storage: graphstagingblobstorage
360-
ContainerName: staging
361-
BlobPrefix: 'vendor/bower_components/explorer$(Build.BuildNumber)/build'
362-
363-
- task: AzureFileCopy@6
364-
displayName: 'Deploy to portal - production'
365-
inputs:
366-
SourcePath: '$(Build.ArtifactStagingDirectory)/drop/*'
367-
azureSubscription: 'Federated GE-Portals Managed Identity Connection'
368-
Destination: AzureBlob
369-
storage: graphprodblobstorage
370-
ContainerName: prod
371-
BlobPrefix: 'vendor/bower_components/explorer$(Build.BuildNumber)/build'
372-
373-
- task: ArchiveFiles@2
374-
displayName: 'Archive built assets'
375-
inputs:
376-
rootFolderOrFile: '$(Build.ArtifactStagingDirectory)/drop/'
377-
archiveFile: '$(Build.ArtifactStagingDirectory)/graph-explorer-$(Build.BuildNumber)-$(Build.BuildId).zip'
378-
379-
- task: GitHubRelease@1
380-
displayName: 'GitHub release (v$(Build.BuildNumber)-$(Build.BuildId))'
381-
inputs:
382-
gitHubConnection: 'GitHub - thewahome'
383-
action: edit
384-
tag: 'v$(Build.BuildNumber)'
385-
title: 'Graph Explorer - v$(Build.BuildNumber)'
386-
assets: '$(Build.ArtifactStagingDirectory)/*.zip'
387-
changeLogType: issueBased
291+
dependsOn: ['Three']

0 commit comments

Comments
 (0)