From 463da7ca0a1721010b3320f067c5e0cb5df621eb Mon Sep 17 00:00:00 2001 From: ElinorW Date: Tue, 3 Dec 2024 11:48:33 +0300 Subject: [PATCH] Merge branch 'master' into release/10.5.0 --- azure-pipelines.yml | 104 +----------------- src/app/views/App.tsx | 3 +- .../resource-explorer/ResourceExplorer.tsx | 2 +- .../resource-explorer/ResourceLink.tsx | 2 +- 4 files changed, 5 insertions(+), 106 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 700b759d5..cd5e8e1db 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -279,106 +279,4 @@ extends: - output: pipelineArtifact displayName: 'Publish Artifact: drop' targetPath: "$(build.ArtifactStagingDirectory)/build" - artifactName: drop - - - template: pipelines/templates/checkout-and-copy-1es.yml@ReleasePipelines - parameters: - directory: 'microsoft-graph-explorer-v4' - repoName: ReleasePipelines - dependsOn: ['Three'] - - - stage: DeployStaging - condition: and(contains(variables['build.sourceBranch'], 'refs/heads/dev'), succeeded()) - dependsOn: BuildTestAndPublish - jobs: - - deployment: staging - templateContext: - type: releaseJob - isProduction: false - inputs: - - input: pipelineArtifact - artifactName: drop - targetPath: '$(Build.ArtifactStagingDirectory)/drop' - environment: graphexplorer-staging - strategy: - runOnce: - deploy: - steps: - - task: AzureWebApp@1 - displayName: 'Deploy to graphTryIt-staging copy' - inputs: - azureSubscription: 'Federated GE Managed Identity Connection' - appType: webApp - appName: 'graphTryIt-staging' - package: '$(Build.ArtifactStagingDirectory)/drop' - - - task: AzureFileCopy@6 - displayName: 'Deploy to dev storage -tst' - inputs: - SourcePath: '$(Build.ArtifactStagingDirectory)/drop' - azureSubscription: 'Federated GE Managed Identity Connection' - Destination: AzureBlob - storage: graphexplorerstorage - ContainerName: deployments - BlobPrefix: 'vendor/bower_components/explorer-v2/build' - - - stage: DeployProduction - condition: and(contains(variables['build.sourceBranch'], 'refs/heads/master'), succeeded()) - dependsOn: BuildTestAndPublish - jobs: - - deployment: production - templateContext: - type: releaseJob - isProduction: true - inputs: - - input: pipelineArtifact - artifactName: drop - targetPath: '$(Build.ArtifactStagingDirectory)/drop' - environment: graphexplorer-production - strategy: - runOnce: - deploy: - steps: - - task: AzureWebApp@1 - displayName: 'Azure Web App Deploy: graphTryIt' - inputs: - azureSubscription: 'Federated GE Managed Identity Connection' - appType: webApp - appName: graphTryIt - package: '$(Build.ArtifactStagingDirectory)/drop' - - - task: AzureFileCopy@6 - displayName: 'Deploy to portal - staging' - inputs: - SourcePath: '$(Build.ArtifactStagingDirectory)/drop/*' - azureSubscription: 'Federated GE-Portals Managed Identity Connection' - Destination: AzureBlob - storage: graphstagingblobstorage - ContainerName: staging - BlobPrefix: 'vendor/bower_components/explorer$(Build.BuildNumber)/build' - - - task: AzureFileCopy@6 - displayName: 'Deploy to portal - production' - inputs: - SourcePath: '$(Build.ArtifactStagingDirectory)/drop/*' - azureSubscription: 'Federated GE-Portals Managed Identity Connection' - Destination: AzureBlob - storage: graphprodblobstorage - ContainerName: prod - BlobPrefix: 'vendor/bower_components/explorer$(Build.BuildNumber)/build' - - - task: ArchiveFiles@2 - displayName: 'Archive built assets' - inputs: - rootFolderOrFile: '$(Build.ArtifactStagingDirectory)/drop/' - archiveFile: '$(Build.ArtifactStagingDirectory)/graph-explorer-$(Build.BuildNumber)-$(Build.BuildId).zip' - - - task: GitHubRelease@1 - displayName: 'GitHub release (v$(Build.BuildNumber)-$(Build.BuildId))' - inputs: - gitHubConnection: 'GitHub - thewahome' - action: edit - tag: 'v$(Build.BuildNumber)' - title: 'Graph Explorer - v$(Build.BuildNumber)' - assets: '$(Build.ArtifactStagingDirectory)/*.zip' - changeLogType: issueBased \ No newline at end of file + artifactName: drop \ No newline at end of file diff --git a/src/app/views/App.tsx b/src/app/views/App.tsx index ba1757a67..55fca1624 100644 --- a/src/app/views/App.tsx +++ b/src/app/views/App.tsx @@ -28,12 +28,13 @@ import { changeTheme } from '../services/slices/theme.slice'; import { parseSampleUrl } from '../utils/sample-url-generation'; import { substituteTokens } from '../utils/token-helpers'; import { translateMessage } from '../utils/translate-messages'; -import { StatusMessages, TermsOfUseMessage } from './app-sections'; +import { TermsOfUseMessage } from './app-sections'; import { headerMessaging } from './app-sections/HeaderMessaging'; import { appStyles } from './App.styles'; import { classNames } from './classnames'; import Notification from './common/banners/Notification'; import { KeyboardCopyEvent } from './common/copy-button/KeyboardCopyEvent'; +import { StatusMessages } from './common/lazy-loader/component-registry'; import PopupsWrapper from './common/popups/PopupsWrapper'; import { createShareLink } from './common/share'; import { MainHeader } from './main-header/MainHeader'; diff --git a/src/app/views/sidebar/resource-explorer/ResourceExplorer.tsx b/src/app/views/sidebar/resource-explorer/ResourceExplorer.tsx index a78fd3ae9..defd2fdb8 100644 --- a/src/app/views/sidebar/resource-explorer/ResourceExplorer.tsx +++ b/src/app/views/sidebar/resource-explorer/ResourceExplorer.tsx @@ -44,7 +44,7 @@ const UnstyledResourceExplorer = (props: any) => { ? data[version].children : []; const [searchText, setSearchText] = useState(''); - const filteredPayload = searchText ? searchResources(resourcesToUse, searchText) : resourcesToUse; + const filteredPayload = searchText ? searchResources(resourcesToUse!, searchText) : resourcesToUse!; const navigationGroup = createResourcesList(filteredPayload, version, searchText); const [items, setItems] = useState(navigationGroup); const { show: previewCollection } = usePopups('preview-collection', 'panel'); diff --git a/src/app/views/sidebar/resource-explorer/ResourceLink.tsx b/src/app/views/sidebar/resource-explorer/ResourceLink.tsx index b9c5b46bb..ce485473d 100644 --- a/src/app/views/sidebar/resource-explorer/ResourceLink.tsx +++ b/src/app/views/sidebar/resource-explorer/ResourceLink.tsx @@ -6,7 +6,7 @@ import { CSSProperties, useEffect } from 'react'; import { useAppSelector } from '../../../../store'; import { componentNames, eventTypes, telemetry } from '../../../../telemetry'; -import { IResourceLink, ResourceOptions } from '../../../../types/resources'; +import { Collection, IResourceLink, ResourceOptions } from '../../../../types/resources'; import { validateExternalLink } from '../../../utils/external-link-validation'; import { translateMessage } from '../../../utils/translate-messages'; import { existsInCollection, setExisting } from './resourcelink.utils';