Skip to content

Commit

Permalink
Merge pull request #1777 from flowforge/feat-1718-instance-ui-tweaks-2
Browse files Browse the repository at this point in the history
Further renaming of project to application
  • Loading branch information
Pezmc committed Mar 8, 2023
2 parents c77f532 + 1ade37e commit 25cec75
Show file tree
Hide file tree
Showing 13 changed files with 104 additions and 652 deletions.
17 changes: 17 additions & 0 deletions frontend/src/pages/project/Overview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
<p>It will always run the latest flow deployed in Node-RED and use the latest credentials and runtime settings defined in the Projects settings.</p>
<p>To edit an Applications flow, open the editor of the Instance.</p>
</template>
<template #tools>
<ff-button v-if="hasPermission('project:create')" data-action="create-project-1" kind="primary" size="small" :to="`/team/${team.slug}/projects/create`" data-nav="create-instance"><template #icon-left><PlusSmIcon /></template>Create Instance</ff-button>
</template>
</SectionTopMenu>

<div class="space-y-6 mb-12">
Expand Down Expand Up @@ -205,6 +208,7 @@ import DeviceCredentialsDialog from '../team/Devices/dialogs/DeviceCredentialsDi
import DeviceLastSeenBadge from '@/pages/device/components/DeviceLastSeenBadge'
import DeploymentName from './components/cells/DeploymentName.vue'
import DeviceLink from './components/cells/DeviceLink.vue'
import InstanceLink from './components/cells/InstanceLink.vue'
import LastSeen from './components/cells/LastSeen.vue'
import ProjectEditorLink from './components/cells/ProjectEditorLink.vue'
import ProjectStatusBadge from '@/pages/project/components/ProjectStatusBadge'
Expand Down Expand Up @@ -246,6 +250,19 @@ export default {
columns () {
return [
{ label: 'Device', key: 'name', class: ['w-64'], sortable: true, component: { is: markRaw(DeviceLink) } },
{
label: 'Instance',
key: 'project',
class: ['w-64'],
sortable: true,
component: {
is: markRaw(InstanceLink),
map: {
id: 'project.id',
name: 'project.name'
}
}
},
{ label: 'Last Seen', key: 'lastSeenAt', class: ['w-32'], sortable: true, component: { is: markRaw(DeviceLastSeenBadge) } },
{ label: 'Last Known Status', class: ['w-32'], component: { is: markRaw(ProjectStatusBadge) } },
{ label: 'Deployed Snapshot', class: ['w-48'], component: { is: markRaw(Snapshot) } }
Expand Down
128 changes: 0 additions & 128 deletions frontend/src/pages/project/components/ProjectChargesTable.vue

This file was deleted.

25 changes: 0 additions & 25 deletions frontend/src/pages/project/components/ProjectCreditBanner.vue

This file was deleted.

Loading

0 comments on commit 25cec75

Please sign in to comment.