diff --git a/.gitattributes b/.gitattributes index 2fa7c2b2b811..e5caeaf619cc 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ *.enso text eol=lf *.png binary +CHANGELOG.md merge=union diff --git a/CHANGELOG.md b/CHANGELOG.md index 543ee83c26e5..1671561c1380 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ re-opening][11435] - [Added application version to the title bar.][11446] - [Added "open grouped components" action to the context menu.][11447] +- [Added an error message screen displayed when viewing a deleted + component.][11452] [11151]: https://github.com/enso-org/enso/pull/11151 [11271]: https://github.com/enso-org/enso/pull/11271 @@ -25,10 +27,11 @@ [11383]: https://github.com/enso-org/enso/pull/11383 [11388]: https://github.com/enso-org/enso/pull/11388 [11398]: https://github.com/enso-org/enso/pull/11398 -[11398]: https://github.com/enso-org/enso/pull/11433 +[11433]: https://github.com/enso-org/enso/pull/11433 [11435]: https://github.com/enso-org/enso/pull/11435 [11446]: https://github.com/enso-org/enso/pull/11446 [11447]: https://github.com/enso-org/enso/pull/11447 +[11452]: https://github.com/enso-org/enso/pull/11452 #### Enso Standard Library diff --git a/app/gui/src/project-view/components/GraphEditor.vue b/app/gui/src/project-view/components/GraphEditor.vue index 43eb750fd9fa..d6c330522987 100644 --- a/app/gui/src/project-view/components/GraphEditor.vue +++ b/app/gui/src/project-view/components/GraphEditor.vue @@ -21,6 +21,7 @@ import { performCollapse, prepareCollapsedInfo } from '@/components/GraphEditor/ import type { NodeCreationOptions } from '@/components/GraphEditor/nodeCreation' import { useGraphEditorToasts } from '@/components/GraphEditor/toasts' import { Uploader, uploadedExpression } from '@/components/GraphEditor/upload' +import GraphMissingView from '@/components/GraphMissingView.vue' import GraphMouse from '@/components/GraphMouse.vue' import PlusButton from '@/components/PlusButton.vue' import SceneScroller from '@/components/SceneScroller.vue' @@ -214,6 +215,7 @@ function panToSelected() { // == Breadcrumbs == const stackNavigator = provideStackNavigator(projectStore, graphStore) +const graphMissing = computed(() => graphStore.moduleRoot != null && !graphStore.methodAst.ok) // === Toasts === @@ -724,25 +726,29 @@ const documentationEditorFullscreen = ref(false) >
- - - + + - +import SvgIcon from '@/components/SvgIcon.vue' +import { useProjectStore } from '@/stores/project' +import StandaloneButton from './StandaloneButton.vue' + +const project = useProjectStore() + +function goToMain() { + project.executionContext.desiredStack = [project.executionContext.getStackBottom()] +} + + + + + diff --git a/app/gui/src/project-view/components/StandaloneButton.vue b/app/gui/src/project-view/components/StandaloneButton.vue new file mode 100644 index 000000000000..4c965dd46c58 --- /dev/null +++ b/app/gui/src/project-view/components/StandaloneButton.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/app/gui/src/project-view/components/SvgButton.vue b/app/gui/src/project-view/components/SvgButton.vue index bbab27dff7d9..068b3f758eeb 100644 --- a/app/gui/src/project-view/components/SvgButton.vue +++ b/app/gui/src/project-view/components/SvgButton.vue @@ -5,7 +5,7 @@ import type { URLString } from '@/util/data/urlString' import type { Icon } from '@/util/iconName' const _props = defineProps<{ - name: Icon | URLString + name?: Icon | URLString | undefined label?: string | undefined disabled?: boolean title?: string | undefined @@ -14,7 +14,7 @@ const _props = defineProps<{