fix: Merge devmain into master #patch

.eslintrc.js

@@ -85,6 +85,7 @@ module.exports = {
     'no-await-in-loop': 'off',
     'no-undef-init': 'off',
     'no-unneeded-ternary': 'off',
+    'no-underscore-dangle': 'off',
     'prefer-object-spread': 'off',
     'prefer-template': 'off',
     'default-case': 'off',

.gitignore

@@ -40,6 +40,7 @@ app/public/styles/*.css
 .idea
 .cache/
 venv/
+*.tsbuildinfo
 
 # Frontend
 .awcache/
@@ -52,7 +53,4 @@ yarn-error.log
 
 # Certs
 .srl
-script/rootCA.*
-script/server.crt
-script/server.csr
-script/server.key
+certificate/

.storybook/StorybookContainer.tsx

@@ -6,11 +6,11 @@ import { QueryClientProvider } from 'react-query';
 import { MemoryRouter } from 'react-router-dom';
 import { SnackbarProvider } from 'notistack';
 
-import { ErrorBoundary } from '../src/components/common/ErrorBoundary';
-import { createQueryClient } from '../src/components/data/queryCache';
-import { muiTheme } from '../src/components/Theme/muiTheme';
-import { LocalCacheProvider } from '../src/basics/LocalCache/ContextProvider';
-import { FeatureFlagsProvider } from '../src/basics/FeatureFlags';
+import { ErrorBoundary } from '../packages/zapp/console/src/components/common/ErrorBoundary';
+import { createQueryClient } from '../packages/zapp/console/src/components/data/queryCache';
+import { muiTheme } from '../packages/zapp/console/src/components/Theme/muiTheme';
+import { LocalCacheProvider } from '../packages/zapp/console/src/basics/LocalCache/ContextProvider';
+import { FeatureFlagsProvider } from '../packages/zapp/console/src/basics/FeatureFlags';
 
 const useStyles = makeStyles((theme: Theme) => ({
   container: {

.storybook/main.js

@@ -1,16 +1,17 @@
+var path = require('path');
 module.exports = {
   core: {
     builder: 'webpack5',
   },
-  stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
+  stories: ['../packages/**/*.stories.@(js|jsx|ts|tsx|mdx)'],
   addons: [
     '@storybook/addon-links',
     '@storybook/addon-essentials',
     '@storybook/addon-interactions',
   ],
   framework: '@storybook/react',
   webpackFinal: async (config, { configType }) => {
-    config.resolve.modules = ['src', 'node_modules'];
+    config.resolve.modules = ['packages/zapp/console/src', 'node_modules'];
     config.module.rules = [
       ...config.module.rules,
       {
@@ -22,6 +23,14 @@ module.exports = {
         use: ['babel-loader', { loader: 'ts-loader', options: { transpileOnly: true } }],
       },
     ];
+
+    config.resolve.alias = {
+      ...config.resolve.alias,
+      '@flyteconsole/locale': path.resolve(__dirname, '../packages/basics/locale/src'),
+      '@flyteconsole/ui-atoms': path.resolve(__dirname, '../packages/composites/ui-atoms/src'),
+      '@flyteconsole/components': path.resolve(__dirname, '../packages/plugins/components/src'),
+    };
+
     return config;
   },
 };

Dockerfile

@@ -1,8 +1,9 @@
+# Use node:17 to docker build on M1
 FROM node:16 as builder
-LABEL org.opencontainers.image.source https://github.com/lyft/flyteconsole
+LABEL org.opencontainers.image.source https://github.com/flyteorg/flyteconsole
 
 WORKDIR /code/flyteconsole
-COPY package*.json yarn.lock ./
+COPY ./packages/zapp/console/package*.json yarn.lock ./
 RUN : \
   # install production dependencies
   && yarn install --production \
@@ -17,10 +18,11 @@ RUN : \
   # build
   && make build_prod \
   # place the runtime application in /app
-  && mv dist index.js env.js plugins.js /app
+  && mv ./packages/zapp/console/dist /app \
+  && mv ./packages/zapp/console/index.js ./packages/zapp/console/env.js ./packages/zapp/console/plugins.js /app
 
 FROM gcr.io/distroless/nodejs
-LABEL org.opencontainers.image.source https://github.com/lyft/flyteconsole
+LABEL org.opencontainers.image.source https://github.com/flyteorg/flyteconsole
 
 COPY --from=builder /app app
 WORKDIR /app

jest.config.js

@@ -1,45 +1,21 @@
+/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
+const sharedConfig = require('./script/test/jest.base.js');
+
 module.exports = {
-  globals: {
-    'ts-jest': {
-      babelConfig: true,
-    },
-  },
+  ...sharedConfig,
+  clearMocks: true,
   verbose: false,
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'json', 'node'],
-  modulePaths: ['<rootDir>/src'],
-  roots: ['<rootDir>/src'],
-  testPathIgnorePatterns: [
-    '__stories__',
-    '<rootDir>/.storybook',
-    '<rootDir>/node_modules',
-    '<rootDir>/dist',
-    '<rootDir>/build',
+
+  setupFilesAfterEnv: ['./script/test/jest-setup.ts'],
+  projects: [
+    '<rootDir>/packages/basics/locale',
+    '<rootDir>/packages/composites/ui-atoms',
+    '<rootDir>/packages/plugins/components',
+    '<rootDir>/packages/zapp/console',
   ],
-  transform: {
-    '^.+\\.(j|t)sx?$': 'ts-jest',
-  },
-  transformIgnorePatterns: ['<rootDir>/node_modules/(?!@flyteorg/flyteidl)'],
-  moduleNameMapper: {
-    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
-      '<rootDir>/assetsTransformer.js',
-  },
-  coverageDirectory: '.coverage',
+
+  coverageDirectory: '<rootDir>/.coverage',
   collectCoverageFrom: ['**/*.{ts,tsx}', '!**/*/*.stories.{ts,tsx}', '!**/*/*.mocks.{ts,tsx}'],
-  coveragePathIgnorePatterns: [
-    '__stories__',
-    '__mocks__',
-    '<rootDir>/.storybook',
-    '<rootDir>/node_modules',
-    '<rootDir>/dist',
-    '<rootDir>/build',
-    '<rootDir>/src/tsd',
-    '<rootDir>/src/server.ts',
-    '<rootDir>/.eslintrc.js',
-    '\\.config.js$',
-  ],
+  coveragePathIgnorePatterns: [...sharedConfig.coveragePathIgnorePatterns],
   coverageReporters: ['text', 'json', 'html'],
-  clearMocks: true,
-  setupFiles: ['<rootDir>/node_modules/regenerator-runtime/runtime'],
-  setupFilesAfterEnv: ['<rootDir>/src/test/setupTests.ts'],
-  preset: 'ts-jest',
 };