diff --git a/.github/workflows/docker-image-development.yml b/.github/workflows/docker-image-development.yml index ad571d8..8076f21 100755 --- a/.github/workflows/docker-image-development.yml +++ b/.github/workflows/docker-image-development.yml @@ -2,27 +2,24 @@ name: Publish Docker Image Development on: push: - branches: [ "development" ] + branches: ['development'] pull_request: - branches: [ "development" ] + branches: ['development'] jobs: - build: - runs-on: ubuntu-latest if: ${{github.event.head_commit.message}} == *'build image'* steps: - - - name: Docker Hub Login - env: + - name: Docker Hub Login + env: DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}} DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} - run: docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD + run: docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - - uses: actions/checkout@v3 - - name: Build the Docker image - run: | - docker build . -t defuj/apkt-eis:v1.0.1-dev - docker push defuj/apkt-eis:v1.0.1-dev \ No newline at end of file + - uses: actions/checkout@v3 + - name: Build the Docker image + run: | + docker build . -t defuj/apkt-eis:v0.0.25-dev + docker push defuj/apkt-eis:v0.0.25-dev diff --git a/deployment.yaml b/deployment.yaml index 5ce53b3..8319df0 100755 --- a/deployment.yaml +++ b/deployment.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: apkt-eis - image: defuj/apkt-eis:v1.0.1-dev + image: defuj/apkt-eis:v0.0.23-dev ports: - containerPort: 80 --- @@ -43,4 +43,5 @@ spec: - protocol: TCP port: 32166 targetPort: 80 - type: ClusterIP \ No newline at end of file + type: ClusterIP + \ No newline at end of file diff --git a/src/components/Form/FiltersType/Type13.vue b/src/components/Form/FiltersType/Type13.vue index bcfe0c9..f194bb2 100755 --- a/src/components/Form/FiltersType/Type13.vue +++ b/src/components/Form/FiltersType/Type13.vue @@ -2,14 +2,23 @@ import Select from '@/components/Select.vue' import DatePicker from '@/components/DatePicker.vue' import InlineRadioGroup from '@/components/Form/InlineRadioGroup.vue' -import { selectedUid, selectedUp3Ulp, selectedUlp, fetchUid, itemsUid, itemsUp3, itemsUlp } from './reference'; -import { onMounted, ref } from 'vue'; -const uidPlaceholder = 'Semua Unit Induk Distribusi/Wilayah'; -const up3Placeholder = 'Semua Unit Pelaksanaan Pelayanan Pelanggan'; -const ulpPlaceholder = 'Semua Unit Layanan Pelanggan'; -const uppp = ref({ id: 0, name: up3Placeholder }); -const uid = ref({ id: 0, name: uidPlaceholder }); -const ulp = ref({ id: "", name: ulpPlaceholder }); +import { + selectedUid, + selectedUp3Ulp, + selectedUlp, + fetchUid, + itemsUid, + itemsUp3, + itemsUlp +} from './reference' +import { onMounted, ref } from 'vue' +const uidPlaceholder = 'Semua Unit Induk Distribusi/Wilayah' +const up3Placeholder = 'Semua Unit Pelaksanaan Pelayanan Pelanggan' +const ulpPlaceholder = 'Semua Unit Layanan Pelanggan' +const uppp = ref({ id: 0, name: up3Placeholder }) +const uid = ref({ id: 0, name: uidPlaceholder }) +const up3 = ref({ id: 0, name: up3Placeholder }) +const ulp = ref({ id: '', name: ulpPlaceholder }) const emit = defineEmits(['update:filters']) const data = ref({ uid: uid.value, @@ -19,24 +28,24 @@ const data = ref({ group: 1 }) const setUid = (value: any) => { - uid.value = value; - selectedUid(value); - uppp.value = { id: 0, name: up3Placeholder }; - data.value.uid = value; -}; + uid.value = value + selectedUid(value) + uppp.value = { id: 0, name: up3Placeholder } + data.value.uid = value +} const setUp3 = (value: any) => { - uppp.value = value; - selectedUp3Ulp(value); - ulp.value = { id: "", name: ulpPlaceholder }; - data.value.up3 = value; -}; + uppp.value = value + selectedUp3Ulp(value) + ulp.value = { id: '', name: ulpPlaceholder } + data.value.up3 = value +} const setUlp = (value: any) => { - ulp.value = value; - selectedUlp(value); - data.value.posko = value; -}; + ulp.value = value + selectedUlp(value) + data.value.posko = value +} onMounted(() => { emit('update:filters', data.value) fetchUid() @@ -45,38 +54,65 @@ onMounted(() => { diff --git a/src/components/Form/FiltersType/Type2.vue b/src/components/Form/FiltersType/Type2.vue index 998eadc..71ff2ac 100755 --- a/src/components/Form/FiltersType/Type2.vue +++ b/src/components/Form/FiltersType/Type2.vue @@ -1,34 +1,46 @@ \ No newline at end of file + diff --git a/src/stores/queries.ts b/src/stores/queries.ts index 62a8c19..e287beb 100755 --- a/src/stores/queries.ts +++ b/src/stores/queries.ts @@ -4,7 +4,7 @@ import gql from 'graphql-tag' import { useQuery } from '@vue/apollo-composable' export const useQueryStore = defineStore('query', () => { - const getUser = useQuery(gql` + const getUser = useQuery(gql` query getUsers { users { id @@ -15,7 +15,20 @@ export const useQueryStore = defineStore('query', () => { } `) - return { - getUser, + const { variables } = useQuery(gql` + query getUserById ($id: ID!) { + user (id: $id) { + id + email + } } + `, { + variables: { + id: 'abc-abc-abc', + } + }) + + return { + getUser, + } }) \ No newline at end of file diff --git a/src/utils/graphql.ts b/src/utils/graphql.ts index 1ce6ff5..42650f3 100755 --- a/src/utils/graphql.ts +++ b/src/utils/graphql.ts @@ -3,7 +3,7 @@ import { ApolloClient, createHttpLink, InMemoryCache } from '@apollo/client/core export const apolloClient = () => { const httpLink = createHttpLink({ - uri: 'http://10.8.0.31:32169/graphql', + uri: 'http://10.1.50.173:32180/graphql', credentials: 'include', // Include credentials for cross-origin requests }); diff --git a/src/utils/network.ts b/src/utils/network.ts index 8ef57fa..18e1822 100755 --- a/src/utils/network.ts +++ b/src/utils/network.ts @@ -1,5 +1,5 @@ import axios from 'axios' -const url = 'http://10.8.0.13:32180' +const url = 'http://10.1.50.173:32181' const instance = axios.create({ // baseURL: 'http://192.168.1.84:32180' baseURL: url