Skip to content
This repository was archived by the owner on Jan 18, 2023. It is now read-only.

Commit 8cd13d2

Browse files
author
Max
committed
don't render deployment if they don't exist
1 parent bcabdc1 commit 8cd13d2

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "codestore",
33
"description": "code.store CLI. Add services, deploy, debug, perform all operations from your terminal.",
4-
"version": "1.9.10",
4+
"version": "1.9.11",
55
"bin": {
66
"codestore": "./bin/run",
77
"cs": "./bin/run"

src/commands/project/service/info.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,18 @@ export default class Info extends Command {
2525
if (!service) return;
2626

2727
const deployments = await this.codestore.Deployment.getDeploymentsForProjectService(project.id, service.id);
28-
const deploymentTo = ServiceInfo.deploymentsToEnvronments(deployments, projectServiceEnvironments);
28+
const deploymentTo = ServiceInfo.deploymentsToEnvironments(deployments, projectServiceEnvironments);
2929

3030
const createRows = (fields: ServiceInfo.Field[]): ServiceInfo.CreateRowResult[] => fields.map(({ name, resolve }) => {
3131
const result = { name };
3232
projectServiceEnvironments.forEach((environment) => {
33-
result[environment] = resolve(deploymentTo[environment]!);
33+
if (deploymentTo[environment]) {
34+
result[environment] = resolve(deploymentTo[environment]!);
35+
}
3436
});
3537
return result;
3638
});
3739

38-
this.renderTable(createRows(ServiceInfo.getFieldResolvers()), ServiceInfo.createColumns(projectServiceEnvironments));
40+
this.renderTable(createRows(ServiceInfo.getFieldResolvers()), ServiceInfo.createColumns(projectServiceEnvironments, deploymentTo));
3941
}
4042
}

src/commands/service/create.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ export default class Create extends Command {
162162
await tasks.run();
163163

164164
const deployments = await this.codestore.Deployment.getDeploymentsForService(this.serviceId);
165-
const deploymentTo = ServiceInfo.deploymentsToEnvronments(deployments, serviceEnvironments);
165+
const deploymentTo = ServiceInfo.deploymentsToEnvironments(deployments, serviceEnvironments);
166166

167167
Object.keys(deploymentTo).forEach((environment) => {
168168
this.log(`Your service on ${environment} environment is available by this url: ${

src/commands/service/info.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,21 @@ export const getFieldResolvers = (): Field[] => [{
2222
}];
2323

2424
type DeploymentToEnvironment = { [key in EnvironmentEnum]?: IDeployment };
25-
export const deploymentsToEnvronments = (deployments: IDeployment[], environments: EnvironmentEnum[]): DeploymentToEnvironment => {
25+
export const deploymentsToEnvironments = (deployments: IDeployment[], environments: EnvironmentEnum[]): DeploymentToEnvironment => {
2626
const result: DeploymentToEnvironment = {};
2727
// eslint-disable-next-line no-restricted-syntax
2828
for (const environment of environments) {
2929
result[environment] = deployments.find((d) => d.environment.name === environment);
30-
if (!result[environment]) {
31-
throw new Error(`Deployment to environment ${environment} not found`);
32-
}
3330
}
3431
return result;
3532
};
3633

37-
export const createColumns = (environments: EnvironmentEnum[]): object => {
34+
export const createColumns = (environments: EnvironmentEnum[], deployments: DeploymentToEnvironment): object => {
3835
const result = { name: { header: '' } };
3936
environments.forEach((environment) => {
40-
result[environment] = {};
37+
if (deployments[environment]) {
38+
result[environment] = {};
39+
}
4140
});
4241
return result;
4342
};
@@ -65,14 +64,14 @@ export default class Info extends Command {
6564
if (!service) return;
6665

6766
const deployments = await this.codestore.Deployment.getDeploymentsForService(service.id);
68-
const deploymentTo = deploymentsToEnvronments(deployments, serviceEnvironments);
67+
const deploymentTo = deploymentsToEnvironments(deployments, serviceEnvironments);
6968

7069
const createRows = (fields: Field[]): CreateRowResult[] => fields.map(({ name, resolve }) => ({
7170
name,
7271
private: resolve(deploymentTo[EnvironmentEnum.PRIVATE]!),
7372
demo: resolve(deploymentTo[EnvironmentEnum.DEMO]!),
7473
}));
7574

76-
this.renderTable(createRows(getFieldResolvers()), createColumns(serviceEnvironments));
75+
this.renderTable(createRows(getFieldResolvers()), createColumns(serviceEnvironments, deploymentTo));
7776
}
7877
}

0 commit comments

Comments
 (0)