Skip to content

Commit

Permalink
Merge branch 'develop' into wip/akirathan/8222-remove-akka-from-downl…
Browse files Browse the repository at this point in the history
…oader
  • Loading branch information
Akirathan committed Feb 16, 2024
2 parents 0d30555 + 642d5a6 commit 0e2b1d6
Show file tree
Hide file tree
Showing 326 changed files with 4,718 additions and 1,971 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,7 @@
- [Added `Table.to_xml`.][8979]
- [Implemented Write support for `S3_File`.][8921]
- [Separate `Group_By` from `columns` into new argument on `aggregate`.][9027]
- [Allow `copy_to` and `move_to` to work between local and S3 files.][9054]

[debug-shortcuts]:
https://github.com/enso-org/enso/blob/develop/app/gui/docs/product/shortcuts.md#debug
Expand Down Expand Up @@ -888,6 +889,7 @@
[8979]: https://github.com/enso-org/enso/pull/8979
[8921]: https://github.com/enso-org/enso/pull/8921
[9027]: https://github.com/enso-org/enso/pull/9027
[9054]: https://github.com/enso-org/enso/pull/9054

#### Enso Compiler

Expand Down Expand Up @@ -1044,7 +1046,9 @@
- [DataflowError.withoutTrace doesn't store stacktrace][8608]
- [Derive --in-project from --run source location][8775]
- [Binary operator resolution based on that value][8779]
- [Add run_google_report method][8907]
- [Execute and debug individual Enso files in VSCode extension][8923]
- [Check type of `self` when calling a method using the static syntax][8867]

[3227]: https://github.com/enso-org/enso/pull/3227
[3248]: https://github.com/enso-org/enso/pull/3248
Expand Down Expand Up @@ -1200,7 +1204,9 @@
[8608]: https://github.com/enso-org/enso/pull/8608
[8775]: https://github.com/enso-org/enso/pull/8775
[8779]: https://github.com/enso-org/enso/pull/8779
[8907]: https://github.com/enso-org/enso/pull/8907
[8923]: https://github.com/enso-org/enso/pull/8923
[8867]: https://github.com/enso-org/enso/pull/8867

# Enso 2.0.0-alpha.18 (2021-10-12)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,9 @@ loadScript('https://cdnjs.cloudflare.com/ajax/libs/sql-formatter/4.0.2/sql-forma
*/
class SqlVisualization extends Visualization {
// TODO Change the type below once #837 is done:
// 'Standard.Database.Data.Table.Table | Standard.Database.Data.Column.Column'
static inputType = 'Standard.Database.Data.Table.Table | Standard.Database.Data.Column.Column'
// 'Standard.Database.Data.Table.Table | Standard.Database.Data.DB_Column.DB_Column'
static inputType =
'Standard.Database.Data.Table.Table | Standard.Database.Data.DB_Column.DB_Column'
static label = 'SQL Query'

constructor(api) {
Expand Down
3 changes: 2 additions & 1 deletion app/gui2/e2e/main.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'enso-dashboard/src/tailwind.css'
import { createPinia } from 'pinia'
import { initializeFFI } from 'shared/ast/ffi'
import { createApp, ref } from 'vue'
import { mockDataHandler, mockLSHandler } from '../mock/engine'
import '../src/assets/base.css'
Expand Down Expand Up @@ -55,4 +56,4 @@ provideVisualizationConfig._mock(
},
app,
)
app.mount('#app')
initializeFFI().then(() => app.mount('#app'))
1 change: 0 additions & 1 deletion app/gui2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@
"unbzip2-stream": "^1.4.3",
"vite": "^4.4.9",
"vite-plugin-inspect": "^0.7.38",
"vite-plugin-top-level-await": "^1.3.1",
"vitest": "^0.34.2",
"vue-react-wrapper": "^0.3.1",
"vue-tsc": "^1.8.8"
Expand Down
141 changes: 114 additions & 27 deletions app/gui2/src/components/CircularMenu.vue
Original file line number Diff line number Diff line change
@@ -1,24 +1,35 @@
<script setup lang="ts">
import SvgIcon from '@/components/SvgIcon.vue'
import ToggleIcon from '@/components/ToggleIcon.vue'
const props = defineProps<{
isOutputContextEnabledGlobally: boolean
isOutputContextOverridden: boolean
isDocsVisible: boolean
isVisualizationVisible: boolean
isFullMenuVisible: boolean
}>()
const emit = defineEmits<{
'update:isOutputContextOverridden': [isOutputContextOverridden: boolean]
'update:isDocsVisible': [isDocsVisible: boolean]
'update:isVisualizationVisible': [isVisualizationVisible: boolean]
startEditing: []
}>()
</script>

<template>
<div class="CircularMenu">
<div :class="`${props.isFullMenuVisible ? 'CircularMenu full' : 'CircularMenu partial'}`">
<ToggleIcon
icon="eye"
class="icon-container button slot5"
:alt="`${props.isVisualizationVisible ? 'Hide' : 'Show'} visualization`"
:modelValue="props.isVisualizationVisible"
@update:modelValue="emit('update:isVisualizationVisible', $event)"
/>
<SvgIcon name="edit" class="icon-container button slot6" @pointerdown="emit('startEditing')" />
<ToggleIcon
:icon="props.isOutputContextEnabledGlobally ? 'no_auto_replay' : 'auto_replay'"
class="icon-container button override-output-context-button"
class="icon-container button slot7"
:class="{ 'output-context-overridden': props.isOutputContextOverridden }"
:alt="`${
props.isOutputContextEnabledGlobally != props.isOutputContextOverridden
Expand All @@ -28,20 +39,6 @@ const emit = defineEmits<{
:modelValue="props.isOutputContextOverridden"
@update:modelValue="emit('update:isOutputContextOverridden', $event)"
/>
<ToggleIcon
icon="docs"
class="icon-container button docs-button"
:alt="`${props.isDocsVisible ? 'Hide' : 'Show'} documentation`"
:modelValue="props.isDocsVisible"
@update:modelValue="emit('update:isDocsVisible', $event)"
/>
<ToggleIcon
icon="eye"
class="icon-container button visualization-button"
:alt="`${props.isVisualizationVisible ? 'Hide' : 'Show'} visualization`"
:modelValue="props.isVisualizationVisible"
@update:modelValue="emit('update:isVisualizationVisible', $event)"
/>
</div>
</template>

Expand All @@ -50,18 +47,61 @@ const emit = defineEmits<{
user-select: none;
position: absolute;
left: -36px;
width: 76px;
height: 76px;
top: -36px;
width: 114px;
height: 114px;
&:before {
content: '';
position: absolute;
clip-path: path('m0 16a52 52 0 0 0 52 52a16 16 0 0 0 0 -32a20 20 0 0 1-20-20a16 16 0 0 0-32 0');
backdrop-filter: var(--blur-app-bg);
background: var(--color-app-bg);
width: 100%;
height: 100%;
}
&.partial {
&:before {
top: 36px;
clip-path: path(
'm0 16a52 52 0 0 0 52 52a16 16 0 0 0 0 -32a20 20 0 0 1-20-20a16 16 0 0 0-32 0'
);
}
}
&.full {
&:before {
clip-path: path(
evenodd,
'M0,52 A52,52 0,1,1 104,52 A52,52 0,1,1 0, 52 z m52,20 A20,20 0,1,1 52,32 20,20 0,1,1 52,72 z'
);
}
}
}
.More {
position: absolute;
left: -5.5px;
top: 27px;
width: 42px;
height: 17px;
clip-path: path(
evenodd,
'M7.96503 8C7.96503 3.58172 11.5467 0 15.965 0H26.035C30.4533 0 34.035 3.58172 34.035 8V20 H7.96503V8Z'
);
transform: scale(0.8);
backdrop-filter: var(--blur-app-bg);
background: var(--color-app-bg);
z-index: -2;
&:after {
content: '...';
font-size: 15px;
display: block;
text-align: center;
z-index: 10000;
margin-top: -10px;
opacity: 0.3;
}
}
.icon-container {
Expand All @@ -76,26 +116,73 @@ const emit = defineEmits<{
opacity: unset;
}
.override-output-context-button {
position: absolute;
left: 9px;
top: 8px;
.inactive {
pointer-events: none;
opacity: 10%;
}
.output-context-overridden {
opacity: 100%;
color: red;
}
.docs-button {
/**
* The following styles are used to position the icons in a circular pattern. The slots are named slot1 to slot8 and
* are positioned using absolute positioning. The slots are positioned in a circle with slot1 at the top and the rest
* of the slots are positioned in a clockwise direction.
* ```
* slot1
* slot8 slot2
* slot7 slot3
* slot6 slot4
* slot5
* ```
*/
.slot1 {
position: absolute;
left: 18.54px;
top: 33.46px;
left: 44px;
top: 8px;
}
.slot2 {
position: absolute;
top: 18.54px;
left: 69.46px;
}
.slot3 {
position: absolute;
top: 44px;
left: 80px;
}
.slot4 {
position: absolute;
top: 69.46px;
left: 69.46px;
}
.visualization-button {
.slot5 {
position: absolute;
left: 44px;
top: 80px;
}
.slot6 {
position: absolute;
top: 69.46px;
left: 18.54px;
}
.slot7 {
position: absolute;
top: 44px;
left: 9px;
}
.slot8 {
position: absolute;
top: 18.54px;
left: 18.54px;
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ import {
import type { AstId } from '@/util/ast/abstract'
import { unwrap } from '@/util/data/result'
import { tryIdentifier, tryQualifiedName } from '@/util/qualifiedName'
import { initializeFFI } from 'shared/ast/ffi'
import type { ExternalId, Uuid } from 'shared/yjsModel'
import { expect, test } from 'vitest'

await initializeFFI()

test.each([
['', 0, { type: 'insert', position: 0 }, {}],
[
Expand Down
Loading

0 comments on commit 0e2b1d6

Please sign in to comment.