fix(images): route by id

This commit is contained in:
Sara Vieira 2018-03-21 15:05:03 +00:00
parent e73e2f1eef
commit 9a9f1f903a
6 changed files with 35 additions and 33 deletions

View File

@ -71,6 +71,7 @@ const Actions = styled(Flex)`
export const Image = ({
name,
id,
os,
version,
type,
@ -96,7 +97,7 @@ export const Image = ({
height: '24'
})}
</Margin>
<A to={`/images/${name}/summary`} component={Link}>
<A to={`/images/${id}/summary`} component={Link}>
{name}
</A>
</Flex>

View File

@ -69,13 +69,13 @@ export default compose(
options: ({ match }) => ({
ssr: false,
variables: {
name: get(match, 'params.image')
id: get(match, 'params.image')
}
}),
props: ({
data: { loading = false, error = null, variables, ...rest }
}) => ({
image: find(get(rest, 'images', []), ['name', variables.name]),
image: find(get(rest, 'images', []), ['id', variables.id]),
loading,
error
})

View File

@ -129,7 +129,7 @@ export default compose(
fetchPolicy: 'network-only',
pollInterval: 1000,
variables: {
name: get(match, 'params.image')
id: get(match, 'params.image')
}
}),
props: ({ data }) => {
@ -141,7 +141,7 @@ export default compose(
...rest
} = data;
const image = find(get(rest, 'images', []), ['name', variables.name]);
const image = find(get(rest, 'images', []), ['id', variables.id]);
const tags = get(image || {}, 'tags', []);
const index = new Fuse(tags, {
keys: ['name', 'value']
@ -203,33 +203,34 @@ export default compose(
dispatch(set({ name: `${image.id}-mutating`, value: false }));
},
handleAddTag: async ({ name, value }) => {
console.log(name, value);
dispatch(set({ name: `${image.id}-mutating`, value: true }));
const [err] = await intercept(
updateTags({
variables: {
id: image.id,
tags: tags
.map(({ name, value }) => ({ name, value }))
.concat([{ name, value }])
}
})
);
// const [err] = await intercept(
// updateTags({
// variables: {
// id: image.id,
// tags: tags
// .map(({ name, value }) => ({ name, value }))
// .concat([{ name, value }])
// }
// })
// );
if (err) {
dispatch([
set({ name: `${image.id}-mutation-error`, value: parseError(err) }),
set({ name: `${image.id}-mutating`, value: false })
]);
}
// if (err) {
// dispatch([
// set({ name: `${image.id}-mutation-error`, value: parseError(err) }),
// set({ name: `${image.id}-mutating`, value: false })
// ]);
// }
await refetch();
// await refetch();
dispatch([
set({ name: `${image.id}-mutating`, value: false }),
dispatch(set({ name: `${image.id}-add-open`, value: false })),
destroy(TAGS_ADD_FORM)
]);
// dispatch([
// set({ name: `${image.id}-mutating`, value: false }),
// dispatch(set({ name: `${image.id}-add-open`, value: false })),
// destroy(TAGS_ADD_FORM)
// ]);
}
})
)

View File

@ -1,5 +1,5 @@
query image($name: String) {
images(name: $name) {
query image($id: ID) {
images(id: $id) {
id
name
os

View File

@ -1,5 +1,5 @@
query instance($name: String) {
machines(name: $name) {
query instance($id: ID) {
machines(id: $id) {
results {
id
name

View File

@ -1,5 +1,5 @@
query image($name: String) {
images(name: $name) {
query image($id: ID) {
images(id: $id) {
id
name
tags {