Skip to content

Commit 261a71b

Browse files
mkamranhamidSaraVieira
authored andcommitted
🔨 Refactored and 🧠 Overmind ...Dependencies/elements and ...Dependencies/index (#2670)
* refactored ...Dependencies/elements and ...Dependencies/index; updated NotOwnedSandboxInfo/NotOwnedSandboxInfo * changed the import order * Fix order
1 parent 72a4b5d commit 261a71b

File tree

4 files changed

+110
-113
lines changed

4 files changed

+110
-113
lines changed

‎packages/app/src/app/pages/Sandbox/Editor/Workspace/Dependencies/index.js‎

Lines changed: 0 additions & 112 deletions
This file was deleted.
Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
// @flow
2+
3+
import Margin from '@codesandbox/common/lib/components/spacing/Margin';
4+
import getDefinition from '@codesandbox/common/lib/templates';
5+
import React, { FunctionComponent } from 'react';
6+
import { useOvermind } from 'app/overmind';
7+
import { WorkspaceSubtitle } from '../elements';
8+
9+
import AddVersion from './AddVersion';
10+
import { VersionEntry } from './VersionEntry';
11+
import AddResource from './AddResource';
12+
import ExternalResource from './ExternalResource';
13+
14+
import { ErrorMessage } from './elements';
15+
16+
export const Dependencies: FunctionComponent = () => {
17+
const {
18+
state: { editor },
19+
actions: { workspace, editor: editorSignals },
20+
} = useOvermind();
21+
22+
const sandbox = editor.currentSandbox;
23+
24+
if (!editor.parsedConfigurations.package) {
25+
return <ErrorMessage>Unable to find package.json</ErrorMessage>;
26+
}
27+
28+
const { parsed, error } = editor.parsedConfigurations.package;
29+
30+
if (error) {
31+
return (
32+
<ErrorMessage>
33+
We weren
34+
{"'"}t able to parse the package.json
35+
</ErrorMessage>
36+
);
37+
}
38+
39+
const dependencies = parsed.dependencies || {};
40+
// const devDependencies = parsed.devDependencies || {};
41+
42+
const templateDefinition = getDefinition(sandbox.template);
43+
44+
return (
45+
<div>
46+
<Margin bottom={0}>
47+
{Object.keys(dependencies)
48+
.sort()
49+
.map(dep => (
50+
<VersionEntry
51+
key={dep}
52+
dependencies={dependencies}
53+
dependency={dep}
54+
onRemove={name => editorSignals.npmDependencyRemoved({ name })}
55+
onRefresh={(name, version) =>
56+
editorSignals.addNpmDependency({
57+
name,
58+
version,
59+
})
60+
}
61+
/>
62+
))}
63+
{/* {Object.keys(devDependencies).length > 0 && (
64+
<WorkspaceSubtitle>Development Dependencies</WorkspaceSubtitle>
65+
)}
66+
{Object.keys(devDependencies)
67+
.sort()
68+
.map(dep => (
69+
<VersionEntry
70+
key={dep}
71+
dependencies={devDependencies}
72+
dependency={dep}
73+
onRemove={name => signals.editor.npmDependencyRemoved({ name })}
74+
onRefresh={(name, version) =>
75+
signals.editor.addNpmDependency({
76+
name,
77+
version,
78+
})
79+
}
80+
/>
81+
))} */}
82+
<AddVersion>Add Dependency</AddVersion>
83+
</Margin>
84+
{templateDefinition.externalResourcesEnabled && (
85+
<div>
86+
<WorkspaceSubtitle>External Resources</WorkspaceSubtitle>
87+
{(sandbox.externalResources || []).map(resource => (
88+
<ExternalResource
89+
key={resource}
90+
resource={resource}
91+
removeResource={() =>
92+
workspace.externalResourceRemoved({
93+
resource,
94+
})
95+
}
96+
/>
97+
))}
98+
<AddResource
99+
addResource={resource =>
100+
workspace.externalResourceAdded({
101+
resource,
102+
})
103+
}
104+
/>
105+
</div>
106+
)}
107+
</div>
108+
);
109+
};

‎packages/app/src/app/pages/Sandbox/Editor/Workspace/items/NotOwnedSandboxInfo/NotOwnedSandboxInfo.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useState } from 'react';
22
import { useOvermind } from 'app/overmind';
3-
import Dependencies from '../../Dependencies';
3+
import { Dependencies } from '../../Dependencies';
44
import Files from '../../Files';
55
import { Project } from '../../Project';
66
import { WorkspaceItem } from '../../WorkspaceItem';

0 commit comments

Comments
 (0)