Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: upgrade instant tab for related samples #925

Merged
merged 3 commits into from
May 30, 2024
Merged

feat: upgrade instant tab for related samples #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3aae6f
feat: upgrade samples with instant tab
huimiu Jun 12, 2023
5f827da
revert: the manifest change
huimiu May 30, 2024
eee1e32
refactor: update local launch configuration for Blazor tab apps
huimiu May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 0 additions & 33 deletions basic-blazor-tab-app/BasicBlazorTabApp/Pages/TabConfig.razor
View file
Open in desktop

This file was deleted.

21 changes: 7 additions & 14 deletions basic-blazor-tab-app/BasicBlazorTabApp/appPackage/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.14/MicrosoftTeams.schema.json",
"manifestVersion": "1.14",
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.16/MicrosoftTeams.schema.json",
"manifestVersion": "1.16",
"version": "1.0.0",
"id": "${{TEAMS_APP_ID}}",
"packageName": "com.microsoft.teams.extension",
Expand All @@ -25,24 +25,17 @@
"accentColor": "#FFFFFF",
"bots": [],
"composeExtensions": [],
"configurableTabs": [
{
"configurationUrl": "${{TAB_ENDPOINT}}/config",
"canUpdateConfiguration": true,
"scopes": [
"team",
"groupchat"
]
}
],
"configurableTabs": [],
"staticTabs": [
{
"entityId": "index",
"name": "Personal Tab",
"name": "Home",
"contentUrl": "${{TAB_ENDPOINT}}/tab",
"websiteUrl": "${{TAB_ENDPOINT}}/tab",
"scopes": [
"personal"
"personal",
"groupChat",
"team"
]
}
],
Expand Down
2 changes: 1 addition & 1 deletion basic-blazor-tab-app/BasicBlazorTabApp/teamsapp.local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ provision:
- uses: script # Set TAB_DOMAIN for local launch
name: Set TAB_DOMAIN for local launch
with:
run: echo "::set-teamsfx-env TAB_DOMAIN=localhost:44302"
run: echo "::set-teamsfx-env TAB_DOMAIN=localhost"
- uses: script # Set TAB_ENDPOINT for local launch
name: Set TAB_ENDPOINT for local launch
with:
Expand Down
15 changes: 4 additions & 11 deletions developer-assist-dashboard/appPackage/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,17 @@
"accentColor": "#FFFFFF",
"bots": [],
"composeExtensions": [],
"configurableTabs": [
{
"configurationUrl": "${{TAB_ENDPOINT}}/index.html#/config",
"canUpdateConfiguration": true,
"scopes": [
"team",
"groupchat"
]
}
],
"configurableTabs": [],
"staticTabs": [
{
"entityId": "index0",
"name": "Dashboard",
"contentUrl": "${{TAB_ENDPOINT}}/index.html#/tab",
"websiteUrl": "${{TAB_ENDPOINT}}/index.html#/tab",
"scopes": [
"personal"
"personal",
"groupChat",
"team"
]
}
],
Expand Down
2 changes: 0 additions & 2 deletions developer-assist-dashboard/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { useTeamsUserCredential } from "@microsoft/teamsfx-react";

import SampleDashboard from "./dashboards/SampleDashboard";
import { TeamsFxContext } from "./internal/context";
import TabConfig from "./TabConfig";

/**
* The main app which handles the initialization and routing
Expand Down Expand Up @@ -48,7 +47,6 @@ export default function App() {
<Router>
<Routes>
<Route path="/tab" element={<SampleDashboard />} />
<Route path="/config" element={<TabConfig />} />
<Route path="*" element={<Navigate to={"/tab"} />} />
</Routes>
</Router>
Expand Down
54 changes: 0 additions & 54 deletions developer-assist-dashboard/src/TabConfig.tsx
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion developer-assist-dashboard/teamsapp.local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ provision:
- uses: script # Set TAB_DOMAIN and TAB_ENDPOINT for local launch
with:
run:
echo "::set-teamsfx-env TAB_DOMAIN=localhost:53000";
echo "::set-teamsfx-env TAB_DOMAIN=localhost";
echo "::set-teamsfx-env TAB_ENDPOINT=https://localhost:53000";
echo "::set-teamsfx-env FUNC_NAME=callService";
echo "::set-teamsfx-env FUNC_ENDPOINT=http://localhost:7071";
Expand Down
118 changes: 59 additions & 59 deletions graph-connector-app/appPackage/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
{
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.16/MicrosoftTeams.schema.json",
"manifestVersion": "1.16",
"version": "1.0.0",
"id": "${{TEAMS_APP_ID}}",
"packageName": "com.microsoft.teams.extension",
"developer": {
"name": "Teams App, Inc.",
"websiteUrl": "${{TAB_ENDPOINT}}",
"privacyUrl": "${{TAB_ENDPOINT}}/index.html#/privacy",
"termsOfUseUrl": "${{TAB_ENDPOINT}}/index.html#/termsofuse"
},
"icons": {
"color": "color.png",
"outline": "outline.png"
},
"name": {
"short": "graph-connector-app${{APP_NAME_SUFFIX}}",
"full": "Full name for graph-connector-app"
},
"description": {
"short": "Short description of graph-connector-app",
"full": "Full description of graph-connector-app"
},
"accentColor": "#FFFFFF",
"bots": [],
"composeExtensions": [],
"configurableTabs": [
{
"configurationUrl": "${{TAB_ENDPOINT}}/index.html#/config",
"canUpdateConfiguration": true,
"scopes": [
"team",
"groupchat"
]
}
],
"staticTabs": [
{
"entityId": "index",
"name": "Personal Tab",
"contentUrl": "${{TAB_ENDPOINT}}/index.html#/tab",
"websiteUrl": "${{TAB_ENDPOINT}}/index.html#/tab",
"scopes": [
"personal"
]
}
],
"permissions": [
"identity",
"messageTeamMembers"
],
"validDomains": [
"${{TAB_DOMAIN}}"
],
"webApplicationInfo": {
"id": "${{AAD_APP_CLIENT_ID}}",
"resource": "api://${{TAB_DOMAIN}}/${{AAD_APP_CLIENT_ID}}"
}
{
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.16/MicrosoftTeams.schema.json",
"manifestVersion": "1.16",
"version": "1.0.0",
"id": "${{TEAMS_APP_ID}}",
"packageName": "com.microsoft.teams.extension",
"developer": {
"name": "Teams App, Inc.",
"websiteUrl": "${{TAB_ENDPOINT}}",
"privacyUrl": "${{TAB_ENDPOINT}}/index.html#/privacy",
"termsOfUseUrl": "${{TAB_ENDPOINT}}/index.html#/termsofuse"
},
"icons": {
"color": "color.png",
"outline": "outline.png"
},
"name": {
"short": "graph-connector-app${{APP_NAME_SUFFIX}}",
"full": "Full name for graph-connector-app"
},
"description": {
"short": "Short description of graph-connector-app",
"full": "Full description of graph-connector-app"
},
"accentColor": "#FFFFFF",
"bots": [],
"composeExtensions": [],
"configurableTabs": [
{
"configurationUrl": "${{TAB_ENDPOINT}}/index.html#/config",
"canUpdateConfiguration": true,
"scopes": [
"team",
"groupchat"
]
}
],
"staticTabs": [
{
"entityId": "index",
"name": "Personal Tab",
"contentUrl": "${{TAB_ENDPOINT}}/index.html#/tab",
"websiteUrl": "${{TAB_ENDPOINT}}/index.html#/tab",
"scopes": [
"personal"
]
}
],
"permissions": [
"identity",
"messageTeamMembers"
],
"validDomains": [
"${{TAB_DOMAIN}}"
],
"webApplicationInfo": {
"id": "${{AAD_APP_CLIENT_ID}}",
"resource": "api://${{TAB_DOMAIN}}/${{AAD_APP_CLIENT_ID}}"
}
}
17 changes: 5 additions & 12 deletions hello-world-bot-with-tab/appPackage/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,24 +55,17 @@
}
],
"composeExtensions": [],
"configurableTabs": [
{
"configurationUrl": "${{TAB_ENDPOINT}}/index.html#/config",
"canUpdateConfiguration": true,
"scopes": [
"team",
"groupchat"
]
}
],
"configurableTabs": [],
"staticTabs": [
{
"entityId": "index0",
"name": "Personal Tab",
"name": "Home",
"contentUrl": "${{TAB_ENDPOINT}}/index.html#/tab",
"websiteUrl": "${{TAB_ENDPOINT}}/index.html#/tab",
"scopes": [
"personal"
"personal",
"groupChat",
"team"
]
}
],
Expand Down
2 changes: 0 additions & 2 deletions hello-world-bot-with-tab/tab/src/components/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { HashRouter as Router, Navigate, Route, Routes } from "react-router-dom"
import Privacy from "./Privacy";
import TermsOfUse from "./TermsOfUse";
import Tab from "./Tab";
import TabConfig from "./TabConfig";
import { useTeams } from "@microsoft/teamsfx-react";
import { app } from "@microsoft/teams-js";

Expand Down Expand Up @@ -36,7 +35,6 @@ export default function App() {
<Route path="/privacy" element={<Privacy />} />
<Route path="/termsofuse" element={<TermsOfUse />} />
<Route path="/tab" element={<Tab />} />
<Route path="/config" element={<TabConfig />} />
<Route path="*" element={<Navigate to={"/tab"} />}></Route>
</Routes>
</Router>
Expand Down