Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue

@@ -1,14 +1,5 @@
 <script>
-import {
-  GlIcon,
-  GlLoadingIcon,
-  GlAvatar,
-  GlDropdown,
-  GlDropdownSectionHeader,
-  GlDropdownItem,
-  GlSearchBoxByType,
-  GlTruncate,
-} from '@gitlab/ui';
+import { GlButton, GlIcon, GlAvatar, GlCollapsibleListbox, GlTruncate } from '@gitlab/ui';
 import { debounce } from 'lodash';
 import { filterBySearchTerm } from '~/analytics/shared/utils';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
@@ -18,17 +9,15 @@ import { n__, s__, __ } from '~/locale';
 import getProjects from '../graphql/projects.query.graphql';
 
 const sortByProjectName = (projects = []) => projects.sort((a, b) => a.name.localeCompare(b.name));
+const mapItemToListboxFormat = (item) => ({ ...item, value: item.id, text: item.name });
 
 export default {
   name: 'ProjectsDropdownFilter',
   components: {
+    GlButton,
     GlIcon,
-    GlLoadingIcon,
     GlAvatar,
-    GlDropdown,
-    GlDropdownSectionHeader,
-    GlDropdownItem,
-    GlSearchBoxByType,
+    GlCollapsibleListbox,
     GlTruncate,
   },
   props: {
@@ -94,6 +83,9 @@ export default {
     selectedProjectIds() {
       return this.selectedProjects.map((p) => p.id);
     },
+    selectedListBoxItems() {
+      return this.multiSelect ? this.selectedProjectIds : this.selectedProjectIds[0];
+    },
     hasSelectedProjects() {
       return Boolean(this.selectedProjects.length);
     },
@@ -110,6 +102,28 @@ export default {
     unselectedItems() {
       return this.availableProjects.filter(({ id }) => !this.selectedProjectIds.includes(id));
     },
+    selectedGroupOptions() {
+      return this.selectedItems.map(mapItemToListboxFormat);
+    },
+    unSelectedGroupOptions() {
+      return this.unselectedItems.map(mapItemToListboxFormat);
+    },
+    listBoxItems() {
+      if (this.selectedGroupOptions.length === 0) {
+        return this.unSelectedGroupOptions;
+      }
+
+      return [
+        {
+          text: __('Selected'),
+          options: this.selectedGroupOptions,
+        },
+        {
+          text: __('Unselected'),
+          options: this.unSelectedGroupOptions,
+        },
+      ];
+    },
   },
   watch: {
     searchTerm() {
@@ -129,32 +143,29 @@ export default {
     search: debounce(function debouncedSearch() {
       this.fetchData();
     }, DEFAULT_DEBOUNCE_AND_THROTTLE_MS),
-    getSelectedProjects(selectedProject, isSelected) {
-      return isSelected
-        ? this.selectedProjects.concat([selectedProject])
-        : this.selectedProjects.filter((project) => project.id !== selectedProject.id);
-    },
     singleSelectedProject(selectedObj, isMarking) {
       return isMarking ? [selectedObj] : [];
     },
-    setSelectedProjects(project) {
+    setSelectedProjects(payload) {
       this.selectedProjects = this.multiSelect
-        ? this.getSelectedProjects(project, !this.isProjectSelected(project))
-        : this.singleSelectedProject(project, !this.isProjectSelected(project));
+        ? payload
+        : this.singleSelectedProject(payload, !this.isProjectSelected(payload));
     },
-    onClick(project) {
+    onClick(projectId) {
+      const project = this.availableProjects.find(({ id }) => id === projectId);
       this.setSelectedProjects(project);
       this.handleUpdatedSelectedProjects();
     },
-    onMultiSelectClick(project) {
-      this.setSelectedProjects(project);
+    onMultiSelectClick(projectIds) {
+      const projects = this.availableProjects.filter(({ id }) => projectIds.includes(id));
+      this.setSelectedProjects(projects);
       this.isDirty = true;
     },
-    onSelected(project) {
+    onSelected(payload) {
       if (this.multiSelect) {
-        this.onMultiSelectClick(project);
+        this.onMultiSelectClick(payload);
       } else {
-        this.onClick(project);
+        this.onClick(payload);
       }
     },
     onHide() {
@@ -201,97 +212,65 @@ export default {
     getEntityId(project) {
       return getIdFromGraphQLId(project.id);
     },
+    setSearchTerm(val) {
+      this.searchTerm = val;
+    },
   },
   AVATAR_SHAPE_OPTION_RECT,
 };
 </script>
 <template>
-  <gl-dropdown
+  <gl-collapsible-listbox
     ref="projectsDropdown"
-    class="dropdown dropdown-projects"
     toggle-class="gl-shadow-none gl-mb-0"
+    :header-text="__('Projects')"
+    :items="listBoxItems"
+    :reset-button-label="__('Clear All')"
     :loading="loadingDefaultProjects"
-    :show-clear-all="hasSelectedProjects"
-    show-highlighted-items-title
-    highlighted-items-title-class="gl-p-3"
-    block
-    @clear-all.stop="onClearAll"
-    @hide="onHide"
+    :multiple="multiSelect"
+    :no-results-text="__('No matching results')"
+    :selected="selectedListBoxItems"
+    :searching="loading"
+    searchable
+    @hidden="onHide"
+    @reset="onClearAll"
+    @search="setSearchTerm"
+    @select="onSelected"
   >
-    <template #button-content>
-      <gl-loading-icon v-if="loadingDefaultProjects" class="gl-mr-2 gl-flex-shrink-0" />
-      <gl-avatar
-        v-if="isOnlyOneProjectSelected"
-        :src="selectedProjects[0].avatarUrl"
-        :entity-id="getEntityId(selectedProjects[0])"
-        :entity-name="selectedProjects[0].name"
-        :size="16"
-        :shape="$options.AVATAR_SHAPE_OPTION_RECT"
-        :alt="selectedProjects[0].name"
-        class="gl-display-inline-flex gl-vertical-align-middle gl-mr-2 gl-flex-shrink-0"
-      />
-      <gl-truncate :text="selectedProjectsLabel" class="gl-min-w-0 gl-flex-grow-1" />
-      <gl-icon class="gl-ml-2 gl-flex-shrink-0" name="chevron-down" />
-    </template>
-    <template #header>
-      <gl-dropdown-section-header>{{ __('Projects') }}</gl-dropdown-section-header>
-      <gl-search-box-by-type v-model.trim="searchTerm" :placeholder="__('Search')" />
-    </template>
-    <template #highlighted-items>
-      <gl-dropdown-item
-        v-for="project in selectedItems"
-        :key="project.id"
-        is-check-item
-        :is-checked="isProjectSelected(project)"
-        @click.native.capture.stop="onSelected(project)"
-      >
-        <div class="gl-display-flex">
-          <gl-avatar
-            class="gl-mr-2 gl-vertical-align-middle"
-            :alt="project.name"
-            :size="16"
-            :entity-id="getEntityId(project)"
-            :entity-name="project.name"
-            :src="project.avatarUrl"
-            :shape="$options.AVATAR_SHAPE_OPTION_RECT"
-          />
-          <div>
-            <div data-testid="project-name">{{ project.name }}</div>
-            <div class="gl-text-gray-500" data-testid="project-full-path">
-              {{ project.fullPath }}
-            </div>
-          </div>
-        </div>
-      </gl-dropdown-item>
+    <template #toggle>
+      <gl-button class="dropdown-projects">
+        <gl-avatar
+          v-if="isOnlyOneProjectSelected"
+          :src="selectedProjects[0].avatarUrl"
+          :entity-id="getEntityId(selectedProjects[0])"
+          :entity-name="selectedProjects[0].name"
+          :size="16"
+          :shape="$options.AVATAR_SHAPE_OPTION_RECT"
+          :alt="selectedProjects[0].name"
+          class="gl-display-inline-flex gl-vertical-align-middle gl-mr-2 gl-flex-shrink-0"
+        />
+        <gl-truncate :text="selectedProjectsLabel" class="gl-min-w-0 gl-flex-grow-1" />
+        <gl-icon class="gl-ml-2 gl-flex-shrink-0" name="chevron-down" />
+      </gl-button>
     </template>
-    <gl-dropdown-item
-      v-for="project in unselectedItems"
-      :key="project.id"
-      @click.native.capture.stop="onSelected(project)"
-    >
+    <template #list-item="{ item }">
       <div class="gl-display-flex">
         <gl-avatar
-          class="gl-mr-2 vertical-align-middle"
-          :alt="project.name"
+          class="gl-mr-2 gl-vertical-align-middle"
+          :alt="item.name"
           :size="16"
-          :entity-id="getEntityId(project)"
-          :entity-name="project.name"
-          :src="project.avatarUrl"
+          :entity-id="getEntityId(item)"
+          :entity-name="item.name"
+          :src="item.avatarUrl"
           :shape="$options.AVATAR_SHAPE_OPTION_RECT"
         />
         <div>
-          <div data-testid="project-name" data-qa-selector="project_name">{{ project.name }}</div>
+          <div data-testid="project-name" data-qa-selector="project_name">{{ item.name }}</div>
           <div class="gl-text-gray-500" data-testid="project-full-path">
-            {{ project.fullPath }}
+            {{ item.fullPath }}
           </div>
         </div>
       </div>
-    </gl-dropdown-item>
-    <gl-dropdown-item v-show="noResultsAvailable" class="gl-pointer-events-none text-secondary">{{
-      __('No matching results')
-    }}</gl-dropdown-item>
-    <gl-dropdown-item v-if="loading">
-      <gl-loading-icon size="lg" />
-    </gl-dropdown-item>
-  </gl-dropdown>
+    </template>
+  </gl-collapsible-listbox>
 </template>

app/graphql/mutations/environments/create.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Mutations
+  module Environments
+    class Create < ::Mutations::BaseMutation
+      graphql_name 'EnvironmentCreate'
+      description 'Create an environment.'
+
+      include FindsProject
+
+      authorize :create_environment
+
+      argument :project_path,
+        GraphQL::Types::ID,
+        required: true,
+        description: 'Full path of the project.'
+
+      argument :name,
+        GraphQL::Types::String,
+        required: true,
+        description: 'Name of the environment.'
+
+      argument :external_url,
+        GraphQL::Types::String,
+        required: false,
+        description: 'External URL of the environment.'
+
+      argument :tier,
+        Types::DeploymentTierEnum,
+        required: false,
+        description: 'Tier of the environment.'
+
+      field :environment,
+        Types::EnvironmentType,
+        null: true,
+        description: 'Created environment.'
+
+      def resolve(project_path:, **kwargs)
+        project = authorized_find!(project_path)
+
+        response = ::Environments::CreateService.new(project, current_user, kwargs).execute
+
+        if response.success?
+          { environment: response.payload[:environment], errors: [] }
+        else
+          { environment: response.payload[:environment], errors: response.errors }
+        end
+      end
+    end
+  end
+end

app/graphql/types/mutation_type.rb

@@ -52,6 +52,7 @@ class MutationType < BaseObject
     mount_mutation Mutations::DependencyProxy::ImageTtlGroupPolicy::Update
     mount_mutation Mutations::DependencyProxy::GroupSettings::Update
     mount_mutation Mutations::Environments::CanaryIngress::Update
+    mount_mutation Mutations::Environments::Create
     mount_mutation Mutations::Environments::Delete
     mount_mutation Mutations::Environments::Stop
     mount_mutation Mutations::Environments::Update

app/services/environments/create_service.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Environments
+  class CreateService < BaseService
+    def execute
+      unless can?(current_user, :create_environment, project)
+        return ServiceResponse.error(
+          message: _('Unauthorized to create an environment'),
+          payload: { environment: nil }
+        )
+      end
+
+      environment = project.environments.create(**params)
+
+      if environment.persisted?
+        ServiceResponse.success(payload: { environment: environment })
+      else
+        ServiceResponse.error(
+          message: environment.errors.full_messages,
+          payload: { environment: nil }
+        )
+      end
+    end
+  end
+end

app/views/layouts/fullscreen.html.haml

@@ -17,7 +17,7 @@
           = render "layouts/broadcast"
           = yield :flash_message
           = render "layouts/flash", flash_container_no_margin: true
-        .content-wrapper{ id: "content-body", class: "d-flex flex-column align-items-stretch" }
+        .content-wrapper{ id: "content-body", class: "d-flex flex-column align-items-stretch gl-p-0" }
           = yield
     - unless minimal
       = render "layouts/nav/top_nav_responsive", class: "gl-flex-grow-1 gl-overflow-y-auto"

db/post_migrate/20230426030342_index_system_note_metadata_on_id_for_relate_and_unrelate_actions.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class IndexSystemNoteMetadataOnIdForRelateAndUnrelateActions < Gitlab::Database::Migration[2.1]
+  INDEX_NAME = 'tmp_index_for_backfilling_resource_link_events'
+  CONDITION = "action='relate_to_parent' OR action='unrelate_from_parent'"
+
+  disable_ddl_transaction!
+
+  def up
+    # Temporary index to be removed in https://gitlab.com/gitlab-org/gitlab/-/issues/408797
+    add_concurrent_index :system_note_metadata, :id,
+      where: CONDITION,
+      name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :system_note_metadata, INDEX_NAME
+  end
+end

db/schema_migrations/20230426030342

@@ -0,0 +1 @@
+54267e34c6978456efca6c784c4e4ea7541dac98a704095a9766809725021bb8

db/structure.sql

@@ -33164,6 +33164,8 @@ CREATE INDEX tmp_index_container_repos_on_non_migrated ON container_repositories
 
 CREATE INDEX tmp_index_container_repositories_on_id_migration_state ON container_repositories USING btree (id, migration_state);
 
+CREATE INDEX tmp_index_for_backfilling_resource_link_events ON system_note_metadata USING btree (id) WHERE (((action)::text = 'relate_to_parent'::text) OR ((action)::text = 'unrelate_from_parent'::text));
+
 CREATE INDEX tmp_index_for_null_member_namespace_id ON members USING btree (member_namespace_id) WHERE (member_namespace_id IS NULL);
 
 CREATE INDEX tmp_index_for_project_namespace_id_migration_on_routes ON routes USING btree (id) WHERE ((namespace_id IS NULL) AND ((source_type)::text = 'Project'::text));