Added the possibility to create an empty workspace

.deps/dev.md

@@ -200,6 +200,7 @@
 | [`@types/mime@1.3.2`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | clearlydefined |
 | [`@types/minimatch@3.0.5`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | clearlydefined |
 | [`@types/minimist@1.2.2`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | clearlydefined |
+| [`@types/node-fetch@2.6.2`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | clearlydefined |
 | [`@types/normalize-package-data@2.4.1`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | clearlydefined |
 | [`@types/parse-json@4.0.0`](https://www.github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | clearlydefined |
 | [`@types/prettier@2.4.4`](https://github.com/DefinitelyTyped/DefinitelyTyped.git) | MIT | clearlydefined |
@@ -486,6 +487,7 @@
 | [`flat-cache@3.0.4`](https://github.com/royriojas/flat-cache.git) | MIT | clearlydefined |
 | [`flatted@3.2.5`](git+https://github.com/WebReflection/flatted.git) | ISC | #2430 |
 | [`for-in@1.0.2`](https://github.com/jonschlinkert/for-in.git) | MIT | clearlydefined |
+| [`form-data@3.0.1`](git://github.com/form-data/form-data.git) | MIT | clearlydefined |
 | [`fragment-cache@0.2.1`](https://github.com/jonschlinkert/fragment-cache.git) | MIT | clearlydefined |
 | [`fs-monkey@1.0.3`](https://github.com/streamich/fs-monkey.git) | Unlicense | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/-/fs-monkey/1.0.3) |
 | `fsevents@2.3.2` |  | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/-/fsevents/2.3.2) |
@@ -711,7 +713,6 @@
 | [`neo-async@2.6.2`](git@github.com:suguru03/neo-async.git) | MIT | clearlydefined |
 | [`nice-try@1.0.5`](https://github.com/electerious/nice-try.git) | MIT | clearlydefined |
 | [`no-case@3.0.4`](git://github.com/blakeembrey/change-case.git) | MIT | clearlydefined |
-| [`node-fetch@2.6.7`](https://github.com/bitinn/node-fetch.git) | MIT | clearlydefined |
 | [`node-forge@1.3.1`](https://github.com/digitalbazaar/forge) | (BSD-3-Clause OR GPL-2.0) | [clearlydefined](https://clearlydefined.io/definitions/npm/npmjs/-/node-forge/1.3.1) |
 | [`node-gyp@8.4.1`](git://github.com/nodejs/node-gyp.git) | MIT | #1849 |
 | [`node-int64@0.4.0`](https://github.com/broofa/node-int64) | MIT | clearlydefined |

.deps/prod.md

@@ -295,6 +295,7 @@
 | [`ms@2.0.0`](https://github.com/zeit/ms.git) | MIT | clearlydefined |
 | [`nan@2.15.0`](git://github.com/nodejs/nan.git) | MIT | #986 |
 | [`nanoid@3.3.4`](https://github.com/ai/nanoid.git) | MIT | clearlydefined |
+| [`node-fetch@2.6.7`](https://github.com/bitinn/node-fetch.git) | MIT | clearlydefined |
 | [`normalize-url@6.1.0`](https://github.com/sindresorhus/normalize-url.git) | MIT | clearlydefined |
 | [`npm-run-path@4.0.1`](https://github.com/sindresorhus/npm-run-path.git) | MIT | clearlydefined |
 | [`oauth-sign@0.9.0`](https://github.com/mikeal/oauth-sign) | Apache-2.0 | clearlydefined |
@@ -428,6 +429,7 @@
 | [`toggle-selection@1.0.6`](git+https://github.com/sudodoki/toggle-selection) | MIT | clearlydefined |
 | [`toidentifier@1.0.1`](https://github.com/component/toidentifier.git) | MIT | clearlydefined |
 | [`tough-cookie@2.5.0`](git://github.com/salesforce/tough-cookie.git) | BSD-3-Clause | clearlydefined |
+| [`tr46@0.0.3`](git+https://github.com/Sebmaster/tr46.js.git) | MIT | clearlydefined |
 | [`trim-right@1.0.1`](https://github.com/sindresorhus/trim-right.git) | MIT | clearlydefined |
 | [`tslib@2.3.1`](https://github.com/Microsoft/tslib.git) | 0BSD | clearlydefined |
 | [`tunnel-agent@0.6.0`](https://github.com/mikeal/tunnel-agent) | Apache-2.0 | clearlydefined |
@@ -455,7 +457,9 @@
 | [`vscode-nls@4.1.2`](https://github.com/Microsoft/vscode-nls.git) | MIT | clearlydefined |
 | [`vscode-uri@2.1.2`](git+https://github.com/Microsoft/vscode-uri.git) | MIT | clearlydefined |
 | [`warning@4.0.3`](https://github.com/BerkeleyTrue/warning.git) | MIT | [CQ22359](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=22359) |
+| [`webidl-conversions@3.0.1`](https://github.com/jsdom/webidl-conversions.git) | BSD-2-Clause | clearlydefined |
 | [`websocket@1.0.23`](https://github.com/theturtle32/WebSocket-Node.git) | Apache-2.0 | [CQ22360](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=22360) |
+| [`whatwg-url@5.0.0`](https://github.com/jsdom/whatwg-url.git) | MIT | clearlydefined |
 | [`which@2.0.2`](git://github.com/isaacs/node-which.git) | ISC | clearlydefined |
 | [`wrappy@1.0.2`](https://github.com/npm/wrappy) | ISC | clearlydefined |
 | [`ws@8.7.0`](https://github.com/websockets/ws.git) | MIT | clearlydefined |

build/dockerfiles/Dockerfile

@@ -37,9 +37,11 @@ FROM docker.io/node:16.14.0-alpine3.15
 
 ENV FRONTEND_LIB=/dashboard/packages/dashboard-frontend/lib/public
 ENV BACKEND_LIB=/dashboard/packages/dashboard-backend/lib
+ENV DEVFILE_REGISTRY=/dashboard/packages/devfile-registry
 
 COPY --from=builder ${BACKEND_LIB} /backend
 COPY --from=builder ${FRONTEND_LIB} /public
+COPY --from=builder ${DEVFILE_REGISTRY} /public/dashboard/devfile-registry
 
 COPY build/dockerfiles/entrypoint.sh /entrypoint.sh
 

build/dockerfiles/rhel.Dockerfile

@@ -29,9 +29,11 @@ RUN \
 
 ENV FRONTEND_LIB=/dashboard/packages/dashboard-frontend/lib/public
 ENV BACKEND_LIB=/dashboard/packages/dashboard-backend/lib
+ENV DEVFILE_REGISTRY=/dashboard/packages/devfile-registry
 
 COPY --from=builder ${BACKEND_LIB} /backend
 COPY --from=builder ${FRONTEND_LIB} /public
+COPY --from=builder ${DEVFILE_REGISTRY} /public/dashboard/devfile-registry
 
 COPY build/dockerfiles/rhel.entrypoint.sh /usr/local/bin
 CMD ["/usr/local/bin/rhel.entrypoint.sh"]

packages/dashboard-backend/package.json

@@ -38,6 +38,7 @@
     "axios": "^0.21.4",
     "fastify": "^3.29.1",
     "fs-extra": "9.1.0",
+    "node-fetch": "^2.6.7",
     "querystring": "^0.2.1",
     "reflect-metadata": "^0.1.13",
     "request": "^2.79.0",
@@ -49,6 +50,7 @@
     "@types/fs-extra": "^9.0.12",
     "@types/jest": "^26.0.20",
     "@types/node": "^14.14.35",
+    "@types/node-fetch": "^2.5.7",
     "@types/tunnel": "0.0.1",
     "@typescript-eslint/eslint-plugin": "^4.31.2",
     "@typescript-eslint/parser": "^4.31.2",

packages/dashboard-backend/src/api/dockerConfigApi.ts

@@ -12,7 +12,7 @@
 
 import { FastifyInstance, FastifyRequest } from 'fastify';
 import { baseApiPath } from '../constants/config';
-import { dockerConfigSchema, namespacedDockerConfigSchema } from '../constants/schemas';
+import { dockerConfigSchema, namespacedSchema } from '../constants/schemas';
 import { getDevWorkspaceClient, getToken } from './helper';
 import { restParams } from '../typings/models';
 import { getSchema } from '../services/helpers';
@@ -22,7 +22,7 @@ const tags = ['Docker Config'];
 export function registerDockerConfigApi(server: FastifyInstance) {
   server.get(
     `${baseApiPath}/namespace/:namespace/dockerconfig`,
-    getSchema({ tags, params: namespacedDockerConfigSchema }),
+    getSchema({ tags, params: namespacedSchema }),
     async function (request: FastifyRequest) {
       const { namespace } = request.params as restParams.INamespacedParam;
       const token = getToken(request);
@@ -34,7 +34,7 @@ export function registerDockerConfigApi(server: FastifyInstance) {
 
   server.put(
     `${baseApiPath}/namespace/:namespace/dockerconfig`,
-    getSchema({ tags, params: namespacedDockerConfigSchema, body: dockerConfigSchema }),
+    getSchema({ tags, params: namespacedSchema, body: dockerConfigSchema }),
     async function (request: FastifyRequest) {
       const { namespace } = request.params as restParams.INamespacedParam;
       const dockerCfg = request.body as restParams.IDockerConfigParams;

packages/dashboard-backend/src/api/yamlResolverApi.ts

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2018-2021 Red Hat, Inc.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   Red Hat, Inc. - initial API and implementation
+ */
+
+import { FastifyInstance, FastifyRequest } from 'fastify';
+import fetch from 'node-fetch';
+import { baseApiPath } from '../constants/config';
+import { yamlResolverSchema, namespacedSchema } from '../constants/schemas';
+import { getDevWorkspaceClient, getToken } from './helper';
+import { restParams } from '../typings/models';
+import { getSchema } from '../services/helpers';
+import { helpers } from '@eclipse-che/common';
+
+const tags = ['Yaml Resolver'];
+
+export function registerYamlResolverApi(server: FastifyInstance) {
+  server.post(
+    `${baseApiPath}/namespace/:namespace/yaml/resolver`,
+    getSchema({ tags, params: namespacedSchema, body: yamlResolverSchema }),
+    async function (request: FastifyRequest) {
+      const { url } = request.body as restParams.IYamlResolverParam;
+      const { namespace } = request.params as restParams.INamespacedParam;
+      const token = getToken(request);
+      const { dockerConfigApi } = await getDevWorkspaceClient(token);
+
+      try {
+        // check user permissions
+        await dockerConfigApi.read(namespace);
+      } catch (e) {
+        throw new Error(`User permissions error. ${helpers.errors.getMessage(e)}`);
+      }
+
+      const response = await fetch(url);
+      if (!response.ok || response.body === null) {
+        throw new Error(`Unexpected response ${response.statusText}`);
+      }
+
+      let outputData = '';
+      for await (const chunk of response.body) {
+        outputData += chunk.toString();
+      }
+
+      return outputData;
+    },
+  );
+}

packages/dashboard-backend/src/constants/schemas.ts

@@ -35,16 +35,6 @@ export const namespacedKubeConfigSchema: JSONSchema7 = {
   required: ['namespace', 'devworkspaceId'],
 };
 
-export const namespacedDockerConfigSchema: JSONSchema7 = {
-  type: 'object',
-  properties: {
-    namespace: {
-      type: 'string',
-    },
-  },
-  required: ['namespace'],
-};
-
 export const namespacedWorkspaceSchema: JSONSchema7 = {
   type: 'object',
   properties: {
@@ -137,6 +127,17 @@ export const dockerConfigSchema: JSONSchema7 = {
   required: ['dockerconfig'],
 };
 
+export const yamlResolverSchema: JSONSchema7 = {
+  type: 'object',
+  properties: {
+    url: {
+      type: 'string',
+      pattern: '^http.*.yaml$',
+    },
+  },
+  required: ['url'],
+};
+
 export const devworkspaceSchema: JSONSchema7 = {
   type: 'object',
   properties: {

packages/dashboard-backend/src/devworkspace-client/services/api/workspaceApi.ts

@@ -21,6 +21,7 @@ import {
 
 import { api } from '@eclipse-che/common';
 import { createError } from '../helpers';
+import { isLocalRun } from '../../../local-run';
 
 const DEV_WORKSPACE_API_ERROR_LABEL = 'CUSTOM_OBJECTS_API_ERROR';
 
@@ -212,8 +213,10 @@ export class DevWorkspaceApi implements IDevWorkspaceApi {
         if (error && error.message) {
           message = error.message;
         } else {
-          // unexpected error format. Log it and expose to user what we can
-          console.log('Unexpected error', error);
+          if (isLocalRun) {
+            // unexpected error format. Log it and expose to user what we can
+            console.log('Unexpected error', error);
+          }
           if (error) {
             message = error.toString();
           }

packages/dashboard-backend/src/index.ts

@@ -36,6 +36,7 @@ import {
 } from './local-run/dexHelper';
 import { registerFactory } from './factory';
 import { namespaceApi } from './api/namespaceApi';
+import { registerYamlResolverApi } from './api/yamlResolverApi';
 
 const CHE_HOST = process.env.CHE_HOST as string;
 
@@ -109,6 +110,8 @@ registerClusterInfoApi(server);
 
 registerClusterConfigApi(server);
 
+registerYamlResolverApi(server);
+
 server.listen(8080, '0.0.0.0', (err: Error | null, address: string) => {
   if (err) {
     console.error(err);

packages/dashboard-backend/src/typings/models.d.ts

@@ -46,6 +46,10 @@ declare namespace restParams {
   export interface IDevWorkspaceSpecParam {
     devworkspace: V1alpha2DevWorkspace;
   }
+
+  export interface IYamlResolverParam {
+    url: string;
+  }
 }
 
 declare module 'restParams' {

packages/dashboard-frontend/src/pages/GetStarted/GetStartedTab/SampleCard.tsx

@@ -24,7 +24,7 @@ import {
   DropdownPosition,
 } from '@patternfly/react-core';
 import './sample-card.css';
-import { TargetEditor } from './SamplesListGallery';
+import { TargetEditor, VISIBLE_TAGS } from './SamplesListGallery';
 import DropdownEditors from './DropdownEditors';
 
 type Props = {
@@ -36,8 +36,6 @@ type State = {
   isExpanded: boolean;
 };
 
-const VISIBLE_TAGS = ['community', 'tech-preview'];
-
 export class SampleCard extends React.PureComponent<Props, State> {
   constructor(props: Props) {
     super(props);

packages/dashboard-frontend/src/pages/GetStarted/GetStartedTab/SamplesListGallery.tsx

@@ -59,6 +59,9 @@ type State = {
   alerts: AlertItem[];
 };
 
+export const VISIBLE_TAGS = ['community', 'tech-preview'];
+export const EMPTY_WORKSPACE_TAG = 'Empty';
+
 const EXCLUDED_TARGET_EDITOR_NAMES = ['dirigible', 'jupyter', 'eclipseide', 'code-server'];
 
 export class SamplesListGallery extends React.PureComponent<Props, State> {
@@ -71,6 +74,26 @@ export class SamplesListGallery extends React.PureComponent<Props, State> {
     }
     return 0;
   }
+  private static sortByVisibleTag(a: che.DevfileMetaData, b: che.DevfileMetaData): number {
+    const getVisibleTag = (metadata: che.DevfileMetaData) =>
+      metadata.tags.filter(tag => VISIBLE_TAGS.includes(tag))[0];
+    if (getVisibleTag(a) < getVisibleTag(b)) {
+      return -1;
+    }
+    if (getVisibleTag(a) > getVisibleTag(b)) {
+      return 1;
+    }
+    return 0;
+  }
+  private static sortByEmptyWorkspaceTag(a: che.DevfileMetaData, b: che.DevfileMetaData): number {
+    if (a.tags.includes(EMPTY_WORKSPACE_TAG) > b.tags.includes(EMPTY_WORKSPACE_TAG)) {
+      return -1;
+    }
+    if (a.tags.includes(EMPTY_WORKSPACE_TAG) < b.tags.includes(EMPTY_WORKSPACE_TAG)) {
+      return 1;
+    }
+    return 0;
+  }
   private static sortByDisplayName(a: che.DevfileMetaData, b: che.DevfileMetaData): number {
     if (a.displayName < b.displayName) {
       return -1;
@@ -186,6 +209,8 @@ export class SamplesListGallery extends React.PureComponent<Props, State> {
 
     return metadata
       .sort(SamplesListGallery.sortByDisplayName)
+      .sort(SamplesListGallery.sortByVisibleTag)
+      .sort(SamplesListGallery.sortByEmptyWorkspaceTag)
       .map(meta => (
         <SampleCard
           key={meta.links.self}

packages/dashboard-frontend/src/services/dashboard-backend-client/yamlResolverApi.ts

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2018-2021 Red Hat, Inc.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   Red Hat, Inc. - initial API and implementation
+ */
+
+import axios from 'axios';
+import { helpers } from '@eclipse-che/common';
+import { prefix } from './const';
+import * as yaml from 'js-yaml';
+import { FactoryResolver } from '../helpers/types';
+
+export async function getYamlResolver(
+  namespace: string,
+  location: string,
+): Promise<FactoryResolver> {
+  try {
+    const url = new URL(location);
+    const response =
+      url.origin === window.location.origin
+        ? await axios.get(url.href)
+        : await axios.post(`${prefix}/namespace/${namespace}/yaml/resolver`, { url: url.href });
+
+    return {
+      v: 'yaml-resolver',
+      devfile: yaml.load(response.data),
+      location: url.href,
+      links: [],
+    };
+  } catch (e) {
+    throw `Failed to fetch yaml resolver'. ${helpers.errors.getMessage(e)}`;
+  }
+}

packages/dashboard-frontend/src/store/DevfileRegistries/index.ts

@@ -24,6 +24,7 @@ import devfileApi from '../../services/devfileApi';
 import { fetchResources, loadResourcesContent } from '../../services/registry/resources';
 
 const WorkspaceClient = container.get(CheWorkspaceClient);
+export const DEFAULT_REGISTRY = '/dashboard/devfile-registry/';
 
 export type DevWorkspaceResources = [devfileApi.DevWorkspace, devfileApi.DevWorkspaceTemplate];
 
@@ -174,7 +175,15 @@ export const actionCreators: ActionCreators = {
     async (dispatch): Promise<void> => {
       dispatch({ type: Type.REQUEST_REGISTRY_METADATA });
 
-      const promises = registryUrls.split(' ').map(async url => {
+      const registries: string[] = registryUrls.split(' ');
+      if (DEFAULT_REGISTRY) {
+        if (DEFAULT_REGISTRY.startsWith('http')) {
+          registries.push(DEFAULT_REGISTRY);
+        } else {
+          registries.push(new URL(DEFAULT_REGISTRY, window.location.origin).href);
+        }
+      }
+      const promises = registries.map(async url => {
         try {
           const metadata = await fetchRegistryMetadata(url);
           if (!Array.isArray(metadata) || metadata.length === 0) {