Merge pull request #129 from intelops/ui-fixes

Minor fixes

Author: mahendraintelops

.github/workflows/core-ci.yml

@@ -44,11 +44,15 @@ jobs:
       - name: Test
         run: |
           cd core
+          sudo apt install dos2unix -y
+          # install openapi-generator-cli
+          mkdir -p $HOME/ogc
+          curl https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/bin/utils/openapi-generator-cli.sh > $HOME/ogc/openapi-generator-cli && chmod a+x $HOME/ogc/openapi-generator-cli
           go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
           go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
           export GOPATH=$HOME/go
           export GOBIN=$GOPATH/bin
-          export PATH=$PATH:$GOROOT:$GOBIN
+          export PATH=$PATH:$GOPATH:$GOBIN:$HOME/ogc
           go test -v ./... -race -coverprofile=coverage.out -coverpkg=./... -covermode=atomic
           cd ..
       - name: Upload coverage to Codecov
@@ -142,4 +146,4 @@ jobs:
           format: 'github'
           output: 'dependency-results.sbom.json'
           image-ref: '.'
-          github-pat: ${{ secrets.GH_TOKEN }}
+          github-pat: ${{ secrets.GH_TOKEN }}

.gitignore

@@ -7,6 +7,6 @@
 /app/scratch/
 /core/core
 /.idea
-/core/openapitools.json
 /core/coverage.out
-/app/coverage
+/app/coverage
+openapitools.json

app/crds/project-crd.yaml

@@ -51,6 +51,8 @@ spec:
                       type: string
                     branch:
                       type: string
+                    isPublic:
+                      type: boolean
                 oldVersions:
                   type: array
                   items:

app/src/routes/code-operations.ts

@@ -39,6 +39,7 @@ codeOperationsRouter.post('/generate', requireUserNameMiddleware, async (request
     const cleanup = (downloadedPrjPath: string) => {
         // remove directory created, delete directory recursively
         rimraf(downloadedPrjPath).then((result: any) => {
+            Logger.debug(`Result: ${result}`);
             Logger.debug(`${downloadedPrjPath} is cleaned up`);
         });
     };
@@ -53,8 +54,8 @@ codeOperationsRouter.post('/generate', requireUserNameMiddleware, async (request
     if (!projectResource.spec.json
         || projectResource.spec.json === '{}'
         || projectResource.spec.json.length === 0
-        || !JSON.parse(projectResource.spec.json).nodes
-        || JSON.parse(projectResource.spec.json).nodes?.length === 0) {
+        || !JSON.parse(projectResource.spec.json)?.nodes
+        || JSON.parse(projectResource.spec.json)?.nodes?.length === 0) {
         const message = `unable to generate code, have at least a node added to your project: ${projectResource.spec.displayName}[${projectId}].`;
         return resource.status(500).json(getGenerateCodeError(message));
     }

app/src/routes/models.ts

@@ -88,12 +88,20 @@ export interface CompageEdge {
 export interface CompageJson {
     edges: Map<string, CompageEdge>;
     nodes: Map<string, CompageNode>;
-    version: string;
+    version?: string;
+    workspace?: any;
+    undoHistory?: any;
+    potentialNode?: any;
+    potentialEdge?: any;
+    plugins?: any;
+    panels?: any;
+    editor?: any;
 }
 
 export interface Repository {
     name: string;
     branch: string;
+    isPublic: boolean;
 }
 
 // all keys are of string format
@@ -196,12 +204,19 @@ export interface DeleteProjectError {
 }
 
 export const initializeEmptyProjectEntity = () => {
-    const repository: Repository = {branch: '', name: ''};
+    const repository: Repository = {branch: '', name: '', isPublic: false};
     const user: User = {email: '', name: ''};
     const json: CompageJson = {
         edges: new Map<string, CompageEdge>(),
         nodes: new Map<string, CompageNode>(),
-        version: ''
+        version: '',
+        editor: {},
+        panels: {},
+        plugins: {},
+        undoHistory: {},
+        workspace: {},
+        potentialEdge: {},
+        potentialNode: {}
     };
     const projectEntity: ProjectEntity = {
         displayName: '',

app/src/routes/projects-operations.ts

@@ -92,6 +92,7 @@ const addToGithub = (projectEntity: ProjectEntity, response: Response) => {
         base64Json,
         'first commit',
         sha).then(resp => {
+        Logger.debug(`commitCompageJson Response: ${JSON.stringify(resp.data)}`);
         const message = `The .compage/config.json in Repository for '${projectEntity.displayName}' is committed, ${projectEntity.displayName}[${projectEntity.id}] project is created successfully.`;
         Logger.info(message);
         return response.status(200).json(getCreateProjectResponse(projectEntity, message));
@@ -166,8 +167,9 @@ const updateFromGithub = (projectEntity: ProjectEntity, response: Response) => {
 // creates repository on GitHub and commits first version of yaml
 const createOnGithub = (projectEntity: ProjectEntity, response: Response) => {
     // TODO change description
-    return createRepository(projectEntity.user.name, projectEntity.repository.name, projectEntity.repository.name)
+    return createRepository(projectEntity.user.name, projectEntity.repository.name, projectEntity.repository.name, projectEntity.repository.isPublic)
         .then(resp => {
+            Logger.debug(`createRepository Response: ${JSON.stringify(resp.data)}`);
             // create .compage/config.json file in GitHub repo
             return addToGithub(projectEntity, response);
         }).catch(error => {

app/src/util/github-client.ts

@@ -5,7 +5,7 @@ const ACCEPT = `application/vnd.github+json`;
 const USER_REPO_URL = `https://api.github.com/user/repos`;
 const REPO_URL = `https://api.github.com/repos`;
 
-export const createRepository = async (userName: string, repositoryName: string, description: string) => {
+export const createRepository = async (userName: string, repositoryName: string, description: string, isPublic: boolean) => {
     return axios({
         headers: {
             Accept: ACCEPT,
@@ -14,7 +14,7 @@ export const createRepository = async (userName: string, repositoryName: string,
         url: USER_REPO_URL, method: 'POST', data: {
             name: repositoryName,
             description,
-            private: true,
+            private: !isPublic,
         }
     });
 };

app/src/util/project-client.ts

@@ -16,6 +16,7 @@ const convertProjectEntityToProjectResourceSpec = (projectId: string, userName:
     const repository: Repository = {
         branch: '',
         name: '',
+        isPublic: projectEntity.repository.isPublic
     };
 
     // if repository name is not set, add displayName as repository name.

charts/compage/templates/crds/project-crd.yaml

@@ -53,6 +53,8 @@ spec:
                       type: string
                     branch:
                       type: string
+                    isPublic:
+                      type: boolean
                 metadata:
                   type: string
                 version:

core/Dockerfile

@@ -2,7 +2,7 @@
 # Build stage will be used:
 # - for building the application for production
 # - as target for development (see devspace.yaml)
-FROM golang:1.20.2-alpine3.17 as builder
+FROM golang:1.20.5-alpine3.18 as builder
 
 # Create project directory (workdir)
 WORKDIR /app
@@ -22,17 +22,15 @@ FROM alpine:3.18.2
 # Create project directory (workdir)
 WORKDIR /app
 
-RUN apk update && apk add protoc && apk add openjdk8
-RUN apk update && apk add bash && apk add curl && apk add jq && apk add --update go \
+RUN apk update && apk add protoc && apk add dos2unix && apk add openjdk8 && apk add make && apk add bash && apk add curl && apk add jq && apk add --update go \
     && curl https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/bin/utils/openapi-generator-cli.sh \
     > /app/openapi-generator-cli \
-    && chmod u+x /app/openapi-generator-cli \
-    && export PATH=$PATH:/app/
+    && chmod a+x /app/openapi-generator-cli
 
 # Downloading and installing Maven
-ARG MAVEN_VERSION=3.9.2
+ARG MAVEN_VERSION=3.9.3
 ARG USER_HOME_DIR="/root"
-ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ARG BASE_URL=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries
 RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
   && echo "Downloading maven" \
   && curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
@@ -41,17 +39,20 @@ RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
   && echo "Cleaning and setting links" \
   && rm -f /tmp/apache-maven.tar.gz \
   && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
+
 ENV MAVEN_HOME /usr/share/maven
 ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
 
-ENV PATH="/usr/local/go/bin:$PATH"
+ENV PATH="/usr/local/go/bin:$PATH:/app/"
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
 RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
 
 # test if the below command avoids loading the files later.
 RUN /app/openapi-generator-cli version
 RUN go version
+RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
+RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
 COPY --from=builder /app/core /
 COPY templates /app/templates
 # Application port (optional)