Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/CODEOWNERS

@@ -72,13 +72,29 @@ config/bounded_contexts.yml @fabiopitino @grzesiek @stanhu @cwoolley-gitlab @tku
 /ee/db/schema_migrations/
 # The following two lines only match db/ root files
 /db/*
+/spec/db/*
 /ee/db/*
+/ee/spec/db/*
 /lib/gitlab/background_migration/
+/spec/lib/gitlab/background_migration/
 /ee/lib/ee/gitlab/background_migration/
+/ee/spec/lib/ee/gitlab/background_migration/
+/lib/gitlab/database.rb
 /lib/gitlab/database/
+/spec/lib/gitlab/database_spec.rb
+/spec/lib/gitlab/database/
+/ee/lib/gitlab/database/
+/ee/spec/lib/gitlab/database/
+/ee/lib/ee/gitlab/database.rb
+/ee/lib/ee/gitlab/database/
+/ee/spec/lib/ee/gitlab/database/
+/ee/spec/lib/ee/gitlab/database_spec.rb
 /lib/gitlab/sql/
+/spec/lib/gitlab/sql/
 /app/finders/
+/spec/finders/
 /ee/app/finders/
+/ee/spec/finders/
 /rubocop/rubocop-migrations.yml
 
 [Pipeline configuration] @gl-quality/eng-prod

.rubocop_todo/layout/parameter_alignment.yml

@@ -14,6 +14,7 @@ import { formatDate } from '~/lib/utils/datetime_utility';
 import { TYPENAME_ISSUE, TYPENAME_MERGE_REQUEST } from '~/graphql_shared/constants';
 import { joinPaths } from '~/lib/utils/url_utility';
 import { s__, sprintf } from '~/locale';
+import updateWorkItemMutation from '~/work_items/graphql/update_work_item.mutation.graphql';
 import createTimelogMutation from '../../queries/create_timelog.mutation.graphql';
 import { CREATE_TIMELOG_MODAL_ID } from './constants';
 
@@ -35,7 +36,18 @@ export default {
   props: {
     issuableId: {
       type: String,
-      required: true,
+      required: false,
+      default: '',
+    },
+    workItemId: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    workItemType: {
+      type: String,
+      required: false,
+      default: '',
     },
   },
   data() {
@@ -49,13 +61,13 @@ export default {
   },
   computed: {
     modalText() {
-      const issuableTypeName = issuableTypeText[this.issuableType];
+      const issuableTypeName = issuableTypeText[this.issuableType || this.workItemType];
       return sprintf(s__('TimeTracking|Track time spent on this %{issuableTypeName}.'), {
         issuableTypeName,
       });
     },
     submitDisabled() {
-      return this.isLoading || this.timeSpent.length === 0;
+      return this.isLoading || this.timeSpent?.length === 0;
     },
     primaryProps() {
       return {
@@ -91,14 +103,50 @@ export default {
     registerTimeSpent(event) {
       event.preventDefault();
 
-      if (this.timeSpent.length === 0) {
-        return;
+      if (this.timeSpent?.length === 0) {
+        return null;
       }
 
       this.isLoading = true;
       this.saveError = '';
 
-      this.$apollo
+      if (this.workItemId) {
+        return this.$apollo
+          .mutate({
+            mutation: updateWorkItemMutation,
+            variables: {
+              input: {
+                id: this.workItemId,
+                timeTrackingWidget: {
+                  timelog: {
+                    spentAt: this.spentAt
+                      ? formatDate(this.spentAt, 'isoDateTime')
+                      : formatDate(Date.now(), 'isoDateTime'),
+                    summary: this.summary,
+                    timeSpent: this.timeSpent,
+                  },
+                },
+              },
+            },
+          })
+          .then(({ data }) => {
+            if (data.workItemUpdate.errors.length) {
+              throw new Error(data.workItemUpdate.errors);
+            }
+
+            this.close();
+          })
+          .catch((error) => {
+            this.saveError =
+              error?.message ||
+              s__('TimeTracking|An error occurred while saving the time estimate.');
+          })
+          .finally(() => {
+            this.isLoading = false;
+          });
+      }
+
+      return this.$apollo
         .mutate({
           mutation: createTimelogMutation,
           variables: {

.rubocop_todo/layout/space_before_block_braces.yml

@@ -1,12 +1,16 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <script>
 import { GlLoadingIcon, GlTableLite, GlButton, GlTooltipDirective } from '@gitlab/ui';
+import produce from 'immer';
 import { createAlert } from '~/alert';
 import { TYPENAME_ISSUE, TYPENAME_MERGE_REQUEST } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import { TYPE_ISSUE } from '~/issues/constants';
 import { formatDate, parseSeconds, stringifyTime } from '~/lib/utils/datetime_utility';
 import { __, s__ } from '~/locale';
+import { WIDGET_TYPE_TIME_TRACKING } from '~/work_items/constants';
+import groupWorkItemByIidQuery from '~/work_items/graphql/group_work_item_by_iid.query.graphql';
+import workItemByIidQuery from '~/work_items/graphql/work_item_by_iid.query.graphql';
 import { timelogQueries } from '../../queries/constants';
 import deleteTimelogMutation from '../../queries/delete_timelog.mutation.graphql';
 
@@ -22,6 +26,12 @@ export default {
     GlTooltip: GlTooltipDirective,
   },
   inject: {
+    fullPath: {
+      default: null,
+    },
+    isGroup: {
+      default: null,
+    },
     issuableType: {
       default: null,
     },
@@ -34,11 +44,25 @@ export default {
     },
     issuableId: {
       type: String,
-      required: true,
+      required: false,
+      default: '',
+    },
+    timelogs: {
+      type: Array,
+      required: false,
+      default: undefined,
+    },
+    workItemIid: {
+      type: String,
+      required: false,
+      default: '',
     },
   },
   data() {
-    return { report: [], isLoading: true, removingIds: [] };
+    return {
+      report: this.timelogs ?? [],
+      removingIds: [],
+    };
   },
   apollo: {
     report: {
@@ -49,18 +73,46 @@ export default {
         return this.getQueryVariables();
       },
       update(data) {
-        this.isLoading = false;
-        return this.extractTimelogs(data);
+        const timelogs = data?.issuable?.timelogs?.nodes || [];
+        return timelogs.slice().sort((a, b) => new Date(a.spentAt) - new Date(b.spentAt));
       },
       error() {
         createAlert({ message: __('Something went wrong. Please try again.') });
       },
+      skip() {
+        return Boolean(this.timelogs);
+      },
+    },
+    workItem: {
+      query() {
+        return this.isGroup ? groupWorkItemByIidQuery : workItemByIidQuery;
+      },
+      variables() {
+        return {
+          fullPath: this.fullPath,
+          iid: this.workItemIid,
+        };
+      },
+      update(data) {
+        return data.workspace.workItem ?? {};
+      },
+      skip() {
+        return !this.workItemIid;
+      },
     },
   },
   computed: {
     deleteButtonTooltip() {
       return s__('TimeTracking|Delete time spent');
     },
+    isLoading() {
+      return this.$apollo.queries.report.loading || this.$apollo.queries.workItem.loading;
+    },
+  },
+  watch: {
+    timelogs(timelogs) {
+      this.report = timelogs;
+    },
   },
   methods: {
     isDeletingTimelog(timelogId) {
@@ -77,10 +129,6 @@ export default {
     getGraphQLEntityType() {
       return this.isIssue() ? TYPENAME_ISSUE : TYPENAME_MERGE_REQUEST;
     },
-    extractTimelogs(data) {
-      const timelogs = data?.issuable?.timelogs?.nodes || [];
-      return timelogs.slice().sort((a, b) => new Date(a.spentAt) - new Date(b.spentAt));
-    },
     formatDate(date) {
       return formatDate(date, TIME_DATE_FORMAT);
     },
@@ -104,6 +152,28 @@ export default {
         .mutate({
           mutation: deleteTimelogMutation,
           variables: { input: { id: timelogId } },
+          update: (store) => {
+            if (!this.workItemIid) {
+              return;
+            }
+            store.updateQuery(
+              {
+                query: this.isGroup ? groupWorkItemByIidQuery : workItemByIidQuery,
+                variables: { fullPath: this.fullPath, iid: this.workItemIid },
+              },
+              (sourceData) =>
+                produce(sourceData, (draftState) => {
+                  const timeTrackingWidget = draftState.workspace.workItem.widgets.find(
+                    (widget) => widget.type === WIDGET_TYPE_TIME_TRACKING,
+                  );
+                  const timelogs = timeTrackingWidget.timelogs.nodes;
+                  const index = timelogs.findIndex((timelog) => timelog.id === timelogId);
+
+                  timeTrackingWidget.totalTimeSpent -= timelogs[index].timeSpent;
+                  timelogs.splice(index, 1);
+                }),
+            );
+          },
         })
         .then(({ data }) => {
           if (data.timelogDelete?.errors?.length) {

.rubocop_todo/layout/trailing_whitespace.yml

@@ -2,7 +2,9 @@
 import { GlFormGroup, GlFormInput, GlModal, GlAlert, GlLink } from '@gitlab/ui';
 import { helpPagePath } from '~/helpers/help_page_helper';
 import { issuableTypeText, TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants';
+import { isPositiveInteger } from '~/lib/utils/number_utils';
 import { s__, __, sprintf } from '~/locale';
+import updateWorkItemMutation from '~/work_items/graphql/update_work_item.mutation.graphql';
 import issueSetTimeEstimateMutation from '../../queries/issue_set_time_estimate.mutation.graphql';
 import mergeRequestSetTimeEstimateMutation from '../../queries/merge_request_set_time_estimate.mutation.graphql';
 import { SET_TIME_ESTIMATE_MODAL_ID } from './constants';
@@ -28,11 +30,13 @@ export default {
   props: {
     fullPath: {
       type: String,
-      required: true,
+      required: false,
+      default: '',
     },
     issuableIid: {
       type: String,
-      required: true,
+      required: false,
+      default: '',
     },
     /**
      * This object must contain the following keys, used to show
@@ -44,6 +48,16 @@ export default {
       type: Object,
       required: true,
     },
+    workItemId: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    workItemType: {
+      type: String,
+      required: false,
+      default: '',
+    },
   },
   data() {
     return {
@@ -134,7 +148,41 @@ export default {
     updateEstimatedTime(timeEstimate) {
       this.saveError = '';
 
-      this.$apollo
+      if (this.workItemId) {
+        return this.$apollo
+          .mutate({
+            mutation: updateWorkItemMutation,
+            variables: {
+              input: {
+                id: this.workItemId,
+                timeTrackingWidget: {
+                  timeEstimate:
+                    isPositiveInteger(timeEstimate) && timeEstimate > 0
+                      ? `${timeEstimate}h`
+                      : timeEstimate,
+                },
+              },
+            },
+          })
+          .then(({ data }) => {
+            if (data.workItemUpdate.errors.length) {
+              throw new Error(data.workItemUpdate.errors);
+            }
+
+            this.close();
+          })
+          .catch((error) => {
+            this.saveError =
+              error?.message ||
+              s__('TimeTracking|An error occurred while saving the time estimate.');
+          })
+          .finally(() => {
+            this.isSaving = false;
+            this.isResetting = false;
+          });
+      }
+
+      return this.$apollo
         .mutate({
           mutation: MUTATIONS[this.issuableType],
           variables: {