Skip to content
This repository was archived by the owner on Jan 20, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
19b7dda
Remove unused lodash partial dependencies. Use full lodash instead.
Oct 28, 2019
332d250
Remove requirement of os id for the os logo component.
Oct 28, 2019
2dcb8ea
Fix line endings.
Oct 28, 2019
322984d
Move style fix to main component.
Oct 28, 2019
978a953
Add custom disk offering selection component.
Oct 28, 2019
6b3ee74
Merge branch 'master' into feature/vm-wizard
Oct 29, 2019
8657d62
Extract disk size selection as component.
Oct 29, 2019
631d3f7
Hide the info card for mobile devices.
Oct 29, 2019
327f388
Simplify the disk size output in the info card.
Oct 29, 2019
da3b5b6
Add custom component for iso selection.
Oct 30, 2019
366fd32
Lazy load isos on oping the collapse item.
Oct 30, 2019
5081c63
Merge branch 'master' into feature/vm-wizard
Nov 4, 2019
dd1cfa9
Fetch more categories of isos.
Nov 4, 2019
f81b388
Distinguish between shared and self uploaded isos.
Nov 4, 2019
4f81c6d
Unify template and iso selection.
Nov 4, 2019
5d0c425
Apply iso selection to the instance config info card.
Nov 4, 2019
9d1147d
Merge branch 'master' into feature/vm-wizard
Dec 2, 2019
c09c6c8
Fix linting issues.
Dec 2, 2019
4483e8b
Pin featured isos/templates at the top at each list.
Dec 2, 2019
ec6e7aa
Make the info card sticky.
Dec 2, 2019
eb23f19
Add template/iso filter.
Dec 3, 2019
388a7b1
Introduce custom filter view for templates/iso selection.
Dec 4, 2019
064fbd7
Reset template/iso selection on switching iso/template.
Dec 4, 2019
10562a3
Merge branch 'master' into feature/vm-wizard
Dec 17, 2019
c5fe067
Reset also the rootdisksize on switching from template to iso.
Dec 17, 2019
99e1994
Refactor parameter handling to prepare the affinity group selection.
Dec 18, 2019
51cb575
Fix missing isos.
Dec 18, 2019
7831689
Refactor option/parameter handling, rename variables for a better rea…
Dec 18, 2019
e11dad5
Introduce affinity groups selection.
Dec 27, 2019
afc4f93
Add column headings for compute and disk offering selection.
Dec 27, 2019
4096d2f
Merge branch 'master' into feature/vm-wizard
Dec 27, 2019
88f33db
Add affinity groups to the info card.
Dec 27, 2019
e82d698
Merge branch 'master' into feature/vm-wizard
Jan 13, 2020
51fd668
Respect zone id on fetching templates.
Jan 15, 2020
4776309
Introduce network selection.
Jan 15, 2020
356ff67
Adjust naming.
Jan 15, 2020
15f12dd
Refactor zone select input.
Jan 15, 2020
69afd48
Fix network selection.
Jan 15, 2020
5f8c92f
Merge branch 'master' into feature/vm-wizard
Jan 15, 2020
06a51cb
Add vpc column to the network selection.
Jan 15, 2020
c405f5e
Add network offering description and move description to expandable r…
Jan 15, 2020
13d8b5d
Add VPC filter to the network selection table.
Jan 16, 2020
fae52ae
Merge branch 'master' into feature/vm-wizard
Jan 16, 2020
92738cd
Introduce network configuration component.
Jan 21, 2020
e6e2d12
Merge branch 'master' into feature/vm-wizard
Jan 21, 2020
a367750
Merge branch 'master' into feature/vm-wizard
Jan 27, 2020
3c6ef28
Wrap all selections/inputs with collapse components.
Jan 27, 2020
d986afd
Adjust the styling of main collapse.
Jan 27, 2020
df5444d
Introduce network creation component.
Jan 29, 2020
3dc2bf5
Merge branch 'master' into feature/vm-wizard
Jan 29, 2020
19b3cf4
Introduce ssh keypair selection.
Jan 30, 2020
23a2858
Replace scroll property with pagination in all tables.
Jan 30, 2020
12cc70d
Remove pagination for the network creation component table.
Jan 30, 2020
50b5e22
Update DiskSizeSelection.vue
yadvr Jan 31, 2020
12ff555
Update NetworksCreation.vue
yadvr Jan 31, 2020
d5e2656
Update TemplateIsoRadioGroup.vue
yadvr Jan 31, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@
"core-js": "^3.6.1",
"enquire.js": "^2.1.6",
"js-cookie": "^2.2.1",
"lodash.get": "^4.4.2",
"lodash.pick": "^4.4.0",
"lodash": "^4.17.15",
"md5": "^2.2.1",
"moment": "^2.24.0",
"node-emoji": "^1.10.0",
Expand Down
10 changes: 10 additions & 0 deletions src/components/view/InfoCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,16 @@
<a-icon type="calendar" />{{ resource.created }}
</div>
</div>
<div class="resource-detail-item" v-if="resource.affinitygroup && resource.affinitygroup.length > 0">
<a-icon type="swap" />
<span
v-for="(group, index) in resource.affinitygroup"
:key="group.id"
>
<router-link :to="{ path: '/affinitygroup/' + group.id }">{{ group.name }}</router-link>
<span v-if="index + 1 < resource.affinitygroup.length">, </span>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that's not the smartest way to display the list of affinity groups. Maybe we can change this later. I would prefer to focus on the wizard and adjust the info card later. Or do you have a suggestion, @rhtyd ?

Bildschirmfoto 2019-12-27 um 14 30 25

</span>
</div>
</div>

<div class="account-center-tags" v-if="$route.meta.related">
Expand Down
12 changes: 11 additions & 1 deletion src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1055,7 +1055,17 @@
"instance": "Instance",
"yourInstance": "Your instance",
"newInstance": "New instance",
"defaultNetwork": "Default network",
"cpu": "CPU",
"ram": "RAM",
"minMaxIops": "Min IOPS / Max IOPS",
"isSelf": "Self",
"isShared": "Shared",
"networks": "Networks",
"BasicSetup": "Basic setup",
"templateIso": "Template/ISO",
"addAnotherNetwork": "Add another network",
"addNewNetworks": "Add new networks",
"existingNetworks": "Existing networks",
"sshKeyPairs": "SSH keypairs",
"wednesday": "Wednesday"
}
Loading