Skip to content

🔨 Refactored 🧠 Overmind Hacktober Editor/Workspace/items/Deployment/Netlify/SiteInfo : convert… #2740

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

Closed
wants to merge 2 commits into from
Closed

🔨 Refactored 🧠 Overmind Hacktober Editor/Workspace/items/Deployment/Netlify/SiteInfo : convert… #2740

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8dbae0
Refactor Editor/Workspace/items/Deployment/Netlify/SiteInfo : convert…
hetpatel33 Oct 12, 2019
4dda899
Refactor Editor/Workspace/items/Deployment/Netlify/SiteInfo : typecheck
hetpatel33 Oct 12, 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
72 changes: 37 additions & 35 deletions ...app/src/app/pages/Sandbox/Editor/Workspace/items/Deployment/Netlify/SiteInfo/SiteInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React from 'react';
import { inject, hooksObserver } from 'app/componentConnectors';
import { useOvermind } from 'app/overmind';

import getNetlifyConfig from 'app/utils/getNetlifyConfig';

import { resolveDirectory } from '@codesandbox/common/lib/sandbox/modules';
import { Sandbox, Directory, Module } from '@codesandbox/common/lib/types';

import {
WorkspaceInputContainer,
Expand All @@ -17,7 +18,7 @@ import { SiteInfoWrapper } from './elements';
import { Functions } from './Functions';
import { ViewLogsButton } from './ViewLogsButton';

const getFunctionDir = sandbox => {
const getFunctionDir = (sandbox: Sandbox): Directory | undefined => {
try {
return resolveDirectory(
getNetlifyConfig(sandbox).functions,
Expand All @@ -29,43 +30,44 @@ const getFunctionDir = sandbox => {
}
};

export const SiteInfo = inject('store')(
hooksObserver(
({
store: {
deployment: { building, netlifyLogs, netlifySite },
editor: { currentSandbox },
export const SiteInfo: React.FC = () => {
const {
state: {
deployment: {
building,
netlifyLogs,
netlifySite: { id, name },
},
}) => {
const functionDirectory = getFunctionDir(currentSandbox);
const functions = functionDirectory
? currentSandbox.modules.filter(
({ directoryShortid }) =>
directoryShortid === functionDirectory.shortid
)
: [];
editor: { currentSandbox },
},
} = useOvermind();

return (
<SiteInfoWrapper>
<WorkspaceSubtitle>Sandbox Site</WorkspaceSubtitle>
const functionDirectory: Directory = getFunctionDir(currentSandbox);
const functions: Module[] = functionDirectory
? currentSandbox.modules.filter(
({ directoryShortid }) => directoryShortid === functionDirectory.shortid
)
: [];

<WorkspaceInputContainer>
<Deploys>
<Deploy key={netlifySite.uid}>
<Name light>{netlifySite.name}</Name>
return (
<SiteInfoWrapper>
<WorkspaceSubtitle>Sandbox Site</WorkspaceSubtitle>

{!building && <div>Building</div>}
<WorkspaceInputContainer>
<Deploys>
<Deploy key={id}>
<Name light>{name}</Name>

{functions.length ? <Functions functions={functions} /> : null}
{!building && <div>Building</div>}

<Actions />
{functions.length ? <Functions functions={functions} /> : null}

{netlifyLogs ? <ViewLogsButton /> : null}
</Deploy>
</Deploys>
</WorkspaceInputContainer>
</SiteInfoWrapper>
);
}
)
);
<Actions />

{netlifyLogs ? <ViewLogsButton /> : null}
</Deploy>
</Deploys>
</WorkspaceInputContainer>
</SiteInfoWrapper>
);
};