Skip to content

🔨 Refactored 🧠 Overmind Hacktober | Refactor app/pages/Sandbox/Editor/Workspace/items/Server/EnvVars/index.js to use Overmind #2818

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

Merged
merged 4 commits into from
Oct 19, 2019
Merged

🔨 Refactored 🧠 Overmind Hacktober | Refactor app/pages/Sandbox/Editor/Workspace/items/Server/EnvVars/index.js to use Overmind #2818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d23382d
refactor EnvironmentVariables to use useOvermind
deinakings Oct 15, 2019
c88b9f2
Merge branch 'master' into pr-christianalfoni-2818
christianalfoni Oct 17, 2019
38d1756
Fix typing of EnvVariables
christianalfoni Oct 17, 2019
02442eb
Merge pull request #1 from codesandbox/pr-christianalfoni-2818
deinakings Oct 17, 2019
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
14 changes: 8 additions & 6 deletions packages/app/src/app/overmind/effects/api/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ import { client } from 'app/graphql/client';
import { LIST_TEMPLATES } from 'app/pages/Dashboard/queries';

import {
transformSandbox,
transformDirectory,
transformModule,
transformSandbox,
} from '../utils/sandbox';
import apiFactory, { Api, ApiConfig } from './apiFactory';
import {
SandboxAPIResponse,
IModuleAPIResponse,
IDirectoryAPIResponse,
IModuleAPIResponse,
SandboxAPIResponse,
} from './types';

let api: Api;
Expand Down Expand Up @@ -154,7 +154,9 @@ export default {
},
});
},
getEnvironmentVariables(sandboxId: string): Promise<EnvironmentVariable[]> {
getEnvironmentVariables(
sandboxId: string
): Promise<{ [key: string]: string }> {
return api.get(
`/sandboxes/${sandboxId}/env`,
{},
Expand All @@ -164,7 +166,7 @@ export default {
saveEnvironmentVariable(
sandboxId: string,
environmentVariable: EnvironmentVariable
): Promise<EnvironmentVariable[]> {
): Promise<{ [key: string]: string }> {
return api.post(
`/sandboxes/${sandboxId}/env`,
{
Expand All @@ -178,7 +180,7 @@ export default {
deleteEnvironmentVariable(
sandboxId: string,
name: string
): Promise<EnvironmentVariable[]> {
): Promise<{ [key: string]: string }> {
return api.delete(
`/sandboxes/${sandboxId}/env/${name}`,
{},
Expand Down
25 changes: 11 additions & 14 deletions ...r/Workspace/items/Server/EnvVars/index.js → .../Workspace/items/Server/EnvVars/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
import { useOvermind } from 'app/overmind';
import React, { useEffect } from 'react';
import { inject, observer } from 'app/componentConnectors';

import { WorkspaceInputContainer } from '../../../elements';

import { EnvEntry } from './EnvEntry';
import { EnvModal } from './EnvModal';

const EnvironmentVariablesComponent = ({ signals: { editor }, store }) => {
export const EnvironmentVariables: React.FC<{}> = props => {
const {
actions: { editor },
state: {
editor: { currentSandbox },
},
} = useOvermind();
useEffect(() => {
editor.fetchEnvironmentVariables();
}, [editor]);
Expand All @@ -19,7 +24,7 @@ const EnvironmentVariablesComponent = ({ signals: { editor }, store }) => {
editor.deleteEnvironmentVariable({ name });
};

const envVars = store.editor.currentSandbox.environmentVariables;
const envVars = currentSandbox.environmentVariables;

if (!envVars) {
return (
Expand All @@ -31,17 +36,13 @@ const EnvironmentVariablesComponent = ({ signals: { editor }, store }) => {

return (
<div>
{Object.keys(envVars.toJSON ? envVars.toJSON() : envVars).map(keyName => (
{Object.keys(envVars).map(keyName => (
<EnvEntry
onSubmit={createEnv}
onDelete={deleteEnv}
key={keyName}
name={keyName}
value={
typeof envVars.get === 'function'
? envVars.get(keyName)
: envVars[keyName]
}
value={envVars[keyName]}
/>
))}

Expand All @@ -51,7 +52,3 @@ const EnvironmentVariablesComponent = ({ signals: { editor }, store }) => {
</div>
);
};

export const EnvironmentVariables = inject('store', 'signals')(
observer(EnvironmentVariablesComponent)
);
4 changes: 3 additions & 1 deletion packages/common/src/types/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,9 @@ export type Sandbox = {
git: GitInfo | null;
tags: string[];
isFrozen: boolean;
environmentVariables: EnvironmentVariable[] | null;
environmentVariables: {
[key: string]: string;
} | null;
/**
* This is the source it's assigned to, a source contains all dependencies, modules and directories
*
Expand Down