Commit 4644ba3a authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Completed search functionality; fixed paginator issue

parent d9e8fd00

gms-ui/.env.development

+1 −0
Original line number Diff line number Diff line 
VUE_APP_API_CLIENT = 'mock'

VUE_APP_API_BASE_URL = ''

gms-ui/src/components/GenericSearchResults.vue

+5 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
        </span>

      </b-list-group-item>

    </b-list-group>

    <Paginator :paginatedPanel="model.genericSearchResults" :onUpdate="updateSearchResults" />

    <Paginator :paginatedPanel="model.genericSearchResults" :onUpdate="updateSearchResults" :paginatorInput="input.genericSearch" />

  </div>

</div>

</template>
@@ -47,7 +47,10 @@ export default { 
      }

    },

    updateSearchResults: function() {



      client.search(this.input)

        .then(results => {

          this.$store.commit('displaySearchResults', results);

        });

    }

  }

}

gms-ui/src/components/GroupsPanel.vue

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    </b-list-group>

    <p v-if="model.groupsPanel.items.length === 0">No groups</p>

  </div>

  <Paginator :paginatedPanel="model.groupsPanel" :onUpdate="updatePagination" />

  <Paginator :paginatedPanel="model.groupsPanel" :onUpdate="updatePagination" :paginatorInput="input" />

  <RenameGroupModal ref="renameGroupModal" />

  <ConfirmRemoveGroupModal ref="confirmRemoveGroupModal" />

</b-tab>

gms-ui/src/components/MembersPanel.vue

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
    </b-list-group>

    <p v-if="model.membersPanel.items.length === 0">No direct members</p>

  </div>

  <Paginator :paginatedPanel="model.membersPanel" :onUpdate="updatePagination" />

  <Paginator :paginatedPanel="model.membersPanel" :onUpdate="updatePagination" :paginatorInput="input" />

  <ConfirmRemoveMemberModal ref="confirmRemoveMemberModal" />

</b-tab>

</template>

gms-ui/src/components/Paginator.vue

+7 −6
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
        <label for="page-size">Page size:</label>

      </b-col>

      <b-col sm="6">

        <b-form-select id="page-size" v-model="input.paginatorPageSize" :options="pageSizeOptions" v-on:change="changePageSize"></b-form-select>

        <b-form-select id="page-size" v-model="paginatorInput.paginatorPageSize" :options="pageSizeOptions" v-on:change="changePageSize"></b-form-select>

      </b-col>

    </b-row>

  </div>
@@ -26,11 +26,12 @@ export default { 
  name: 'Paginator',

  props: {

    paginatedPanel: Object,

    onUpdate: Function

    onUpdate: Function,

    paginatorInput: Object

  },

  computed: mapState({

  /*computed: mapState({

    input: state => state.input

  }),

  }),*/

  data: function() {

    return {

      pageSizeOptions: [{
@@ -54,11 +55,11 @@ export default { 
  },

  methods: {

    setPage: function(page) {

      this.input.paginatorPage = page;

      this.paginatorInput.paginatorPage = page;

      this.onUpdate();

    },

    changePageSize: function(pageSize) {

      this.input.paginatorPageSize = pageSize;

      this.paginatorInput.paginatorPageSize = pageSize;

      this.onUpdate();

    }

  }