Skip to content

Commit

Permalink
UI TS Conversion (#11)
Browse files Browse the repository at this point in the history
* Update dependencies

* Fix space-between

* Update sh sync script

* Update dependencies

* Transfer boot to TS

* Path update

* Transformed About to TS

* Update configureService

* Transformed Root to TS

* Remove Alerts

* Remove unused componentsremove BurgerMenu

* Transformed ClusterScreen to TS

* Minor fix

* Import update

* Update ClusterScreen

* Update dependencies

* Update Root components

* Remove HOC

* Remove CopyClipboard

* Update prepare.sh

* Remove Diagram

* Remove DnComponent

* Remove DnShortcutComponent

* Remove ErrorBox

* Update with script Event component

* Update with script Feedback component

* Remove DnPath

* Update Header components to TS

* Update with script MessageNotification component

* Update with script NewVersion component

* Update with script NotificationList component

* Update with script Notifications component

* Remove Popup

* Update with script PostFeedback component

* Update with script Properties component

* Update with script Root component

* Update with script Search component

* Update Search component to TS

* Update with script SEO component

* Update with script Snooze component

* Remove Summary Component

* Update with script UiLogs component

* Update copy-file script

* Update syc script for sync ui

* Import fixed

* backend & parser sync.

* updated dockerfile to node v14

* Update with script version

* Update with script index

* Update with script BaseService

* Update with script DiagramService

* Update with script MiscService

* Update to TS RootApiService

* Update with script WebSocketService

* Update to TS ClustersService

* Update to TS MockDiagramService

* Update with script MockMiscService

* Update to TS MockRootApiService

* Update with script MockWebSocketService

* Update MockRootApiService

* Update to TS MockClustersService

* Update configureService

* Update utils

* Fix bug for cluster

* Remove unused import

* Remove ruleComponent from root component

* Added default function

* Update header actions

* Fixed create config endpoint

* Minor fixes

* Update state to TS

* Update .sh script

* Build client fix

* fixes to k8s client

* fixes to docker build

Co-authored-by: Semyon Pukhov <[email protected]>
Co-authored-by: Ruben Hakopian <[email protected]>
  • Loading branch information
3 people authored Mar 12, 2021
1 parent 0091eca commit 551b1d0
Show file tree
Hide file tree
Showing 164 changed files with 35,762 additions and 35,084 deletions.
22 changes: 13 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
###############################################################################
# Step 1 : React Builder Image
FROM kubevious/react-builder:12 as react-build
FROM kubevious/node-builder:14 as react-build
WORKDIR /app
ENV NODE_ENV production
# ENV NODE_ENV production
ENV PATH /app/node_modules/.bin:$PATH
COPY client/package*.json ./
RUN npm ci --also=dev
ENV SKIP_PREFLIGHT_CHECK true
COPY client/package.json ./
COPY client/package-lock.json ./
RUN npm ci
# RUN npm ci --also=dev
COPY client/ ./
RUN npm run build

###############################################################################
# Step 2 : Backend Builder Image
FROM kubevious/node-builder:12 as backend-build
FROM kubevious/node-builder:14 as backend-build
RUN apk update && apk upgrade && \
apk add --no-cache bash git openssh
WORKDIR /app
ENV NODE_ENV production
# ENV NODE_ENV production
COPY ./src/package*.json ./
RUN npm ci --also=dev
RUN npm ci
# RUN npm ci --also=dev
COPY ./src/tsconfig.json ./
COPY ./src/*.ts ./
COPY ./src/lib ./lib
Expand All @@ -26,7 +30,7 @@ RUN npm run build

###############################################################################
# Step 3 : Runner Image
FROM node:12-alpine
FROM node:14-alpine

ENV PATH="/tools:${PATH}"
WORKDIR /tools
Expand Down Expand Up @@ -66,4 +70,4 @@ COPY --from=backend-build /app/package*.json ./
COPY --from=backend-build /app/node_modules ./node_modules
COPY --from=backend-build /app/dist ./dist
COPY --from=react-build /app/build ./static
CMD [ "node", "." ]
CMD [ "node", "." ]
12,233 changes: 9,273 additions & 2,960 deletions client/package-lock.json

Large diffs are not rendered by default.

18 changes: 13 additions & 5 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,22 @@
"@fortawesome/free-solid-svg-icons": "^5.15.1",
"@fortawesome/react-fontawesome": "^0.1.12",
"@kubevious/helpers": "^1.0.49",
"axios": "^0.21.1",
"@kubevious/ui-alerts": "^1.0.5",
"@kubevious/ui-components": "^1.0.20",
"@kubevious/ui-diagram": "^1.0.11",
"@kubevious/ui-framework": "^1.0.11",
"@kubevious/ui-middleware": "^1.0.6",
"@kubevious/ui-properties": "^1.0.10",
"@kubevious/ui-rule-engine": "^1.0.3",
"@kubevious/ui-time-machine": "^1.0.8",
"@kubevious/websocket-client": "^1.0.7",
"@types/react": "^17.0.3",
"bootstrap": "^4.5.0",
"c3": "^0.7.20",
"classnames": "^2.2.6",
"codemirror": "^5.54.0",
"d3": "^5.16.0",
"debounce": "^1.2.0",
"golden-layout": "^1.5.9",
"highlight.js": "^10.0.3",
"jquery": "^3.5.1",
"js-yaml": "^3.14.0",
"markdown-to-jsx": "^7.0.1",
Expand All @@ -31,11 +38,11 @@
"react-dom": "^16.13.1",
"react-gtm-module": "^2.0.11",
"react-helmet": "^6.1.0",
"react-scripts": "3.4.1",
"react-scripts": "^3.4.1",
"recharts": "^1.8.5",
"the-lodash": "^1.2.2",
"typescript": "^4.2.3",
"webpack-jquery-ui": "^2.0.1",
"websocket-subscription-client": "^1.0.15",
"xml-js": "^1.6.11"
},
"scripts": {
Expand All @@ -62,6 +69,7 @@
]
},
"devDependencies": {
"@types/node": "^14.14.33",
"husky": "^4.2.5",
"prettier": "2.0.5",
"pretty-quick": "^2.0.1"
Expand Down
1 change: 1 addition & 0 deletions client/public/img/header-btns/new-version.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
93 changes: 0 additions & 93 deletions client/src/BaseRootApiService.js

This file was deleted.

52 changes: 0 additions & 52 deletions client/src/HOC/BaseComponent.js

This file was deleted.

126 changes: 0 additions & 126 deletions client/src/boot/aboutMockData.js

This file was deleted.

Loading

0 comments on commit 551b1d0

Please sign in to comment.