diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index e2de938bf..000000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,61 +0,0 @@ -name: Release - -on: - workflow_dispatch: - -# push: -# tags: ['r*'] - -# pull_request: - -# permissions: -# contents: write -# id-token: write -# pages: write - - -jobs: - build-all: - runs-on: ubuntu-latest - steps: - - name: Check Out Code - uses: actions/checkout@v2 - - - name: Set up Docker - uses: docker/setup-buildx-action@v1 - - - name: Set up Task - run: | - sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b ~/.local/bin - echo "Task version: $(task --version)" - - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - registry: https://ghcr.io - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_TOKEN }} - - - - name: Extract branch or tag name - id: extract_branch - run: |+ - name=${GITHUB_REF##*/} - echo "branch_or_tag=v${name:1}" >> $GITHUB_OUTPUT - - - - name: Build All - run: | - task docker-build-all tag=${{ steps.extract_branch.outputs.branch_or_tag }} - - - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ steps.extract_branch.outputs.branch_or_tag }} - release_name: Release ${{ steps.extract_branch.outputs.branch_or_tag }} - draft: false - prerelease: true diff --git a/.gitignore b/.gitignore index fb61cdf7a..f02da370b 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,9 @@ public/** !public/package.json .tmp +out +.firebase + storybook-dist tsconfig-compile.tsbuildinfo diff --git a/src/apps/auth/server/gql/queries/device-queries.ts b/src/apps/auth/server/gql/queries/device-queries.ts index ca4147aa1..da96ab7b4 100644 --- a/src/apps/auth/server/gql/queries/device-queries.ts +++ b/src/apps/auth/server/gql/queries/device-queries.ts @@ -111,6 +111,7 @@ export const vpnQueries = (executor: IExecutor) => ({ } clusterName projectName + environmentName spec { activeNamespace disabled diff --git a/src/apps/console/components/delete-dialog.tsx b/src/apps/console/components/delete-dialog.tsx index 0e6b97329..c8fcc77c2 100644 --- a/src/apps/console/components/delete-dialog.tsx +++ b/src/apps/console/components/delete-dialog.tsx @@ -59,6 +59,7 @@ const DeleteDialog = ({ setInputName(target.value); }} disabled={loading} + autoComplete="off" /> diff --git a/src/apps/console/components/menu-select.tsx b/src/apps/console/components/menu-select.tsx index 0804b8a3b..6b552756e 100644 --- a/src/apps/console/components/menu-select.tsx +++ b/src/apps/console/components/menu-select.tsx @@ -11,13 +11,10 @@ interface ISelectItem { active?: boolean; } -const SelectItem = React.forwardRef( +export const SelectItem = React.forwardRef( ({ children, className, ...props }, forwardedRef) => { return ( { - console.log(e); - }} className={cn( 'group relative flex flex-row gap-xl items-center bodyMd gap cursor-pointer select-none py-lg px-xl text-text-default outline-none transition-colors focus:bg-surface-basic-hovered hover:bg-surface-basic-hovered data-[disabled]:pointer-events-none data-[disabled]:text-text-disabled data-[state=checked]:bg-surface-basic-active', className @@ -37,6 +34,7 @@ interface IMenuSelect { items: { label: ReactNode; value: string; + render?: () => ReactNode; }[]; onChange?: (value: string) => void; onClick?: (value: string) => void; @@ -83,15 +81,13 @@ const MenuSelect = ({ > {items.map((item) => (
onClick?.(item.value)}> - -
{ - console.log('clicked'); - }} - > - {item.label} -
-
+ {item.render ? ( + item.render() + ) : ( + +
{item.label}
+
+ )}
))} diff --git a/src/apps/console/routes/_a+/onboarding+/$a+/new-cloud-provider.tsx b/src/apps/console/routes/_a+/onboarding+/$a+/new-cloud-provider.tsx index b840c5cd4..2ed12a137 100644 --- a/src/apps/console/routes/_a+/onboarding+/$a+/new-cloud-provider.tsx +++ b/src/apps/console/routes/_a+/onboarding+/$a+/new-cloud-provider.tsx @@ -10,8 +10,8 @@ import { handleError } from '~/root/lib/utils/common'; import { useState } from 'react'; import { useConsoleApi } from '~/console/server/gql/api-provider'; import { validateCloudProvider } from '~/console/server/r-utils/common'; -import { IdSelector } from '~/console/components/id-selector'; import ProgressWrapper from '~/console/components/progress-wrapper'; +import { NameIdView } from '~/console/components/name-id-view'; const NewCloudProvider = () => { const { a: accountName } = useParams(); @@ -27,6 +27,7 @@ const NewCloudProvider = () => { name: '', provider: providers[0], awsAccountId: '', + isNameError: false, }, validationSchema: Yup.object({ displayName: Yup.string().required(), @@ -35,6 +36,7 @@ const NewCloudProvider = () => { label: Yup.string().required(), value: Yup.string().required(), }).required(), + awsAccountId: Yup.string().required('AccountId is required.'), }), onSubmit: async (val) => { const addProvider = async () => { @@ -95,24 +97,16 @@ const NewCloudProvider = () => { the internet.
- - { - handleChange('name')({ target: { value: id } }); - }} - className="pt-xl" + displayName={values.displayName} + name={values.name} + label="Name" + placeholder="Enter provider name" + errors={errors.name} + handleChange={handleChange} /> -