Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/pipelines/apiview-review-gen-javascript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ parameters:
default: '[{"ReviewID":"<reviewid>","RevisionID":"<revisionId>","FileID":"<fileid>","FileName":"<fileName>"}]'
- name: APIViewURL
type: string
default: 'https://apiview.org'
default: 'https://apiview.dev'
- name: StorageContainerUrl
type: string
default: ''
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/apiview-review-gen-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ parameters:
default: '[{"ReviewID":"<reviewid>","RevisionID":"<revisionId>","FileID":"<fileid>","FileName":"<fileName>"}]'
- name: APIViewURL
type: string
default: 'https://apiview.org'
default: 'https://apiview.dev'
- name: StorageContainerUrl
type: string
default: ''
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/apiview-review-gen-typespec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ parameters:
default: '[{"ReviewID":"<reviewid>","RevisionID":"<revisionId>","SourceRepoName":"<RepoName>","FileName":"<fileName>","SourceBranchName":"<SourceBranchName>"}]'
- name: APIViewURL
type: string
default: 'https://apiview.org'
default: 'https://apiview.dev'

pool:
name: azsdk-pool
Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/Apiview-Update-Generated-Review.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ param (
[string]$BuildId,
[string]$RepoName = "azure/azure-sdk-tools",
[string]$ArtifactName = "apiview",
[string]$ApiviewUpdateUrl = "https://apiview.org/review/UpdateApiReview"
[string]$ApiviewUpdateUrl = "https://apiview.dev/review/UpdateApiReview"
)

####################################################################################################################
Expand Down
2 changes: 1 addition & 1 deletion packages/python-packages/apiview-copilot/src/_apiview.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ async def send_request(self, endpoint: str):
endpoint = endpoint[1:]

apiview_endpoints = {
"production": "https://apiview.org",
"production": "https://apiview.dev",
"staging": "https://apiviewstagingtest.com",
}
endpoint_root = apiview_endpoints.get(self.environment)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ public async Task OnGetAsync_WhenAuthorized_WithExternalUrl_RedirectsToRoot()
[Fact]
public async Task OnGetAsync_WhenAuthorized_WithAllowedOrigin_RedirectsToReturnUrl()
{
_pageModel.ReturnUrl = "https://spa.apiview.org/Reviews";
_mockUrlHelper.Setup(u => u.IsLocalUrl("https://spa.apiview.org/Reviews")).Returns(false);
_pageModel.ReturnUrl = "https://spa.apiview.dev/Reviews";
_mockUrlHelper.Setup(u => u.IsLocalUrl("https://spa.apiview.dev/Reviews")).Returns(false);
_mockEnvironment.SetupGet(e => e.EnvironmentName).Returns(Environments.Development);
_mockAuthorizationService
.Setup(a => a.AuthorizeAsync(_testUser, null, Startup.RequireOrganizationPolicy))
Expand All @@ -97,7 +97,7 @@ public async Task OnGetAsync_WhenAuthorized_WithAllowedOrigin_RedirectsToReturnU
IActionResult result = await _pageModel.OnGetAsync();
result.Should().BeOfType<RedirectResult>();
RedirectResult redirectResult = result as RedirectResult;
redirectResult!.Url.Should().Be("https://spa.apiview.org/Reviews");
redirectResult!.Url.Should().Be("https://spa.apiview.dev/Reviews");
}

[Fact]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,43 +15,43 @@ test.describe('getReviewAndRevisionIdFromUrl should return valid review and revi
var expectedResults = [
{
title: 'older revision returns correct values',
href: 'https://apiview.org/Assemblies/Review/b08a59aad6fe47f1949b54a531e67fa9?revisionId=ae4bb4afdc104c07a0f0058e0c133b4f&doc=False',
href: 'https://apiview.dev/Assemblies/Review/b08a59aad6fe47f1949b54a531e67fa9?revisionId=ae4bb4afdc104c07a0f0058e0c133b4f&doc=False',
reviewId: 'b08a59aad6fe47f1949b54a531e67fa9',
revisionId: 'ae4bb4afdc104c07a0f0058e0c133b4f',
},
{
title: 'older revision returns correct values 2',
href: 'https://apiview.org/Assemblies/Review/0ab7afb3131d4eacb1bfc1b0230fece8?revisionId=e822cfe035b148d2999a57e3e6b07460&doc=False',
href: 'https://apiview.dev/Assemblies/Review/0ab7afb3131d4eacb1bfc1b0230fece8?revisionId=e822cfe035b148d2999a57e3e6b07460&doc=False',
reviewId: '0ab7afb3131d4eacb1bfc1b0230fece8',
revisionId: 'e822cfe035b148d2999a57e3e6b07460',
},
{
title: 'latest revision returns correct reviewId and undefined revisionId',
href: 'https://apiview.org/Assemblies/Review/7674e7e8fdd0496f80b29127673928ec',
href: 'https://apiview.dev/Assemblies/Review/7674e7e8fdd0496f80b29127673928ec',
reviewId: '7674e7e8fdd0496f80b29127673928ec',
revisionId: undefined,
},
{
title: 'latest revision returns correct reviewId and undefined revisionId 2',
href: 'https://apiview.org/Assemblies/Review/0ab7afb3131d4eacb1bfc1b0230fece8',
href: 'https://apiview.dev/Assemblies/Review/0ab7afb3131d4eacb1bfc1b0230fece8',
reviewId: '0ab7afb3131d4eacb1bfc1b0230fece8',
revisionId: undefined,
},
{
title: 'review conversation page returns its reviewId',
href: 'https://apiview.org/Assemblies/Conversation/7c1724b222bd4a49bfeba6100d77297e',
href: 'https://apiview.dev/Assemblies/Conversation/7c1724b222bd4a49bfeba6100d77297e',
reviewId: '7c1724b222bd4a49bfeba6100d77297e',
revisionId: undefined,
},
{
title: 'review revisions page returns its reviewId',
href: 'https://apiview.org/Assemblies/Revisions/7c1724b222bd4a49bfeba6100d77297e',
href: 'https://apiview.dev/Assemblies/Revisions/7c1724b222bd4a49bfeba6100d77297e',
reviewId: '7c1724b222bd4a49bfeba6100d77297e',
revisionId: undefined,
},
{
title: 'review usage samples page returns its reviewId',
href: 'https://apiview.org/Assemblies/Samples/7c1724b222bd4a49bfeba6100d77297e',
href: 'https://apiview.dev/Assemblies/Samples/7c1724b222bd4a49bfeba6100d77297e',
reviewId: '7c1724b222bd4a49bfeba6100d77297e',
revisionId: undefined,
},
Expand All @@ -69,19 +69,19 @@ test.describe('getReviewAndRevisionIdFromUrl should return valid review and revi
var nonReviewExpectedResults = [
{
title: 'landing',
href: 'https://apiview.org/',
href: 'https://apiview.dev/',
},
{
title: 'login',
href: 'https://apiview.org/Login',
href: 'https://apiview.dev/Login',
},
{
title: 'profile',
href: 'https://apiview.org/Assemblies/Profile/yeojunh',
href: 'https://apiview.dev/Assemblies/Profile/yeojunh',
},
{
title: 'review filter',
href: 'https://apiview.org/?languages=C%252B%252B&state=Closed&state=Open&status=Approved&type=Automatic&type=Manual&type=PullRequest&pageNo=1&pageSize=50',
href: 'https://apiview.dev/?languages=C%252B%252B&state=Closed&state=Open&status=Approved&type=Automatic&type=Manual&type=PullRequest&pageNo=1&pageSize=50',
},
{
title: 'requested reviews',
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet/APIView/APIViewWeb/Helpers/URlHelpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public static List<string> GetAllowedOrigins()
return new List<string>() {
"https://spa.apiviewuxtest.com",
"https://spa.apiviewstagingtest.com",
"https://spa.apiview.org"
"https://spa.apiview.dev"
};
}

Expand Down
4 changes: 2 additions & 2 deletions src/dotnet/APIView/APIViewWeb/Pages/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="utf-8" />
<meta name="google" content="notranslate" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>@ViewData["Title"] - apiview.org</title>
<title>@ViewData["Title"] - apiview.dev</title>

<environment include="Development">
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
Expand Down Expand Up @@ -39,7 +39,7 @@
<header>
<nav class="navbar navbar-expand-sm navbar-toggleable-sm main-nav-cst-theme">
<div class="container-fluid">
<a href="/" class="navbar-brand" data-clarity-region="apiview-home-logo"><img id="apiview-logo" alt="apiview-logo" src="~/icons/apiview.png" />apiview.org</a>
<a href="/" class="navbar-brand" data-clarity-region="apiview-home-logo"><img id="apiview-logo" alt="apiview-logo" src="~/icons/apiview.png" />apiview.dev</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
Expand Down
4 changes: 2 additions & 2 deletions src/dotnet/APIView/APIViewWeb/web.config
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
<conditions logicalGrouping="MatchAny">
<add input="{HTTP_HOST}" pattern="^apiview\.azurewebsites\.net$" />
</conditions>
<action type="Redirect" url="https://apiview.org/{R:0}" />
<action type="Redirect" url="https://apiview.dev/{R:0}" />
</rule>
<rule name="Rewrite root SPA requests for staging instance">
<match url="^((?!spa/).*)$" />
<conditions logicalGrouping="MatchAll">
<add input="{HTTP_HOST}" pattern="^(spa\.apiviewuxtest\.com|spa\.apiview\.org|spa\.apiviewstagingtest\.com)$" />
<add input="{HTTP_HOST}" pattern="^(spa\.apiviewuxtest\.com|spa\.apiview\.dev|spa\.apiviewstagingtest\.com)$" />
<add input="{REQUEST_FILENAME}" pattern="isFile" negate="true" />
<add input="{REQUEST_FILENAME}" pattern="isDirectory" negate="true" />
</conditions>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<nav class="navbar navbar-expand-sm navbar-toggleable-sm main-nav-cst-theme">
<div class="container-fluid">
<a href="/" class="navbar-brand"><img id="apiview-logo" alt="apiview-logo" src="{{assetsPath}}/images/apiview.png" />apiview.org</a>
<a href="/" class="navbar-brand"><img id="apiview-logo" alt="apiview-logo" src="{{assetsPath}}/images/apiview.png" />apiview.dev</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
Expand Down
4 changes: 2 additions & 2 deletions src/dotnet/APIView/ClientSPA/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

<!-- Microsoft Clarity Analytics -->
<script type="text/javascript">
// Only load Clarity in production (apiview.org)
// Only load Clarity in production (apiview.dev)
const hostname = window.location.hostname;
const isProduction = hostname === 'apiview.org' || hostname.endsWith('.apiview.org');
const isProduction = hostname === 'apiview.dev' || hostname.endsWith('.apiview.dev');

if (isProduction) {
(function(c,l,a,r,i,t,y){
Expand Down
6 changes: 3 additions & 3 deletions src/dotnet/APIView/apiview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -469,11 +469,11 @@ extends:

variables:
- name: 'apiUrl'
value: 'https://apiview.org/api/'
value: 'https://apiview.dev/api/'
- name: 'hubUrl'
value: 'https://apiview.org/hubs/'
value: 'https://apiview.dev/hubs/'
- name: 'webAppUrl'
value: 'https://apiview.org/'
value: 'https://apiview.dev/'

jobs:
- deployment: Publish_to_Prod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public static class APIViewConfiguration

public static readonly Dictionary<string, string> BaseUrlEndpoints = new()
{
{ "production", "https://apiview.org" },
{ "production", "https://apiview.dev" },
{ "staging", "https://apiviewstagingtest.com" },
{ "local", "http://localhost:5000" }
};
Expand Down
Loading