Skip to content

Commit

Permalink
Merge branch 'develop' into wip/sergeigarin/fix-upoad
Browse files Browse the repository at this point in the history
  • Loading branch information
PabloBuchu committed Oct 8, 2024
2 parents af29937 + 6e11e6a commit 6c389e1
Show file tree
Hide file tree
Showing 227 changed files with 3,447 additions and 1,442 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/extra-nightly-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ jobs:
run: ./run git-clean
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: ./run backend test standard-library
- run: ./run backend test std-cloud-related
env:
ENSO_CLOUD_COGNITO_REGION: ${{ secrets.ENSO_CLOUD_COGNITO_REGION }}
ENSO_CLOUD_COGNITO_USER_POOL_ID: ${{ secrets.ENSO_CLOUD_COGNITO_USER_POOL_ID }}
ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID: ${{ secrets.ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID }}
ENSO_CLOUD_COGNITO_REGION: ${{ vars.ENSO_CLOUD_COGNITO_REGION }}
ENSO_CLOUD_COGNITO_USER_POOL_ID: ${{ vars.ENSO_CLOUD_COGNITO_USER_POOL_ID }}
ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID: ${{ vars.ENSO_CLOUD_COGNITO_USER_POOL_WEB_CLIENT_ID }}
ENSO_CLOUD_TEST_ACCOUNT_PASSWORD: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_PASSWORD }}
ENSO_CLOUD_TEST_ACCOUNT_USERNAME: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_USERNAME }}
ENSO_LIB_S3_AWS_ACCESS_KEY_ID: ${{ secrets.ENSO_LIB_S3_AWS_ACCESS_KEY_ID }}
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/gui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,13 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VITE_ENSO_AG_GRID_LICENSE_KEY: ${{ vars.ENSO_AG_GRID_LICENSE_KEY }}
VITE_ENSO_MAPBOX_API_TOKEN: ${{ vars.ENSO_MAPBOX_API_TOKEN }}
- run: xvfb-run corepack pnpm -r --filter enso exec playwright test
env:
DEBUG: "pw:browser log:"
ENSO_TEST_APP_ARGS: --no-sandbox
ENSO_TEST_USER: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_USERNAME }}
ENSO_TEST_USER_PASSWORD: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_PASSWORD }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- if: failure() && runner.os == 'Windows'
name: List files if failed (Windows)
run: Get-ChildItem -Force -Recurse
Expand Down Expand Up @@ -428,6 +435,12 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VITE_ENSO_AG_GRID_LICENSE_KEY: ${{ vars.ENSO_AG_GRID_LICENSE_KEY }}
VITE_ENSO_MAPBOX_API_TOKEN: ${{ vars.ENSO_MAPBOX_API_TOKEN }}
- run: corepack pnpm -r --filter enso exec playwright test
env:
DEBUG: "pw:browser log:"
ENSO_TEST_USER: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_USERNAME }}
ENSO_TEST_USER_PASSWORD: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_PASSWORD }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- if: failure() && runner.os == 'Windows'
name: List files if failed (Windows)
run: Get-ChildItem -Force -Recurse
Expand Down Expand Up @@ -487,6 +500,12 @@ jobs:
VITE_ENSO_MAPBOX_API_TOKEN: ${{ vars.ENSO_MAPBOX_API_TOKEN }}
WIN_CSC_KEY_PASSWORD: ${{ secrets.MICROSOFT_CODE_SIGNING_CERT_PASSWORD }}
WIN_CSC_LINK: ${{ secrets.MICROSOFT_CODE_SIGNING_CERT }}
- run: corepack pnpm -r --filter enso exec playwright test
env:
DEBUG: "pw:browser log:"
ENSO_TEST_USER: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_USERNAME }}
ENSO_TEST_USER_PASSWORD: ${{ secrets.ENSO_CLOUD_TEST_ACCOUNT_PASSWORD }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- if: failure() && runner.os == 'Windows'
name: List files if failed (Windows)
run: Get-ChildItem -Force -Recurse
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ bench-report*.xml

/built-distribution/
/enso
/ensoup
/project-manager
/enso.exp
/enso.lib
Expand Down
21 changes: 19 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@

[11151]: https://github.com/enso-org/enso/pull/11151

#### Enso Standard Library

- [The `enso://~` path now resolves to user's home directory in the
cloud.][11235]

[11235]: https://github.com/enso-org/enso/pull/11235

# Enso 2024.4

#### Enso IDE
Expand All @@ -27,6 +34,8 @@
- [Fixed issue where drag'n'dropped files were not uploaded in cloud
projects.][11014]
- [Fixed files associations not properly registered on Windows][11030]
- [Input components corresponding to function arguments are now
displayed.][11165]
- [Fixed "rename project" button being broken after not changing project
name][11103]
- [Numbers starting with dot (`.5`) are accepted in Numeric Widget][11108]
Expand All @@ -41,6 +50,7 @@
[11001]: https://github.com/enso-org/enso/pull/11001
[11014]: https://github.com/enso-org/enso/pull/11014
[11030]: https://github.com/enso-org/enso/pull/11030
[11165]: https://github.com/enso-org/enso/pull/11165
[11103]: https://github.com/enso-org/enso/pull/11103
[11108]: https://github.com/enso-org/enso/pull/11108
[11056]: https://github.com/enso-org/enso/pull/11056
Expand All @@ -58,10 +68,14 @@
- [Support for creating Atoms in expressions.][10820]
- [IO.print without new line][10858]
- [Add `Text.to_decimal`.][10874]
- [Added .floor, .ceil, .trunc to the in-memory `Decimal` column.][10887]
- [Added `floor`, `ceil`, `trunc` to the in-memory `Decimal` column.][10887]
- [Added vectorized .round to the in-memory `Decimal` column.][10912]
- [`select_into_database_table` no longer defaults the primary key to the first
column][11120]
column.][11120]
- [Extend the range of `floor`, `ceil`, `trunc` to values outside the `Long`
range.][11135]
- [Added `format` parameter to `Decimal.parse`.][11205]
- [Added `format` parameter to `Float.parse`.][11229]

[10614]: https://github.com/enso-org/enso/pull/10614
[10660]: https://github.com/enso-org/enso/pull/10660
Expand All @@ -74,6 +88,9 @@
[10887]: https://github.com/enso-org/enso/pull/10887
[10912]: https://github.com/enso-org/enso/pull/10912
[11120]: https://github.com/enso-org/enso/pull/11120
[11135]: https://github.com/enso-org/enso/pull/11135
[11205]: https://github.com/enso-org/enso/pull/11205
[11229]: https://github.com/enso-org/enso/pull/11229

#### Enso Language & Runtime

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export interface DialogProps
Omit<VariantProps<typeof DIALOG_STYLES>, 'scrolledToTop'> {}

const OVERLAY_STYLES = tv({
base: 'fixed inset-0 isolate flex items-center justify-center bg-primary/20',
base: 'fixed inset-0 isolate flex items-center justify-center bg-primary/20 z-tooltip',
variants: {
isEntering: { true: 'animate-in fade-in duration-200 ease-out' },
isExiting: { true: 'animate-out fade-out duration-200 ease-in' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export interface PopoverProps
}

export const POPOVER_STYLES = twv.tv({
base: 'shadow-xl w-full overflow-clip',
base: 'shadow-xl w-full overflow-clip z-tooltip',
variants: {
isEntering: {
true: 'animate-in fade-in placement-bottom:slide-in-from-top-1 placement-top:slide-in-from-bottom-1 placement-left:slide-in-from-right-1 placement-right:slide-in-from-left-1 ease-out duration-200',
Expand Down Expand Up @@ -102,7 +102,10 @@ export function Popover(props: PopoverProps) {
}
UNSTABLE_portalContainer={root}
placement={placement}
style={{ zIndex: 'unset' }}
style={{
// Unset the default z-index set by react-aria-components.
zIndex: '',
}}
shouldCloseOnInteractOutside={() => false}
{...ariaPopoverProps}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import {
type Ref,
} from 'react'

import type { VariantProps } from 'tailwind-variants'

import * as aria from '#/components/aria'
import {
Form,
Expand All @@ -30,7 +28,7 @@ import SvgMask from '#/components/SvgMask'
import { useAutoFocus } from '#/hooks/autoFocusHooks'
import { mergeRefs } from '#/utilities/mergeRefs'
import { forwardRef } from '#/utilities/react'
import type { ExtractFunction } from '#/utilities/tailwindVariants'
import type { ExtractFunction, VariantProps } from '#/utilities/tailwindVariants'
import { omit } from 'enso-common/src/utilities/data/object'
import { INPUT_STYLES } from '../variants'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/** @file A horizontal selector supporting multiple input. */
import { useRef, type CSSProperties, type ForwardedRef, type Ref } from 'react'

import type { VariantProps } from 'tailwind-variants'

import {
FieldError,
ListBox,
Expand All @@ -20,7 +18,7 @@ import {
} from '#/components/AriaComponents'
import { mergeRefs } from '#/utilities/mergeRefs'
import { forwardRef } from '#/utilities/react'
import { tv } from '#/utilities/tailwindVariants'
import { tv, type VariantProps } from '#/utilities/tailwindVariants'
import { omit, unsafeRemoveUndefined } from 'enso-common/src/utilities/data/object'
import { MultiSelectorOption } from './MultiSelectorOption'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/** @file A horizontal selector. */
import * as React from 'react'

import type * as twv from 'tailwind-variants'

import { mergeProps, type RadioGroupProps } from '#/components/aria'
import type { FieldComponentProps } from '#/components/AriaComponents'
import {
Expand All @@ -19,7 +17,7 @@ import { AnimatedBackground } from '#/components/AnimatedBackground'
import RadioGroup from '#/components/styled/RadioGroup'
import { mergeRefs } from '#/utilities/mergeRefs'
import { forwardRef } from '#/utilities/react'
import { tv } from '#/utilities/tailwindVariants'
import { tv, type VariantProps } from '#/utilities/tailwindVariants'
import { SelectorOption } from './SelectorOption'

/** * Props for the Selector component. */
Expand All @@ -30,7 +28,7 @@ export interface SelectorProps<Schema extends TSchema, TFieldName extends FieldP
TFieldName
>,
FieldProps,
Omit<twv.VariantProps<typeof SELECTOR_STYLES>, 'disabled' | 'invalid'>,
Omit<VariantProps<typeof SELECTOR_STYLES>, 'disabled' | 'invalid' | 'variants'>,
FieldVariantProps {
readonly items: readonly FieldValues<Schema>[TFieldName][]
readonly children?: (item: FieldValues<Schema>[TFieldName]) => string
Expand Down
6 changes: 3 additions & 3 deletions app/dashboard/src/components/AriaComponents/Switch/Switch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
*
* A switch allows a user to turn a setting on or off.
*/
import { useRef, type CSSProperties, type ForwardedRef } from 'react'

import {
Switch as AriaSwitch,
mergeProps,
type SwitchProps as AriaSwitchProps,
} from '#/components/aria'
import { mergeRefs } from '#/utilities/mergeRefs'
import { forwardRef } from '#/utilities/react'
import type { CSSProperties, ForwardedRef } from 'react'
import { useRef } from 'react'
import { tv, type VariantProps } from 'tailwind-variants'
import { tv, type VariantProps } from '#/utilities/tailwindVariants'
import { Form, type FieldPath, type FieldProps, type FieldStateProps, type TSchema } from '../Form'
import { TEXT_STYLE } from '../Text'

Expand Down
9 changes: 3 additions & 6 deletions app/dashboard/src/components/Result.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
/** @file Display the result of an operation. */
import * as React from 'react'

import * as twv from 'tailwind-variants'

import Success from '#/assets/check_mark.svg'
import Error from '#/assets/cross.svg'

import * as ariaComponents from '#/components/AriaComponents'
import * as loader from '#/components/Loader'
import SvgMask from '#/components/SvgMask'
import { tv, type VariantProps } from '#/utilities/tailwindVariants'

// =================
// === Constants ===
Expand Down Expand Up @@ -48,7 +47,7 @@ const STATUS_ICON_MAP: Readonly<Record<Status, StatusIcon>> = {
},
}

const RESULT_STYLES = twv.tv({
const RESULT_STYLES = tv({
base: 'flex flex-col items-center justify-center max-w-full px-6 py-4 text-center h-[max-content]',
variants: {
centered: {
Expand Down Expand Up @@ -92,9 +91,7 @@ interface StatusIcon {
// ==============

/** Props for a {@link Result}. */
export interface ResultProps
extends React.PropsWithChildren,
twv.VariantProps<typeof RESULT_STYLES> {
export interface ResultProps extends React.PropsWithChildren, VariantProps<typeof RESULT_STYLES> {
readonly className?: string
readonly title?: React.JSX.Element | string
readonly subtitle?: React.JSX.Element | string
Expand Down
4 changes: 2 additions & 2 deletions app/dashboard/src/components/Stepper/Step.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
import * as React from 'react'

import { AnimatePresence, motion } from 'framer-motion'
import * as tvw from 'tailwind-variants'

import DoneIcon from '#/assets/check_mark.svg'

import * as ariaComponents from '#/components/AriaComponents'
import SvgMask from '#/components/SvgMask'

import { tv } from '#/utilities/tailwindVariants'
import * as stepperProvider from './StepperProvider'
import type { RenderStepProps } from './types'
import type * as stepperState from './useStepperState'
Expand All @@ -31,7 +31,7 @@ export interface StepProps extends RenderStepProps {
readonly children?: StepProp<React.ReactNode>
}

const STEP_STYLES = tvw.tv({
const STEP_STYLES = tv({
base: 'relative flex items-center gap-2 select-none',
slots: {
icon: 'w-6 h-6 border-0.5 flex-none border-current rounded-full flex items-center justify-center transition-colors duration-200',
Expand Down
4 changes: 2 additions & 2 deletions app/dashboard/src/components/Stepper/Stepper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
import * as React from 'react'

import { AnimatePresence, motion } from 'framer-motion'
import * as tvw from 'tailwind-variants'

import * as eventCallback from '#/hooks/eventCallbackHooks'

import { ErrorBoundary } from '#/components/ErrorBoundary'
import { Suspense } from '#/components/Suspense'

import { tv } from '#/utilities/tailwindVariants'
import { Step } from './Step'
import { StepContent } from './StepContent'
import * as stepperProvider from './StepperProvider'
Expand All @@ -37,7 +37,7 @@ export interface StepperProps {
| undefined
}

const STEPPER_STYLES = tvw.tv({
const STEPPER_STYLES = tv({
base: 'flex flex-col items-center w-full gap-4',
slots: {
steps: 'flex items-center justify-between w-full',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
*/
import * as React from 'react'

import * as twv from 'tailwind-variants'

import type * as text from 'enso-common/src/text'

import Check from '#/assets/check_mark.svg'
Expand All @@ -15,11 +13,12 @@ import * as textProvider from '#/providers/TextProvider'

import * as ariaComponents from '#/components/AriaComponents'
import SvgMask from '#/components/SvgMask'
import { tv, type VariantProps } from '#/utilities/tailwindVariants'

/**
* Card props
*/
export interface CardProps extends React.PropsWithChildren, twv.VariantProps<typeof CARD_STYLES> {
export interface CardProps extends React.PropsWithChildren, VariantProps<typeof CARD_STYLES> {
/**
* Card title
*/
Expand All @@ -38,7 +37,7 @@ export interface CardProps extends React.PropsWithChildren, twv.VariantProps<typ
readonly className?: string
}

export const CARD_STYLES = twv.tv({
export const CARD_STYLES = tv({
base: 'flex flex-col border-0.5',
variants: {
elevated: {
Expand Down
2 changes: 1 addition & 1 deletion app/gui2/e2e/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export async function goToGraph(page: Page, closeDocPanel: boolean = true) {
await expect(page.getByTestId('rightDock')).toBeHidden()
}
// Wait for position initialization
await expectNodePositionsInitialized(page, 72)
await expectNodePositionsInitialized(page, -16)
}

export async function expectNodePositionsInitialized(page: Page, yPos: number) {
Expand Down
Loading

0 comments on commit 6c389e1

Please sign in to comment.