Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1f4c436
Workspace and Project creation moved to webview from wizard
lambrianmsft Sep 24, 2025
a8c768f
Corrected issues with project creation, workspace folder selection is…
lambrianmsft Sep 25, 2025
364a591
Removed unnecessary files, updated text for functions
lambrianmsft Sep 25, 2025
0b839a4
Updated text
lambrianmsft Sep 25, 2025
27cc054
Added workspace name validation to prevent overriding of existing dir…
lambrianmsft Sep 27, 2025
affb278
Remove unnecessary file
lambrianmsft Sep 29, 2025
6040f6e
Ensure function folder is populated if logic apps with functions is s…
lambrianmsft Sep 30, 2025
64ccc41
Patch for designer startup
lambrianmsft Sep 30, 2025
c5d7680
Migrated cloud to local to use webviews
lambrianmsft Oct 2, 2025
333aeb1
Delete unnecessary files
lambrianmsft Oct 2, 2025
0194bf0
Combined the webviews into one shared view
lambrianmsft Oct 2, 2025
31d6ff3
Refactored to reduce code redundancy
lambrianmsft Oct 7, 2025
457eda2
Merge branch 'main' into lambrian/webviews
lambrianmsft Oct 7, 2025
d1639fb
Follow existing patter of calling the .reducer and location of the store
lambrianmsft Oct 7, 2025
3b4a819
Merge branch 'main' into lambrian/webviews
lambrianmsft Oct 7, 2025
7307d85
Removed duplicate methods and using constants
lambrianmsft Oct 8, 2025
3733776
Updated to use constants
lambrianmsft Oct 8, 2025
e3c0776
Merge branch 'main' into lambrian/webviews
lambrianmsft Oct 8, 2025
74cbf33
Ensured more consistent naming, renamed from select to get, and added…
lambrianmsft Oct 8, 2025
7410a19
Merge branch 'main' into lambrian/webviews
lambrianmsft Oct 9, 2025
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
7 changes: 7 additions & 0 deletions apps/Standalone/src/vscode/VSCodeWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ import { Routes, Route, Navigate } from 'react-router-dom';
import { VSCodeExportWrapper } from './components/VSCodeExportWrapper';
import { VSCodeOverviewWrapper } from './components/VSCodeOverviewWrapper';
import { VSCodeNavigationWrapper } from './components/VSCodeNavigationWrapper';
import { VSCodeCreateLogicAppWrapper } from './components/VSCodeCreateLogicAppWrapper';
import { VSCodeCreateWorkspaceWrapper } from './components/VSCodeCreateWorkspaceWrapper';
import { VSCodeCreateWorkspaceStructureWrapper } from './components/VSCodeCreateWorkspaceStructureWrapper';
import { ThemeProvider } from '../../../vs-code-react/src/themeProvider';

export const VSCodeWrapper = () => {
Expand All @@ -14,6 +17,10 @@ export const VSCodeWrapper = () => {
<Route path="/" element={<Navigate to="/vscode/export" replace />} />
<Route path="/export/*" element={<VSCodeExportWrapper />} />
<Route path="/overview" element={<VSCodeOverviewWrapper />} />
<Route path="/createWorkspace" element={<VSCodeCreateWorkspaceWrapper />} />
<Route path="/createLogicApp" element={<VSCodeCreateLogicAppWrapper />} />
<Route path="/createWorkspaceStructure" element={<VSCodeCreateWorkspaceStructureWrapper />} />
<Route path="/createWorkspaceFromPackage" element={<VSCodeCreateWorkspaceStructureWrapper />} />
<Route path="*" element={<Navigate to="/vscode/export" replace />} />
</Routes>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import type React from 'react';
import { useEffect } from 'react';
import { CreateLogicApp } from '../../../../vs-code-react/src/app/createLogicApp/createLogicApp';
import { useDispatch } from 'react-redux';
import { initializeWorkflow } from '../../../../vs-code-react/src/state/WorkflowSlice';
import type { AppDispatch } from '../../../../vs-code-react/src/state/store';
import { VSCodeContextProvider } from '../providers/VSCodeContextProvider';
import { ReactQueryProvider } from '@microsoft/logic-apps-designer';
import { IntlProvider } from 'react-intl';
import '../utils/mockVSCodeApi';

const mockInitialData = {
apiVersion: '2018-07-01-preview',
baseUrl: 'https://management.azure.com',
accessToken: 'mock-access-token',
workflowProperties: {
name: 'test-workflow',
stateType: 'Stateful',
},
hostVersion: '4.0.0',
isLocal: true,
};

export const VSCodeCreateLogicAppWrapper: React.FC = () => {
const dispatch = useDispatch<AppDispatch>();

useEffect(() => {
dispatch(initializeWorkflow(mockInitialData));
}, [dispatch]);

return (
<IntlProvider
defaultLocale="en"
locale="en-US"
onError={(err) => {
if (err.code === 'MISSING_TRANSLATION') {
return;
}
console.warn('Intl error:', err);
}}
>
<ReactQueryProvider>
<VSCodeContextProvider>
<CreateLogicApp />
</VSCodeContextProvider>
</ReactQueryProvider>
</IntlProvider>
);
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import type React from 'react';
import { useEffect } from 'react';
import { CreateWorkspaceFromPackage } from '../../../../vs-code-react/src/app/createWorkspace/createWorkspace';
import { useDispatch } from 'react-redux';
import { initializeWorkflow } from '../../../../vs-code-react/src/state/WorkflowSlice';
import type { AppDispatch } from '../../../../vs-code-react/src/state/store';
import { VSCodeContextProvider } from '../providers/VSCodeContextProvider';
import { ReactQueryProvider } from '@microsoft/logic-apps-designer';
import { IntlProvider } from 'react-intl';
import '../utils/mockVSCodeApi';

const mockInitialData = {
apiVersion: '2018-07-01-preview',
baseUrl: 'https://management.azure.com',
accessToken: 'mock-access-token',
workflowProperties: {
name: 'test-workflow',
stateType: 'Stateful',
},
hostVersion: '4.0.0',
isLocal: true,
};

export const VSCodeCreateWorkspaceFromPackageWrapper: React.FC = () => {
const dispatch = useDispatch<AppDispatch>();

useEffect(() => {
dispatch(initializeWorkflow(mockInitialData));
}, [dispatch]);

return (
<IntlProvider
defaultLocale="en"
locale="en-US"
onError={(err) => {
if (err.code === 'MISSING_TRANSLATION') {
return;
}
console.warn('Intl error:', err);
}}
>
<ReactQueryProvider>
<VSCodeContextProvider>
<CreateWorkspaceFromPackage />
</VSCodeContextProvider>
</ReactQueryProvider>
</IntlProvider>
);
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import type React from 'react';
import { useEffect } from 'react';
import { CreateWorkspaceStructure } from '../../../../vs-code-react/src/app/createLogicApp/createWorkspaceStructure';
import { useDispatch } from 'react-redux';
import { initializeWorkflow } from '../../../../vs-code-react/src/state/WorkflowSlice';
import type { AppDispatch } from '../../../../vs-code-react/src/state/store';
import { VSCodeContextProvider } from '../providers/VSCodeContextProvider';
import { ReactQueryProvider } from '@microsoft/logic-apps-designer';
import { IntlProvider } from 'react-intl';
import '../utils/mockVSCodeApi';

const mockInitialData = {
apiVersion: '2018-07-01-preview',
baseUrl: 'https://management.azure.com',
accessToken: 'mock-access-token',
workflowProperties: {
name: 'test-workflow',
stateType: 'Stateful',
},
hostVersion: '4.0.0',
isLocal: true,
};

export const VSCodeCreateWorkspaceStructureWrapper: React.FC = () => {
const dispatch = useDispatch<AppDispatch>();

useEffect(() => {
dispatch(initializeWorkflow(mockInitialData));
}, [dispatch]);

return (
<IntlProvider
defaultLocale="en"
locale="en-US"
onError={(err) => {
if (err.code === 'MISSING_TRANSLATION') {
return;
}
console.warn('Intl error:', err);
}}
>
<ReactQueryProvider>
<VSCodeContextProvider>
<CreateWorkspaceStructure />
</VSCodeContextProvider>
</ReactQueryProvider>
</IntlProvider>
);
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import type React from 'react';
import { useEffect } from 'react';
import { CreateWorkspace } from '../../../../vs-code-react/src/app/createWorkspace/createWorkspace';
import { useDispatch } from 'react-redux';
import { initializeWorkflow } from '../../../../vs-code-react/src/state/WorkflowSlice';
import type { AppDispatch } from '../../../../vs-code-react/src/state/store';
import { VSCodeContextProvider } from '../providers/VSCodeContextProvider';
import { ReactQueryProvider } from '@microsoft/logic-apps-designer';
import { IntlProvider } from 'react-intl';
import '../utils/mockVSCodeApi';

const mockInitialData = {
apiVersion: '2018-07-01-preview',
baseUrl: 'https://management.azure.com',
accessToken: 'mock-access-token',
workflowProperties: {
name: 'test-workflow',
stateType: 'Stateful',
},
hostVersion: '4.0.0',
isLocal: true,
};

export const VSCodeCreateWorkspaceWrapper: React.FC = () => {
const dispatch = useDispatch<AppDispatch>();

useEffect(() => {
dispatch(initializeWorkflow(mockInitialData));
}, [dispatch]);

return (
<IntlProvider
defaultLocale="en"
locale="en-US"
onError={(err) => {
if (err.code === 'MISSING_TRANSLATION') {
return;
}
console.warn('Intl error:', err);
}}
>
<ReactQueryProvider>
<VSCodeContextProvider>
<CreateWorkspace />
</VSCodeContextProvider>
</ReactQueryProvider>
</IntlProvider>
);
};
18 changes: 18 additions & 0 deletions apps/Standalone/src/vscode/components/VSCodeNavigationWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,24 @@ export const VSCodeNavigationWrapper = () => {
<Link to="/vscode/export" className={`${styles.navLink} ${isActiveLink('/export') ? styles.activeLink : ''}`}>
Export
</Link>
<Link to="/vscode/createWorkspace" className={`${styles.navLink} ${isActiveLink('/createWorkspace') ? styles.activeLink : ''}`}>
Create Workspace
</Link>
<Link
to="/vscode/createWorkspaceFromPackage"
className={`${styles.navLink} ${isActiveLink('/createWorkspaceFromPackage') ? styles.activeLink : ''}`}
>
Create Workspace From Package
</Link>
<Link to="/vscode/createLogicApp" className={`${styles.navLink} ${isActiveLink('/createLogicApp') ? styles.activeLink : ''}`}>
Create Logic App
</Link>
<Link
to="/vscode/createWorkspaceStructure"
className={`${styles.navLink} ${isActiveLink('/createWorkspaceStructure') ? styles.activeLink : ''}`}
>
Create Workspace Structure
</Link>
<Link to="/vscode/overview" className={`${styles.navLink} ${isActiveLink('/overview') ? styles.activeLink : ''}`}>
Overview
</Link>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import * as parameterUtil from '../../utils/codeless/parameter';
import * as localSettingsUtil from '../../utils/appSettings/localSettings';
import * as parameterizerUtil from '../../utils/codeless/parameterizer';
import * as workspaceUtil from '../../utils/workspace';
import { localSettingsFileName } from '../../../constants';

describe('parameterizeConnections', () => {
const testContext: any = {
Expand Down Expand Up @@ -85,7 +86,7 @@ describe('parameterizeConnections', () => {
expect(parameterUtil.getParametersJson).toHaveBeenCalledWith(testLogicAppProjectPath1);
expect(localSettingsUtil.getLocalSettingsJson).toHaveBeenCalledWith(
testContext,
path.join(testLogicAppProjectPath1, 'local.settings.json')
path.join(testLogicAppProjectPath1, localSettingsFileName)
);
expect(parameterizerUtil.parameterizeConnection).toHaveBeenCalled();
expect(parameterUtil.saveWorkflowParameter).toHaveBeenCalledWith(testContext, testLogicAppProjectPath1, testParametersJson);
Expand Down
Loading
Loading